Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
Used pointer instead of struct size.
dlls/dmime/performance.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 8b38e12eb28..554518c5d5b 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -643,7 +643,6 @@ static HRESULT perf_dmport_create(IDirectMusicPerformance8Impl *perf, DMUS_PORTP
if (FAILED(hr = IDirectMusic8_GetDefaultPort(perf->dmusic, &guid)))
return hr;
- params->dwSize = sizeof(params);
params->dwValidParams |= DMUS_PORTPARAMS_SHARE;
params->fShare = TRUE;
@@ -671,6 +670,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman
if (!port) {
DMUS_PORTPARAMS params = {
+ .dwSize = sizeof(params),
.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS,
.dwChannelGroups = 1
};
@@ -1148,6 +1148,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire
}
/* Create a port */
+ params.dwSize = sizeof(params);
params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS;
params.dwChannelGroups = (pchannel_count + 15) / 16;
params.dwAudioChannels = format.nChannels;
--
2.34.1
1
0
07 Feb '22
This fixes a deadlock when trying to skip video in Persona 4 Golden.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/winegstreamer/wm_asyncreader.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index fc919ef2c49..9dfe2380284 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -146,6 +146,7 @@ static DWORD WINAPI stream_thread(void *arg)
else if (hr != NS_E_NO_MORE_SAMPLES)
{
ERR("Failed to get sample, hr %#lx.\n", hr);
+ LeaveCriticalSection(&reader->stream_cs);
return 0;
}
}
--
2.34.1
1
0
07 Feb '22
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 50ca4cbb168..327bb1f915c 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1685,15 +1685,33 @@ static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p)
static HRESULT WINAPI DOMMouseEvent_get_layerX(IDOMMouseEvent *iface, LONG *p)
{
DOMEvent *This = impl_from_IDOMMouseEvent(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsresult nsres;
+ LONG r;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ nsres = nsIDOMMouseEvent_GetLayerX(This->mouse_event, &r);
+ if(NS_FAILED(nsres))
+ return E_FAIL;
+
+ *p = r;
+ return S_OK;
}
static HRESULT WINAPI DOMMouseEvent_get_layerY(IDOMMouseEvent *iface, LONG *p)
{
DOMEvent *This = impl_from_IDOMMouseEvent(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsresult nsres;
+ LONG r;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ nsres = nsIDOMMouseEvent_GetLayerY(This->mouse_event, &r);
+ if(NS_FAILED(nsres))
+ return E_FAIL;
+
+ *p = r;
+ return S_OK;
}
static HRESULT WINAPI DOMMouseEvent_get_which(IDOMMouseEvent *iface, USHORT *p)
--
2.34.1
2
1
07 Feb '22
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
---
dlls/evr/mixer.c | 3 +-
dlls/mf/copier.c | 3 +-
dlls/winegstreamer/audioconvert.c | 3 +-
dlls/winegstreamer/mfplat.c | 3 +-
dlls/winegstreamer/wma_decoder.c | 3 +-
include/wine/mfdebug.h | 178 ++++++++++++++++++++++++++++++
6 files changed, 188 insertions(+), 5 deletions(-)
create mode 100644 include/wine/mfdebug.h
diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index 0b957e7b6bd..e8488d6cf1a 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -32,6 +32,7 @@
#include "evcode.h"
#include "wine/debug.h"
+#include "wine/mfdebug.h"
WINE_DEFAULT_DEBUG_CHANNEL(evr);
@@ -853,7 +854,7 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW
unsigned int count;
GUID *guids;
- TRACE("%p, %lu, %p, %#lx.\n", iface, id, media_type, flags);
+ TRACE("%p, %lu, %p %s, %#lx.\n", iface, id, media_type, wine_dbgstr_mfmediatype(media_type), flags);
EnterCriticalSection(&mixer->cs);
diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c
index 4972c9f9c44..857de34cb91 100644
--- a/dlls/mf/copier.c
+++ b/dlls/mf/copier.c
@@ -23,6 +23,7 @@
#include "mf_private.h"
#include "wine/debug.h"
+#include "wine/mfdebug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
@@ -326,7 +327,7 @@ static HRESULT WINAPI sample_copier_transform_SetInputType(IMFTransform *iface,
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
- TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);
+ TRACE("%p, %u, %p %s, %#x.\n", iface, id, type, wine_dbgstr_mfmediatype(type), flags);
return sample_copier_set_media_type(transform, TRUE, id, type, flags);
}
diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c
index d5723cdf58f..0d812af6500 100644
--- a/dlls/winegstreamer/audioconvert.c
+++ b/dlls/winegstreamer/audioconvert.c
@@ -25,6 +25,7 @@
#include "ksmedia.h"
#include "wine/debug.h"
+#include "wine/mfdebug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
@@ -277,7 +278,7 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id
struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface);
- TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
+ TRACE("%p, %lu, %p %s, %#lx.\n", iface, id, type, wine_dbgstr_mfmediatype(type), flags);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index a111bbe196d..cf4fbd5b04a 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -26,6 +26,7 @@
#include "mfapi.h"
#include "wine/debug.h"
+#include "wine/mfdebug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
@@ -186,7 +187,7 @@ static HRESULT WINAPI video_processor_GetOutputAvailableType(IMFTransform *iface
static HRESULT WINAPI video_processor_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
{
- FIXME("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
+ FIXME("%p, %lu, %p %s, %#lx.\n", iface, id, type, wine_dbgstr_mfmediatype(type), flags);
return E_NOTIMPL;
}
diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
index 78316059052..aca9c50953d 100644
--- a/dlls/winegstreamer/wma_decoder.c
+++ b/dlls/winegstreamer/wma_decoder.c
@@ -26,6 +26,7 @@
#include "wmcodecdsp.h"
#include "wine/debug.h"
+#include "wine/mfdebug.h"
#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(wmadec);
@@ -330,7 +331,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
HRESULT hr;
ULONG i;
- TRACE("iface %p, id %lu, type %p, flags %#lx.\n", iface, id, type, flags);
+ TRACE("iface %p, id %lu, type %p %s, flags %#lx.\n", iface, id, type, wine_dbgstr_mfmediatype(type), flags);
if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) ||
FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
diff --git a/include/wine/mfdebug.h b/include/wine/mfdebug.h
new file mode 100644
index 00000000000..503d89dc9a8
--- /dev/null
+++ b/include/wine/mfdebug.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2022 Andrew Eikum for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_WINE_MFDEBUG_H
+#define __WINE_WINE_MFDEBUG_H
+
+static const char *wine_dbgstr_mfmediatype_guid( const GUID *guid )
+{
+#define X(x) if (IsEqualGUID( guid, &x )) return #x;
+ X(MFMediaType_Audio)
+ X(MFMediaType_Video)
+
+ X(MFVideoFormat_Base)
+ X(MFVideoFormat_RGB8)
+ X(MFVideoFormat_RGB555)
+ X(MFVideoFormat_RGB565)
+ X(MFVideoFormat_RGB24)
+ X(MFVideoFormat_RGB32)
+ X(MFVideoFormat_ARGB32)
+ X(MFVideoFormat_A2R10G10B10)
+ X(MFVideoFormat_A16B16G16R16F)
+ X(MFVideoFormat_L8)
+ X(MFVideoFormat_L16)
+ X(MFVideoFormat_D16)
+
+ X(MFVideoFormat_420O)
+ X(MFVideoFormat_DVSL)
+ X(MFVideoFormat_DVSD)
+ X(MFVideoFormat_DVHD)
+ X(MFVideoFormat_DV25)
+ X(MFVideoFormat_DV50)
+ X(MFVideoFormat_DVH1)
+ X(MFVideoFormat_DVC)
+ X(MFVideoFormat_v210)
+ X(MFVideoFormat_v216)
+ X(MFVideoFormat_v410)
+ X(MFVideoFormat_AI44)
+ X(MFVideoFormat_AV1)
+ X(MFVideoFormat_AYUV)
+ X(MFVideoFormat_H263)
+ X(MFVideoFormat_H264)
+ X(MFVideoFormat_H265)
+ X(MFVideoFormat_HEVC)
+ X(MFVideoFormat_HEVC_ES)
+ X(MFVideoFormat_I420)
+ X(MFVideoFormat_IYUV)
+ X(MFVideoFormat_M4S2)
+ X(MFVideoFormat_MJPG)
+ X(MFVideoFormat_MP43)
+ X(MFVideoFormat_MP4S)
+ X(MFVideoFormat_MP4V)
+ X(MFVideoFormat_MPG1)
+ X(MFVideoFormat_MSS1)
+ X(MFVideoFormat_MSS2)
+ X(MFVideoFormat_NV11)
+ X(MFVideoFormat_NV12)
+ X(MFVideoFormat_ORAW)
+ X(MFVideoFormat_P010)
+ X(MFVideoFormat_P016)
+ X(MFVideoFormat_P210)
+ X(MFVideoFormat_P216)
+ X(MFVideoFormat_UYVY)
+ X(MFVideoFormat_VP10)
+ X(MFVideoFormat_VP80)
+ X(MFVideoFormat_VP90)
+ X(MFVideoFormat_Y210)
+ X(MFVideoFormat_Y216)
+ X(MFVideoFormat_Y410)
+ X(MFVideoFormat_Y416)
+ X(MFVideoFormat_Y41P)
+ X(MFVideoFormat_Y41T)
+ X(MFVideoFormat_Y42T)
+ X(MFVideoFormat_YUY2)
+ X(MFVideoFormat_YV12)
+ X(MFVideoFormat_YVYU)
+ X(MFVideoFormat_YVU9)
+ X(MFVideoFormat_WMV1)
+ X(MFVideoFormat_WMV2)
+ X(MFVideoFormat_WMV3)
+ X(MFVideoFormat_WVC1)
+
+ X(MFVideoFormat_Base_HDCP)
+ X(MFVideoFormat_H264_ES)
+ X(MFVideoFormat_H264_HDCP)
+ X(MFVideoFormat_HEVC_HDCP)
+ X(MFVideoFormat_MPEG2)
+
+ X(MFAudioFormat_Base)
+ X(MFAudioFormat_AAC)
+ X(MFAudioFormat_ADTS)
+ X(MFAudioFormat_ALAC)
+ X(MFAudioFormat_AMR_NB)
+ X(MFAudioFormat_AMR_WB)
+ X(MFAudioFormat_AMR_WP)
+ X(MFAudioFormat_Dolby_AC3_SPDIF)
+ X(MFAudioFormat_DRM)
+ X(MFAudioFormat_DTS)
+ X(MFAudioFormat_Float)
+ X(MFAudioFormat_FLAC)
+ X(MFAudioFormat_MP3)
+ X(MFAudioFormat_MPEG)
+ X(MFAudioFormat_MSP1)
+ X(MFAudioFormat_Opus)
+ X(MFAudioFormat_PCM)
+ X(MFAudioFormat_WMAudioV8)
+ X(MFAudioFormat_WMAudioV9)
+ X(MFAudioFormat_WMAudio_Lossless)
+ X(MFAudioFormat_WMASPDIF)
+
+ X(MFAudioFormat_AAC_HDCP)
+ X(MFAudioFormat_ADTS_HDCP)
+ X(MFAudioFormat_Base_HDCP)
+ X(MFAudioFormat_Dolby_AC3)
+ X(MFAudioFormat_Dolby_AC3_HDCP)
+ X(MFAudioFormat_Dolby_DDPlus)
+ X(MFAudioFormat_Float_SpatialObjects)
+ X(MFAudioFormat_LPCM)
+ X(MFAudioFormat_PCM_HDCP)
+ X(MFAudioFormat_Vorbis)
+
+ X(MFMediaType_Binary)
+ X(MFMediaType_Default)
+ X(MFMediaType_FileTransfer)
+ X(MFMediaType_HTML)
+ X(MFMediaType_Image)
+ X(MFMediaType_MultiplexedFrames)
+ X(MFMediaType_Perception)
+ X(MFMediaType_Protected)
+ X(MFMediaType_SAMI)
+ X(MFMediaType_Script)
+ X(MFMediaType_Stream)
+ X(MFMediaType_Subtitle)
+#undef X
+ return NULL;
+}
+
+static const char *wine_dbgstr_mfmediatype( IMFMediaType *type )
+{
+ GUID major, minor;
+ const char *major_s = "none", *minor_s = "none";
+
+ if (!type) return "{null}";
+
+ if (SUCCEEDED( IMFMediaType_GetMajorType( type, &major ) ))
+ {
+ major_s = wine_dbgstr_mfmediatype_guid( &major );
+
+ if (!major_s)
+ major_s = wine_dbgstr_guid( &major );
+ }
+
+ if (SUCCEEDED( IMFMediaType_GetGUID( type, &MF_MT_SUBTYPE, &minor ) ))
+ {
+ minor_s = wine_dbgstr_mfmediatype_guid( &minor );
+
+ if (!minor_s)
+ minor_s = wine_dbgstr_guid( &minor );
+ }
+
+ return wine_dbg_sprintf( "{%s, %s}", major_s, minor_s );
+}
+
+#endif /* __WINE_WINE_MFDEBUG_H */
--
2.35.1
4
6
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/msi/tests/Makefile.in | 1 -
dlls/msi/tests/action.c | 472 +++----
dlls/msi/tests/automation.c | 397 +++---
dlls/msi/tests/custom.c | 2 +-
dlls/msi/tests/db.c | 164 +--
dlls/msi/tests/format.c | 207 ++-
dlls/msi/tests/install.c | 102 +-
dlls/msi/tests/msi.c | 2651 +++++++++++++++++------------------
dlls/msi/tests/package.c | 454 +++---
dlls/msi/tests/patch.c | 25 +-
dlls/msi/tests/record.c | 22 +-
dlls/msi/tests/source.c | 654 ++++-----
dlls/msi/tests/suminfo.c | 2 +-
13 files changed, 2577 insertions(+), 2576 deletions(-)
diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in
index 3970a211d77..5c99e67a68a 100644
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = msi.dll
IMPORTS = secur32 cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32
diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c
index 1889e39195b..224637eb286 100644
--- a/dlls/msi/tests/action.c
+++ b/dlls/msi/tests/action.c
@@ -2472,7 +2472,7 @@ static void remove_restore_point(DWORD seq_number)
res = pSRRemoveRestorePoint(seq_number);
if (res != ERROR_SUCCESS)
- trace("Failed to remove the restore point : %08x\n", res);
+ trace("Failed to remove the restore point : %#lx\n", res);
}
static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access )
@@ -2513,8 +2513,8 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase
size = MAX_PATH;
val[0] = '\0';
res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size);
- ok_(__FILE__, line)(!res, "Failed to query value, error %u\n", res);
- ok_(__FILE__, line)(type == REG_SZ || type == REG_EXPAND_SZ, "Got wrong type %u\n", type);
+ ok_(__FILE__, line)(!res, "Failed to query value, error %ld\n", res);
+ ok_(__FILE__, line)(type == REG_SZ || type == REG_EXPAND_SZ, "Got wrong type %lu\n", type);
todo_wine_if (todo)
{
if (bcase)
@@ -2538,9 +2538,9 @@ static void check_reg_multi(HKEY prodkey, const char *name, const char *expect,
size = MAX_PATH;
val[0] = '\0';
res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size);
- ok_(__FILE__, line)(!res, "Failed to query value, error %u\n", res);
- ok_(__FILE__, line)(type == REG_MULTI_SZ, "Got wrong type %u\n", type);
- ok_(__FILE__, line)(size == expect_size, "expected size %u, got %u\n", expect_size, size);
+ ok_(__FILE__, line)(!res, "Failed to query value, error %ld\n", res);
+ ok_(__FILE__, line)(type == REG_MULTI_SZ, "Got wrong type %lu\n", type);
+ ok_(__FILE__, line)(size == expect_size, "expected size %lu, got %lu\n", expect_size, size);
ok_(__FILE__, line)(!memcmp(val, expect, size), "got %s\n", debugstr_an(val, size));
}
@@ -2551,10 +2551,10 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, BOOL todo
size = sizeof(DWORD);
res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)&val, &size);
- ok_(__FILE__, line)(!res, "Failed to query value, error %u\n", res);
- ok_(__FILE__, line)(type == REG_DWORD, "Got wrong type %u\n", type);
+ ok_(__FILE__, line)(!res, "Failed to query value, error %ld\n", res);
+ ok_(__FILE__, line)(type == REG_DWORD, "Got wrong type %lu\n", type);
todo_wine_if (todo)
- ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val);
+ ok_(__FILE__, line)(val == expected, "Expected %lu, got %lu\n", expected, val);
}
#define CHECK_REG_STR(prodkey, name, expected) \
@@ -2641,7 +2641,7 @@ static void extract_resource(const char *name, const char *type, const char *pat
void *ptr;
file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %lu\n", path, GetLastError());
res = FindResourceA(NULL, name, type);
ok( res != 0, "couldn't find resource\n" );
@@ -2700,10 +2700,10 @@ static void test_register_product(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey);
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST");
CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1");
@@ -2731,15 +2731,15 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD_TODO(hkey, "EstimatedSize", get_estimated_size());
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
sprintf(keypath, userdata, usersid);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = sizeof(path);
RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size);
@@ -2772,43 +2772,43 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD_TODO(props, "EstimatedSize", get_estimated_size());
res = RegDeleteKeyA(props, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(props);
res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage);
todo_wine
{
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
res = RegDeleteKeyA(usage, "");
todo_wine
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(usage);
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", "");
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
/* RegisterProduct, machine */
r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 ALLUSERS=1");
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST");
CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1");
@@ -2836,15 +2836,15 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD_TODO(hkey, "EstimatedSize", get_estimated_size());
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
sprintf(keypath, userdata, "S-1-5-18");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = sizeof(path);
RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size);
@@ -2877,30 +2877,30 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD_TODO(props, "EstimatedSize", get_estimated_size());
res = RegDeleteKeyA(props, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(props);
res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage);
todo_wine
{
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
res = RegDeleteKeyA(usage, "");
todo_wine
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(usage);
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", "");
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
if (is_wow64 || is_64bit)
@@ -2914,13 +2914,13 @@ static void test_register_product(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST");
CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1");
@@ -2948,15 +2948,15 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD_TODO(hkey, "EstimatedSize", get_estimated_size());
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
sprintf(keypath, userdata, "S-1-5-18");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = sizeof(path);
RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size);
@@ -2989,30 +2989,30 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD_TODO(props, "EstimatedSize", get_estimated_size());
res = RegDeleteKeyA(props, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(props);
res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage);
todo_wine
{
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
res = RegDeleteKeyA(usage, "");
todo_wine
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(usage);
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", "");
res = RegDeleteKeyA(hkey, "");
- ok(!res, "got %d\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(hkey);
}
else
@@ -3085,7 +3085,7 @@ static void test_publish_product(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, badprod, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
sprintf(keypath, prodpath, usersid);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
@@ -3105,13 +3105,13 @@ static void test_publish_product(void)
return;
}
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(hkey, "Patches", 0, access, &patches);
- todo_wine ok(!res, "Expected ERROR_SUCCESS, got %d\n", res);
+ todo_wine ok(!res, "Expected ERROR_SUCCESS, got %ld\n", res);
if (!res)
CHECK_DEL_REG_STR(patches, "AllPatches", "");
@@ -3122,7 +3122,7 @@ static void test_publish_product(void)
currentuser:
res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST");
CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F");
@@ -3136,7 +3136,7 @@ currentuser:
CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0");
res = RegOpenKeyA(hkey, "SourceList", &sourcelist);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(path, "n;1;");
lstrcatA(path, temp);
@@ -3144,7 +3144,7 @@ currentuser:
CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi");
res = RegOpenKeyA(sourcelist, "Net", &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(net, "1", temp);
@@ -3152,7 +3152,7 @@ currentuser:
RegCloseKey(net);
res = RegOpenKeyA(sourcelist, "Media", &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(media, "1", "DISK1;");
@@ -3164,7 +3164,7 @@ currentuser:
RegCloseKey(hkey);
res = RegOpenKeyA(HKEY_CURRENT_USER, cuupgrades, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", "");
@@ -3180,17 +3180,17 @@ currentuser:
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, badprod, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
sprintf(keypath, prodpath, "S-1-5-18");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(hkey, "Patches", 0, access, &patches);
- todo_wine ok(!res, "Expected ERROR_SUCCESS, got %d\n", res);
+ todo_wine ok(!res, "Expected ERROR_SUCCESS, got %ld\n", res);
if (!res)
CHECK_DEL_REG_STR(patches, "AllPatches", "");
@@ -3201,7 +3201,7 @@ currentuser:
machprod:
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machprod, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST");
CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F");
@@ -3215,7 +3215,7 @@ machprod:
CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0");
res = RegOpenKeyExA(hkey, "SourceList", 0, access, &sourcelist);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(path, "n;1;");
lstrcatA(path, temp);
@@ -3223,36 +3223,36 @@ machprod:
CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi");
res = RegOpenKeyExA(sourcelist, "Net", 0, access, &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(net, "1", temp);
res = delete_key(net, "", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(net);
res = RegOpenKeyExA(sourcelist, "Media", 0, access, &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(media, "1", "DISK1;");
res = delete_key(media, "", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(media);
res = delete_key(sourcelist, "", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(sourcelist);
res = delete_key(hkey, "", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machup, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", "");
res = delete_key(hkey, "", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(hkey);
error:
@@ -3314,13 +3314,13 @@ static void test_publish_features(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, featkey, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(hkey, "feature", "");
CHECK_REG_STR(hkey, "montecristo", "");
@@ -3332,7 +3332,7 @@ static void test_publish_features(void)
sprintf(keypath, udfeatpath, usersid);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(hkey, "feature", "VGtfp^p+,?82@JU1j_KE");
CHECK_REG_STR(hkey, "montecristo", "VGtfp^p+,?82@JU1j_KE");
@@ -3351,12 +3351,12 @@ static void test_publish_features(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, featkey, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(hkey, "feature", "");
CHECK_REG_STR(hkey, "montecristo", "");
@@ -3368,7 +3368,7 @@ static void test_publish_features(void)
sprintf(keypath, udfeatpath, "S-1-5-18");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(hkey, "feature", "VGtfp^p+,?82@JU1j_KE");
CHECK_REG_STR(hkey, "montecristo", "VGtfp^p+,?82@JU1j_KE");
@@ -3501,7 +3501,7 @@ static void test_register_user(void)
sprintf(keypath, keypropsfmt, usersid);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(props, "ProductID", "none");
CHECK_REG_STR(props, "RegCompany", company);
@@ -3523,7 +3523,7 @@ static void test_register_user(void)
sprintf(keypath, keypropsfmt, "S-1-5-18");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(props, "ProductID", "none");
CHECK_REG_STR(props, "RegCompany", company);
@@ -3595,12 +3595,12 @@ static void test_process_components(void)
sprintf(keypath, keyfmt, usersid, "CBABC2FDCCB35E749A8944D8C1C098B5");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB",
NULL, NULL, (LPBYTE)val, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(program_files_maximus,PROG_FILES_DIR);
lstrcatA(program_files_maximus,"\\msitest\\maximus");
@@ -3609,7 +3609,7 @@ static void test_process_components(void)
"Expected \"%s\", got \"%s\"\n", program_files_maximus, val);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
delete_key(comp, "", access);
@@ -3617,17 +3617,17 @@ static void test_process_components(void)
sprintf(keypath, keyfmt, usersid, "241C3DA58FECD0945B9687D408766058");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB",
NULL, NULL, (LPBYTE)val, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(val, "01\\msitest\\augustus"),
"Expected \"01\\msitest\\augustus\", got \"%s\"\n", val);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
delete_key(comp, "", access);
@@ -3641,17 +3641,17 @@ static void test_process_components(void)
sprintf(keypath, keyfmt, "S-1-5-18", "CBABC2FDCCB35E749A8944D8C1C098B5");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB",
NULL, NULL, (LPBYTE)val, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpiA(val, program_files_maximus),
"Expected \"%s\", got \"%s\"\n", program_files_maximus, val);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
delete_key(comp, "", access);
@@ -3659,17 +3659,17 @@ static void test_process_components(void)
sprintf(keypath, keyfmt, "S-1-5-18", "241C3DA58FECD0945B9687D408766058");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB",
NULL, NULL, (LPBYTE)val, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(val, "01\\msitest\\augustus"),
"Expected \"01\\msitest\\augustus\", got \"%s\"\n", val);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
delete_key(comp, "", access);
@@ -3712,12 +3712,12 @@ static void test_publish(void)
access |= KEY_WOW64_64KEY;
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey, 0, KEY_ALL_ACCESS, &uninstall);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
if (is_64bit)
{
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey_32node, 0, KEY_ALL_ACCESS, &uninstall_32node);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CreateDirectoryA("msitest", NULL);
@@ -3739,7 +3739,7 @@ static void test_publish(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r);
ok(state == 0xdead, "got %d\n", state);
- ok(error == 0xdeadbeef, "got %u\n", error);
+ ok(error == 0xdeadbeef, "got %lu\n", error);
state = 0xdead;
SetLastError(0xdeadbeef);
@@ -3747,7 +3747,7 @@ static void test_publish(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r);
ok(state == 0xdead, "got %d\n", state);
- ok(error == ERROR_SUCCESS, "got %u\n", error);
+ ok(error == ERROR_SUCCESS, "got %lu\n", error);
state = 0xdead;
SetLastError(0xdeadbeef);
@@ -3755,7 +3755,7 @@ static void test_publish(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r);
ok(state == 0xdead, "got %d\n", state);
- ok(error == ERROR_SUCCESS, "got %u\n", error);
+ ok(error == ERROR_SUCCESS, "got %lu\n", error);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
@@ -3769,7 +3769,7 @@ static void test_publish(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* nothing published */
r = MsiInstallProductA(msifile, NULL);
@@ -3797,7 +3797,7 @@ static void test_publish(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* PublishProduct and RegisterProduct */
r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 PUBLISH_PRODUCT=1");
@@ -3822,14 +3822,14 @@ static void test_publish(void)
if (is_64bit)
{
res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
else
{
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
if (is_wow64 && res == ERROR_FILE_NOT_FOUND) /* XP - Vista, Wow64 */
res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@@ -3879,7 +3879,7 @@ static void test_publish(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* complete install */
r = MsiInstallProductA(msifile, "FULL=1");
@@ -3899,7 +3899,7 @@ static void test_publish(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r);
ok(state == 0xdead, "got %d\n", state);
- ok(error == 0xdeadbeef, "got %u\n", error);
+ ok(error == 0xdeadbeef, "got %lu\n", error);
state = 0xdead;
SetLastError(0xdeadbeef);
@@ -3907,7 +3907,7 @@ static void test_publish(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r);
ok(state == 0xdead, "got %d\n", state);
- ok(error == ERROR_SUCCESS, "got %u\n", error);
+ ok(error == ERROR_SUCCESS, "got %lu\n", error);
state = 0xdead;
SetLastError(0xdeadbeef);
@@ -3915,7 +3915,7 @@ static void test_publish(void)
error = GetLastError();
ok(r == ERROR_SUCCESS, "got %u\n", r);
ok(state == INSTALLSTATE_LOCAL, "got %d\n", state);
- ok(error == ERROR_SUCCESS, "got %u\n", error);
+ ok(error == ERROR_SUCCESS, "got %lu\n", error);
state = MsiQueryFeatureStateA(prodcode, "montecristo");
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
@@ -3928,12 +3928,12 @@ static void test_publish(void)
if (is_64bit)
{
res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
else
{
res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@@ -3984,7 +3984,7 @@ static void test_publish(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* complete install */
r = MsiInstallProductA(msifile, "FULL=1");
@@ -4009,12 +4009,12 @@ static void test_publish(void)
if (is_64bit)
{
res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
else
{
res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@@ -4067,12 +4067,12 @@ static void test_publish(void)
if (is_64bit)
{
res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
else
{
res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@@ -4125,12 +4125,12 @@ static void test_publish(void)
if (is_64bit)
{
res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
else
{
res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@@ -4181,7 +4181,7 @@ static void test_publish(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* complete install */
r = MsiInstallProductA(msifile, "FULL=1");
@@ -4206,12 +4206,12 @@ static void test_publish(void)
if (is_64bit)
{
res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
else
{
res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@@ -4262,7 +4262,7 @@ static void test_publish(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* make sure 'Program Files\msitest' is removed */
delete_pfmsitest_files();
@@ -4317,7 +4317,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
size = MAX_PATH;
@@ -4325,7 +4325,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1");
@@ -4339,7 +4339,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
size = MAX_PATH;
@@ -4347,7 +4347,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1");
@@ -4361,7 +4361,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
size = MAX_PATH;
@@ -4369,7 +4369,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1");
@@ -4383,7 +4383,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
size = MAX_PATH;
@@ -4391,7 +4391,7 @@ static void test_publish_sourcelist(void)
r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "got %lu\n", size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1");
@@ -4406,7 +4406,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "msitest.msi"), "Expected 'msitest.msi', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(value, "aaa");
@@ -4414,7 +4414,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATHA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(value, "aaa");
@@ -4422,7 +4422,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
lstrcpyA(path, CURR_DIR);
lstrcatA(path, "\\");
@@ -4433,7 +4433,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value);
- ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size);
+ ok(size == lstrlenA(path), "Expected %d, got %lu\n", lstrlenA(path), size);
size = MAX_PATH;
lstrcpyA(value, "aaa");
@@ -4441,7 +4441,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(value, "aaa");
@@ -4449,7 +4449,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(value, "aaa");
@@ -4457,7 +4457,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value);
- ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size);
+ ok(size == lstrlenA(path), "Expected %d, got %lu\n", lstrlenA(path), size);
size = MAX_PATH;
lstrcpyA(value, "aaa");
@@ -4465,7 +4465,7 @@ static void test_publish_sourcelist(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 1, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* complete uninstall */
r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL");
@@ -4823,28 +4823,28 @@ static void test_write_registry_values(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
res = RegCreateKeyA(HKEY_CURRENT_USER, "msitest", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value1", 0, REG_MULTI_SZ, (const BYTE *)"two\0", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value2", 0, REG_MULTI_SZ, (const BYTE *)"one\0", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value3", 0, REG_MULTI_SZ, (const BYTE *)"two\0", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value4", 0, REG_MULTI_SZ, (const BYTE *)"one\0", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value5", 0, REG_MULTI_SZ, (const BYTE *)"one\0two\0", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value6", 0, REG_MULTI_SZ, (const BYTE *)"one\0", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "Value7", 0, REG_SZ, (const BYTE *)"one", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkey, "instremove", 0, REG_SZ, (const BYTE *)"val", 3);
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
res = RegCreateKeyA(hkey, "instremove", &subkey);
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(subkey);
r = MsiInstallProductA(msifile, NULL);
@@ -4861,21 +4861,21 @@ static void test_write_registry_values(void)
size = sizeof(buf);
res = RegQueryValueExA(hkey, "expandsz", NULL, &type, (BYTE *)buf, &size);
- ok(!res, "got %u\n", res);
- ok(type == REG_EXPAND_SZ, "got %d\n", type);
+ ok(!res, "got %ld\n", res);
+ ok(type == REG_EXPAND_SZ, "got %ld\n", type);
ok(!strcmp(buf, "string"), "got %s\n", buf);
size = sizeof(buf);
res = RegQueryValueExA(hkey, "binary", NULL, &type, (BYTE *)buf, &size);
- ok(!res, "got %u\n", res);
- ok(type == REG_BINARY, "got %d\n", type);
- ok(size == 4, "got size %u\n", size);
+ ok(!res, "got %ld\n", res);
+ ok(type == REG_BINARY, "got %ld\n", type);
+ ok(size == 4, "got size %lu\n", size);
ok(!memcmp(buf, "\x01\x23\x45\x67", 4), "wrong data\n");
CHECK_REG_STR(hkey, "", "default");
res = RegOpenKeyA(hkey, "VisualStudio", &subkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(subkey);
CHECK_REG_MULTI(hkey, "Value1", "one\0");
@@ -4890,55 +4890,55 @@ static void test_write_registry_values(void)
CHECK_REG_DWORD(hkey, "source", 1);
res = RegOpenKeyA(hkey, "subkey", &subkey);
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
res = RegQueryValueExA(subkey, "", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
RegCloseKey(subkey);
res = RegOpenKeyA(hkey, "create", &subkey);
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(subkey);
res = RegOpenKeyA(hkey, "delete", &subkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegCreateKeyA(hkey, "delete", &subkey);
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(subkey);
res = RegQueryValueExA(hkey, "instremove", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegOpenKeyA(hkey, "instremove", &subkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(!r, "got %u\n", r);
res = RegQueryValueExA(hkey, "sz", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "multisz", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "dword", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "expandsz", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "binary", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegOpenKeyA(hkey, "VisualStudio", &subkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "Value1", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "Value4", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "Value5", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "Value6", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "Value7", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
todo_wine {
CHECK_REG_MULTI(hkey, "Value2", "one\0");
@@ -4946,25 +4946,25 @@ todo_wine {
}
res = RegQueryValueExA(hkey, "format", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegQueryValueExA(hkey, "source", NULL, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegOpenKeyA(hkey, "subkey", &subkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
res = RegOpenKeyA(hkey, "create", &subkey);
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
RegCloseKey(subkey);
res = RegDeleteKeyA(hkey, "create");
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
res = RegOpenKeyA(hkey, "delete", &subkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
RegCloseKey(hkey);
res = RegDeleteKeyA(HKEY_CURRENT_USER, "msitest");
- ok(!res, "got %u\n", res);
+ ok(!res, "got %ld\n", res);
error:
DeleteFileA(msifile);
@@ -4987,20 +4987,20 @@ static void test_envvar(void)
create_database(msifile, env_tables, ARRAY_SIZE(env_tables));
res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Session Manager\\Environment",
0, NULL, 0, KEY_ALL_ACCESS, NULL, &env2, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(env, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"0", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(env, "MSITESTVAR21", 0, REG_SZ, (const BYTE *)"1", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
@@ -5018,22 +5018,22 @@ static void test_envvar(void)
CHECK_REG_STR(env, "MSITESTVAR4", "1");
res = RegDeleteValueA(env, "MSITESTVAR5");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegDeleteValueA(env, "MSITESTVAR6");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegDeleteValueA(env, "MSITESTVAR7");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegDeleteValueA(env, "MSITESTVAR8");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegDeleteValueA(env, "MSITESTVAR9");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegDeleteValueA(env, "MSITESTVAR10");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
CHECK_REG_STR(env, "MSITESTVAR11", "1;2");
CHECK_REG_STR(env, "MSITESTVAR12", "1");
@@ -5050,13 +5050,13 @@ static void test_envvar(void)
CHECK_REG_STR(env2, "MSITESTVAR100", "1");
res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegDeleteValueA(env, "MSITESTVAR25");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(!r, "got %u\n", r);
@@ -5073,11 +5073,11 @@ static void test_envvar(void)
{
sprintf(buffer, "MSITESTVAR%i", i);
res = RegDeleteValueA(env, buffer);
- ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res);
+ ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %ld\n", i, res);
}
res = RegDeleteValueA(env2, "MSITESTVAR100");
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
error:
RegDeleteValueA(env, "MSITESTVAR1");
@@ -5165,7 +5165,7 @@ static void test_start_stop_services(void)
CloseServiceHandle(scm);
return;
}
- ok(service != NULL, "Failed to open Spooler, error %d\n", GetLastError());
+ ok(service != NULL, "Failed to open Spooler, error %lu\n", GetLastError());
if (!service) {
CloseServiceHandle(scm);
return;
@@ -5199,7 +5199,7 @@ static void test_start_stop_services(void)
service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS);
ret = ControlService(service, SERVICE_CONTROL_STOP, &status);
- ok(ret, "ControlService failed %u\n", GetLastError());
+ ok(ret, "ControlService failed %lu\n", GetLastError());
CloseServiceHandle(service);
CloseServiceHandle(scm);
@@ -5230,7 +5230,7 @@ static void test_start_stop_services(void)
service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS);
ret = ControlService(service, SERVICE_CONTROL_STOP, &status);
- ok(ret, "ControlService failed %u\n", GetLastError());
+ ok(ret, "ControlService failed %lu\n", GetLastError());
CloseServiceHandle(service);
CloseServiceHandle(scm);
@@ -5253,7 +5253,7 @@ static void delete_test_service(const char *name)
if (service)
{
ret = DeleteService( service );
- ok( ret, "failed to delete service %u\n", GetLastError() );
+ ok( ret, "failed to delete service %lu\n", GetLastError() );
CloseServiceHandle(service);
}
CloseServiceHandle(manager);
@@ -5272,13 +5272,13 @@ static void test_delete_services(void)
}
manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
- ok(manager != NULL, "can't open service manager %u\n", GetLastError());
+ ok(manager != NULL, "can't open service manager %lu\n", GetLastError());
if (!manager) return;
service = CreateServiceA(manager, "TestService3", "TestService3",
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START,
SERVICE_ERROR_NORMAL, "C:\\doesnt_exist.exe", NULL, NULL, NULL, NULL, NULL);
- ok(service != NULL, "can't create service %u\n", GetLastError());
+ ok(service != NULL, "can't create service %lu\n", GetLastError());
CloseServiceHandle(service);
CloseServiceHandle(manager);
if (!service) return;
@@ -5303,7 +5303,7 @@ static void test_delete_services(void)
service = OpenServiceA(manager, "TestService3", GENERIC_ALL);
error = GetLastError();
ok(service == NULL, "TestService3 not deleted\n");
- ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %u\n", error);
+ ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %lu\n", error);
CloseServiceHandle(manager);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
@@ -5370,7 +5370,7 @@ static void test_install_services(void)
ok(service == NULL, "TestService4 installed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
if (res == ERROR_SUCCESS)
{
@@ -5378,7 +5378,7 @@ static void test_install_services(void)
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);
+ ok(err_control == 0, "TestService.ErrorControl wrong, expected 0, got %lu\n", err_control);
RegCloseKey(hKey);
}
@@ -5491,7 +5491,7 @@ static void test_register_font(void)
RegOpenKeyExA(HKEY_LOCAL_MACHINE, regfont2, 0, access, &key);
ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL);
- ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret);
+ ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %ld\n", ret);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -5499,7 +5499,7 @@ static void test_register_font(void)
ok(!delete_pf("msitest", FALSE), "directory not removed\n");
ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL);
- ok(ret == ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret);
+ ok(ret == ERROR_FILE_NOT_FOUND, "unexpected result %ld\n", ret);
RegDeleteValueA(key, "msi test font");
RegCloseKey(key);
@@ -5679,14 +5679,14 @@ static void test_register_typelib(void)
ok(r == ERROR_SUCCESS, "got %u\n", r);
hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb);
- ok(hr == S_OK, "got %#x\n", hr);
+ ok(hr == S_OK, "got %#lx\n", hr);
ITypeLib_Release(tlb);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb);
- ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr);
+ ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#lx\n", hr);
ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n");
ok(!delete_pf("msitest", FALSE), "directory not removed\n");
@@ -5776,24 +5776,24 @@ static void test_publish_components(void)
ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r);
res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key);
- ok(res == ERROR_SUCCESS, "components key not created %d\n", res);
+ ok(res == ERROR_SUCCESS, "components key not created %ld\n", res);
res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, &size);
- ok(res == ERROR_SUCCESS, "value not found %d\n", res);
+ ok(res == ERROR_SUCCESS, "value not found %ld\n", res);
data = malloc(size);
res = RegQueryValueExA(key, "english.txt", NULL, NULL, data, &size);
- ok(res == ERROR_SUCCESS, "value not found %d\n", res);
+ ok(res == ERROR_SUCCESS, "value not found %ld\n", res);
RegCloseKey(key);
res = RegDeleteKeyA(HKEY_CURRENT_USER, keypath);
- ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res);
+ ok(res == ERROR_SUCCESS, "RegDeleteKey failed %ld\n", res);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, REG_OPTION_NON_VOLATILE,
MAXIMUM_ALLOWED | KEY_WOW64_64KEY, NULL, &key, NULL );
- ok(res == ERROR_SUCCESS, "RegCreateKeyEx failed %d\n", res);
+ ok(res == ERROR_SUCCESS, "RegCreateKeyEx failed %ld\n", res);
res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size);
- ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res);
+ ok(res == ERROR_SUCCESS, "RegSetValueEx failed %ld\n", res);
RegCloseKey(key);
size = 0;
@@ -5805,13 +5805,13 @@ static void test_publish_components(void)
res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0);
else
res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2);
- ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res);
+ ok(res == ERROR_SUCCESS, "RegDeleteKey failed %ld\n", res);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &key);
- ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res);
+ ok(res == ERROR_SUCCESS, "RegCreateKey failed %ld\n", res);
res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size);
- ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res);
+ ok(res == ERROR_SUCCESS, "RegSetValueEx failed %ld\n", res);
free(data);
RegCloseKey(key);
@@ -5819,7 +5819,7 @@ static void test_publish_components(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key);
- ok(res == ERROR_FILE_NOT_FOUND, "unexpected result %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "unexpected result %ld\n", res);
ok(!delete_pf("msitest\\english.txt", TRUE), "file not removed\n");
ok(!delete_pf("msitest", FALSE), "directory not removed\n");
@@ -5951,7 +5951,7 @@ static void test_ini_values(void)
CloseHandle(file);
ret = WritePrivateProfileStringA("sectionA", "keyA", "valueA", inifile);
- ok(ret, "failed to write profile string %u\n", GetLastError());
+ ok(ret, "failed to write profile string %lu\n", GetLastError());
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
@@ -5959,19 +5959,19 @@ static void test_ini_values(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile);
- ok(len == 6, "got %u expected 6\n", len);
+ ok(len == 6, "got %lu expected 6\n", len);
len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile);
- ok(!len, "got %u expected 0\n", len);
+ ok(!len, "got %lu expected 0\n", len);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile);
- ok(!len, "got %u expected 0\n", len);
+ ok(!len, "got %lu expected 0\n", len);
len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile);
- ok(!len, "got %u expected 0\n", len);
+ ok(!len, "got %lu expected 0\n", len);
todo_wine ok(!delete_pf("msitest\\test.ini", TRUE), "file removed\n");
ok(!delete_pf("msitest\\inifile.txt", TRUE), "file not removed\n");
@@ -6360,31 +6360,31 @@ static void test_publish_assemblies(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0");
RegCloseKey(hkey);
path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local;
res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox\0");
RegCloseKey(hkey);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0");
RegCloseKey(hkey);
path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local;
res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0");
RegCloseKey(hkey);
/* No registration is done for a local assembly with no matching file */
path = (is_wow64 || is_64bit) ? path_fake_local_wow64 : path_fake_local;
res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -6393,25 +6393,25 @@ static void test_publish_assemblies(void)
if (res == ERROR_SUCCESS)
{
res = RegDeleteValueA(hkey, name_dotnet);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegCloseKey(hkey);
}
path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local;
res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey);
if (res == ERROR_SUCCESS)
{
res = RegDeleteValueA(hkey, name_win32);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegCloseKey(hkey);
}
path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local;
res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
r = MsiInstallProductA(msifile, "ALLUSERS=1");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -6424,31 +6424,31 @@ static void test_publish_assemblies(void)
access = KEY_QUERY_VALUE | KEY_WOW64_64KEY;
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_dotnet, 0, access, &hkey);
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0");
RegCloseKey(hkey);
path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local;
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox\0");
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0");
RegCloseKey(hkey);
path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local;
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0");
RegCloseKey(hkey);
/* No registration is done for a local assembly with no matching file */
path = (is_wow64 || is_64bit) ? classes_path_fake_local_wow64 : classes_path_fake_local;
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -6457,25 +6457,25 @@ static void test_publish_assemblies(void)
if (res == ERROR_SUCCESS)
{
res = RegDeleteValueA(hkey, name_dotnet);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegCloseKey(hkey);
}
path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local;
res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey);
if (res == ERROR_SUCCESS)
{
res = RegDeleteValueA(hkey, name_win32);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
RegCloseKey(hkey);
}
path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local;
res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
done:
DeleteFileA("msitest\\win32.txt");
diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 5d0126e6ac4..45354cc2bb2 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -343,7 +343,7 @@ static BOOL create_package(LPWSTR path)
len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED,
CURR_DIR, -1, path, MAX_PATH);
- ok(len, "MultiByteToWideChar returned error %d\n", GetLastError());
+ ok(len, "MultiByteToWideChar returned error %lu\n", GetLastError());
if (!len)
return FALSE;
@@ -581,32 +581,32 @@ static void test_dispid(void)
{
dispid = get_dispid(pInstaller, ptr->name);
todo_wine_if (ptr->todo)
- ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid);
+ ok(dispid == ptr->did, "%s: expected %ld, got %ld\n", ptr->name, ptr->did, dispid);
ptr++;
}
dispid = get_dispid(pInstaller, "RemovePatches");
- ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid);
+ ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %ld\n", dispid);
dispid = get_dispid(pInstaller, "ApplyMultiplePatches");
- ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid);
+ ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %ld\n", dispid);
dispid = get_dispid(pInstaller, "ProductsEx");
- ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid);
+ ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %ld\n", dispid);
dispid = get_dispid(pInstaller, "PatchesEx");
- ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid);
+ ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %ld\n", dispid);
dispid = get_dispid(pInstaller, "ExtractPatchXMLData");
- ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid);
+ ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %ld\n", dispid);
dispid = get_dispid( pInstaller, "ProductElevated" );
- ok(dispid == 59 || dispid == -1, "Expected 59 or -1, got %d\n", dispid);
+ ok(dispid == 59 || dispid == -1, "Expected 59 or -1, got %ld\n", dispid);
dispid = get_dispid( pInstaller, "ProvideAssembly" );
- ok(dispid == 60 || dispid == -1, "Expected 60 or -1, got %d\n", dispid);
+ ok(dispid == 60 || dispid == -1, "Expected 60 or -1, got %ld\n", dispid);
dispid = get_dispid( pInstaller, "ProductInfoFromScript" );
- ok(dispid == 61 || dispid == -1, "Expected 61 or -1, got %d\n", dispid);
+ ok(dispid == 61 || dispid == -1, "Expected 61 or -1, got %ld\n", dispid);
dispid = get_dispid( pInstaller, "AdvertiseProduct" );
- ok(dispid == 62 || dispid == -1, "Expected 62 or -1, got %d\n", dispid);
+ ok(dispid == 62 || dispid == -1, "Expected 62 or -1, got %ld\n", dispid);
dispid = get_dispid( pInstaller, "CreateAdvertiseScript" );
- ok(dispid == 63 || dispid == -1, "Expected 63 or -1, got %d\n", dispid);
+ ok(dispid == 63 || dispid == -1, "Expected 63 or -1, got %ld\n", dispid);
dispid = get_dispid( pInstaller, "PatchFiles" );
- ok(dispid == 65 || dispid == -1, "Expected 65 or -1, got %d\n", dispid);
+ ok(dispid == 65 || dispid == -1, "Expected 65 or -1, got %ld\n", dispid);
}
/* Test basic IDispatch functions */
@@ -623,16 +623,16 @@ static void test_dispatch(void)
/* Test getting ID of a function name that does not exist */
name = (WCHAR *)L"winetest-automation.msi";
hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid);
- ok(hr == DISP_E_UNKNOWNNAME, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr);
+ ok(hr == DISP_E_UNKNOWNNAME, "IDispatch::GetIDsOfNames returned %#lx\n", hr);
/* Test invoking this function */
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, NULL, NULL);
- ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr);
/* Test getting ID of a function name that does exist */
name = (WCHAR *)L"OpenPackage";
hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid);
- ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::GetIDsOfNames returned %#lx\n", hr);
/* Test invoking this function (without parameters passed) */
if (0) /* All of these crash MSI on Windows XP */
@@ -645,21 +645,21 @@ static void test_dispatch(void)
/* Try with NULL params */
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr);
/* Try one empty parameter */
dispparams.rgvarg = vararg;
dispparams.cArgs = 1;
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr);
/* Try two empty parameters */
dispparams.cArgs = 2;
VariantInit(&vararg[0]);
VariantInit(&vararg[1]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr);
/* Try one parameter, the required BSTR. Second parameter is optional.
* NOTE: The specified package does not exist, which is why the call fails.
@@ -669,7 +669,7 @@ static void test_dispatch(void)
V_VT(&vararg[0]) = VT_BSTR;
V_BSTR(&vararg[0]) = SysAllocString(L"winetest-automation.msi");
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr);
ok_exception(hr, L"OpenPackage,PackagePath,Options");
VariantClear(&vararg[0]);
@@ -682,7 +682,7 @@ static void test_dispatch(void)
V_BSTR(&vararg[1]) = SysAllocString(L"winetest-automation.msi");
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr);
ok_exception(hr, L"OpenPackage,PackagePath,Options");
VariantClear(&vararg[1]);
@@ -696,7 +696,7 @@ static void test_dispatch(void)
VariantInit(&vararg[1]);
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr);
ok_exception(hr, L"OpenPackage,PackagePath,Options");
VariantClear(&vararg[2]);
@@ -709,7 +709,7 @@ static void test_dispatch(void)
V_VT(&vararg[0]) = VT_BSTR;
V_BSTR(&vararg[0]) = SysAllocString(L"winetest-automation.msi");
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr);
VariantClear(&vararg[0]);
VariantClear(&vararg[1]);
@@ -724,7 +724,7 @@ static void test_dispatch(void)
V_VT(&vararg[0]) = VT_BSTR;
V_BSTR(&vararg[0]) = SysAllocString(L"winetest-automation.msi");
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr);
+ todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr);
ok_exception(hr, L"OpenPackage,PackagePath,Options");
VariantClear(&vararg[0]);
if (hr != DISP_E_EXCEPTION)
@@ -744,7 +744,7 @@ static void test_dispatch(void)
DeleteFileW(path);
return;
}
- ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr);
VariantClear(&vararg[0]);
VariantClear(&varresult);
@@ -757,7 +757,7 @@ static void test_dispatch(void)
V_BSTR(&vararg[1]) = SysAllocString(path);
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr);
VariantClear(&vararg[1]);
VariantClear(&varresult);
@@ -771,7 +771,7 @@ static void test_dispatch(void)
VariantInit(&vararg[1]);
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr);
VariantClear(&vararg[2]);
VariantClear(&varresult);
@@ -784,7 +784,7 @@ static void test_dispatch(void)
V_VT(&vararg[0]) = VT_BSTR;
V_BSTR(&vararg[0]) = SysAllocString(path);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr);
VariantClear(&vararg[0]);
VariantClear(&vararg[1]);
@@ -799,7 +799,7 @@ static void test_dispatch(void)
V_VT(&vararg[0]) = VT_I2;
V_BSTR(&vararg[0]) = 0;
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr);
VariantClear(&vararg[1]);
VariantClear(&varresult);
@@ -808,26 +808,26 @@ static void test_dispatch(void)
/* Test invoking a method as a DISPATCH_PROPERTYGET or DISPATCH_PROPERTYPUT */
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr);
VariantInit(&vararg[0]);
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr);
/* Test invoking a read-only property as DISPATCH_PROPERTYPUT or as a DISPATCH_METHOD */
name = (WCHAR *)L"ProductState";
hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid);
- ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::GetIDsOfNames returned %#lx\n", hr);
dispparams.rgvarg = NULL;
dispparams.cArgs = 0;
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr);
dispparams.rgvarg = NULL;
dispparams.cArgs = 0;
hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
+ ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr);
}
/* invocation helper function */
@@ -850,7 +850,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA
MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len );
hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid);
free(name);
- ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr);
+ ok(hr == S_OK, "IDispatch::GetIDsOfNames returned %#lx\n", hr);
if (hr != S_OK) return hr;
memset(&excepinfo, 0, sizeof(excepinfo));
@@ -863,7 +863,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA
if (vtResult != VT_EMPTY)
{
hr = VariantChangeTypeEx(pVarResult, pVarResult, LOCALE_NEUTRAL, 0, vtResult);
- ok(hr == S_OK, "VariantChangeTypeEx returned 0x%08x\n", hr);
+ ok(hr == S_OK, "VariantChangeTypeEx returned %#lx\n", hr);
}
}
@@ -1584,7 +1584,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
/* SummaryInfo::PropertyCount */
hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j);
- ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult %#lx\n", hr);
ok(j == num_info, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info);
/* SummaryInfo::Property, get for properties we have set */
@@ -1598,11 +1598,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
else if (vt == VT_I2) vt = VT_I4;
hr = SummaryInfo_PropertyGet(pSummaryInfo, entry->property, &varresult, vt);
- ok(hr == S_OK, "SummaryInfo_Property (pid %d) failed, hresult 0x%08x\n", entry->property, hr);
+ ok(hr == S_OK, "SummaryInfo_Property (pid %d) failed, hresult %#lx\n", entry->property, hr);
if (V_VT(&varresult) != vt)
skip("Skipping property tests due to type mismatch\n");
else if (vt == VT_I4)
- ok(V_I4(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I4 result expected to be %d, but was %d\n",
+ ok(V_I4(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I4 result expected to be %d, but was %ld\n",
entry->property, entry->iValue, V_I4(&varresult));
else if (vt == VT_DATE)
{
@@ -1628,32 +1628,32 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
/* Invalid pids */
hr = SummaryInfo_PropertyGet(pSummaryInfo, -1, &varresult, VT_EMPTY);
- ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
ok_exception(hr, L"Property,Pid");
hr = SummaryInfo_PropertyGet(pSummaryInfo, 1000, &varresult, VT_EMPTY);
- ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
ok_exception(hr, L"Property,Pid");
/* Unsupported pids */
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_DICTIONARY, &varresult, VT_EMPTY);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_THUMBNAIL, &varresult, VT_EMPTY);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
/* Pids we have not set, one for each type */
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_EMPTY);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, VT_EMPTY);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_EDITTIME, &varresult, VT_EMPTY);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, VT_EMPTY);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
if (!readonly)
{
@@ -1664,10 +1664,10 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
V_VT(&var) = VT_I2;
V_I2(&var) = 1;
hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CODEPAGE, &var);
- ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_I4 /* NOT VT_I2 */);
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
ok(V_I2(&var) == V_I2(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I2(&var), V_I2(&varresult));
VariantClear(&varresult);
VariantClear(&var);
@@ -1676,10 +1676,10 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = SysAllocString(L"Title");
hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_TITLE, &var);
- ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, V_VT(&var));
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
ok_w2("SummaryInfo_PropertyGet expected %s, but returned %s\n", V_BSTR(&var), V_BSTR(&varresult));
VariantClear(&varresult);
VariantClear(&var);
@@ -1689,10 +1689,10 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
FileTimeToSystemTime(&systemtime, &st);
SystemTimeToVariantTime(&st, &V_DATE(&var));
hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_LASTSAVE_DTM, &var);
- ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var));
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult));
VariantClear(&varresult);
VariantClear(&var);
@@ -1701,17 +1701,17 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
V_VT(&var) = VT_I4;
V_I4(&var) = 1000;
hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CHARCOUNT, &var);
- ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr);
hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, V_VT(&var));
- ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
- ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I4(&var), V_I4(&varresult));
+ ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr);
+ ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %ld, but returned %ld\n", V_I4(&var), V_I4(&varresult));
VariantClear(&varresult);
VariantClear(&var);
/* SummaryInfo::PropertyCount */
hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j);
- ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult %#lx\n", hr);
ok(j == num_info+4, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info);
}
}
@@ -1722,7 +1722,7 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly)
HRESULT hr;
hr = Database_OpenView(pDatabase, L"SELECT `Feature` FROM `Feature` WHERE `Feature_Parent`='One'", &pView);
- ok(hr == S_OK, "Database_OpenView failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Database_OpenView failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
IDispatch *pRecord = NULL;
@@ -1730,55 +1730,55 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly)
/* View::Execute */
hr = View_Execute(pView, NULL);
- ok(hr == S_OK, "View_Execute failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "View_Execute failed, hresult %#lx\n", hr);
/* View::Fetch */
hr = View_Fetch(pView, &pRecord);
- ok(hr == S_OK, "View_Fetch failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "View_Fetch failed, hresult %#lx\n", hr);
ok(pRecord != NULL, "View_Fetch should not have returned NULL record\n");
if (pRecord)
{
/* Record::StringDataGet */
memset(szString, 0, sizeof(szString));
hr = Record_StringDataGet(pRecord, 1, szString);
- ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr);
ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Three");
/* Record::StringDataPut with correct index */
hr = Record_StringDataPut(pRecord, 1, L"Two");
- ok(hr == S_OK, "Record_StringDataPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_StringDataPut failed, hresult %#lx\n", hr);
/* Record::StringDataGet */
memset(szString, 0, sizeof(szString));
hr = Record_StringDataGet(pRecord, 1, szString);
- ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr);
ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Two");
/* Record::StringDataPut with incorrect index */
hr = Record_StringDataPut(pRecord, -1, szString);
- ok(hr == DISP_E_EXCEPTION, "Record_StringDataPut failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Record_StringDataPut failed, hresult %#lx\n", hr);
ok_exception(hr, L"StringData,Field");
/* View::Modify with incorrect parameters */
hr = View_Modify(pView, -5, NULL);
- ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult %#lx\n", hr);
ok_exception(hr, L"Modify,Mode,Record");
hr = View_Modify(pView, -5, pRecord);
- ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult %#lx\n", hr);
ok_exception(hr, L"Modify,Mode,Record");
hr = View_Modify(pView, MSIMODIFY_REFRESH, NULL);
- ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult %#lx\n", hr);
ok_exception(hr, L"Modify,Mode,Record");
hr = View_Modify(pView, MSIMODIFY_REFRESH, pRecord);
- ok(hr == S_OK, "View_Modify failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "View_Modify failed, hresult %#lx\n", hr);
/* Record::StringDataGet, confirm that the record is back to its unmodified value */
memset(szString, 0, sizeof(szString));
hr = Record_StringDataGet(pRecord, 1, szString);
- ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr);
todo_wine ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Three");
IDispatch_Release(pRecord);
@@ -1786,14 +1786,14 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly)
/* View::Fetch */
hr = View_Fetch(pView, &pRecord);
- ok(hr == S_OK, "View_Fetch failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "View_Fetch failed, hresult %#lx\n", hr);
ok(pRecord != NULL, "View_Fetch should not have returned NULL record\n");
if (pRecord)
{
/* Record::StringDataGet */
memset(szString, 0, sizeof(szString));
hr = Record_StringDataGet(pRecord, 1, szString);
- ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr);
ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Two");
IDispatch_Release(pRecord);
@@ -1801,21 +1801,21 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly)
/* View::Fetch */
hr = View_Fetch(pView, &pRecord);
- ok(hr == S_OK, "View_Fetch failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "View_Fetch failed, hresult %#lx\n", hr);
ok(pRecord == NULL, "View_Fetch should have returned NULL record\n");
if (pRecord)
IDispatch_Release(pRecord);
/* View::Close */
hr = View_Close(pView);
- ok(hr == S_OK, "View_Close failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "View_Close failed, hresult %#lx\n", hr);
IDispatch_Release(pView);
}
/* Database::SummaryInformation */
hr = Database_SummaryInformation(pDatabase, TEST_SUMMARYINFO_PROPERTIES_MODIFIED, &pSummaryInfo);
- ok(hr == S_OK, "Database_SummaryInformation failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Database_SummaryInformation failed, hresult %#lx\n", hr);
ok(pSummaryInfo != NULL, "Database_SummaryInformation should not have returned NULL record\n");
if (pSummaryInfo)
{
@@ -1837,93 +1837,93 @@ static void test_Session(IDispatch *pSession)
/* Session::Installer */
hr = Session_Installer(pSession, &pInst);
- ok(hr == S_OK, "Session_Installer failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_Installer failed, hresult %#lx\n", hr);
ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n");
ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n");
refs_before = IDispatch_AddRef(pInst);
hr = Session_Installer(pSession, &pInst);
- ok(hr == S_OK, "Session_Installer failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_Installer failed, hresult %#lx\n", hr);
ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n");
ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n");
refs_after = IDispatch_Release(pInst);
- ok(refs_before == refs_after, "got %u and %u\n", refs_before, refs_after);
+ ok(refs_before == refs_after, "got %lu and %lu\n", refs_before, refs_after);
/* Session::Property, get */
memset(stringw, 0, sizeof(stringw));
hr = Session_PropertyGet(pSession, L"ProductName", stringw);
- ok(hr == S_OK, "Session_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_PropertyGet failed, hresult %#lx\n", hr);
if (lstrcmpW(stringw, L"MSITEST") != 0)
{
len = WideCharToMultiByte(CP_ACP, 0, stringw, -1, string, MAX_PATH, NULL, NULL);
- ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError());
+ ok(len, "WideCharToMultiByteChar returned error %lu\n", GetLastError());
ok(0, "Property \"ProductName\" expected to be \"MSITEST\" but was \"%s\"\n", string);
}
/* Session::Property, put */
hr = Session_PropertyPut(pSession, L"ProductName", L"ProductName");
- ok(hr == S_OK, "Session_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_PropertyPut failed, hresult %#lx\n", hr);
memset(stringw, 0, sizeof(stringw));
hr = Session_PropertyGet(pSession, L"ProductName", stringw);
- ok(hr == S_OK, "Session_PropertyGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_PropertyGet failed, hresult %#lx\n", hr);
if (lstrcmpW(stringw, L"ProductName") != 0)
{
len = WideCharToMultiByte(CP_ACP, 0, stringw, -1, string, MAX_PATH, NULL, NULL);
- ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError());
+ ok(len, "WideCharToMultiByteChar returned error %lu\n", GetLastError());
ok(0, "Property \"ProductName\" expected to be \"ProductName\" but was \"%s\"\n", string);
}
/* Try putting a property using empty property identifier */
hr = Session_PropertyPut(pSession, L"", L"ProductName");
- ok(hr == DISP_E_EXCEPTION, "Session_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Session_PropertyPut failed, hresult %#lx\n", hr);
ok_exception(hr, L"Property,Name");
/* Try putting a property using illegal property identifier */
hr = Session_PropertyPut(pSession, L"=", L"ProductName");
- ok(hr == S_OK, "Session_PropertyPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_PropertyPut failed, hresult %#lx\n", hr);
/* Session::Language, get */
hr = Session_LanguageGet(pSession, &len);
- ok(hr == S_OK, "Session_LanguageGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_LanguageGet failed, hresult %#lx\n", hr);
/* Not sure how to check the language is correct */
/* Session::Mode, get */
hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool);
- ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
ok(!bool, "Reboot at end session mode is %d\n", bool);
hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool);
- ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
ok(!bool, "Maintenance mode is %d\n", bool);
/* Session::Mode, put */
hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE);
- ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);
hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool);
- ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
ok(bool, "Reboot at end session mode is %d, expected 1\n", bool);
hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE); /* set it again so we don't reboot */
- ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);
hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_TRUE);
- ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);
ok_exception(hr, L"Mode,Flag");
hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool);
- ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
ok(bool, "Reboot now mode is %d, expected 1\n", bool);
hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE); /* set it again so we don't reboot */
- ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);
ok_exception(hr, L"Mode,Flag");
hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, VARIANT_TRUE);
- ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult %#lx\n", hr);
ok_exception(hr, L"Mode,Flag");
/* Session::Database, get */
hr = Session_Database(pSession, &pDatabase);
- ok(hr == S_OK, "Session_Database failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_Database failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
test_Database(pDatabase, TRUE);
@@ -1932,61 +1932,61 @@ static void test_Session(IDispatch *pSession)
/* Session::EvaluateCondition */
hr = Session_EvaluateCondition(pSession, NULL, &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_NONE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
hr = Session_EvaluateCondition(pSession, L"", &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_NONE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
hr = Session_EvaluateCondition(pSession, L"=", &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_ERROR, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
/* Session::DoAction(CostInitialize) must occur before the next statements */
hr = Session_DoAction(pSession, L"CostInitialize", &myint);
- ok(hr == S_OK, "Session_DoAction failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_DoAction failed, hresult %#lx\n", hr);
ok(myint == IDOK, "DoAction(CostInitialize) returned %d, %d expected\n", myint, IDOK);
/* Session::SetInstallLevel */
hr = Session_SetInstallLevel(pSession, INSTALLLEVEL_MINIMUM);
- ok(hr == S_OK, "Session_SetInstallLevel failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_SetInstallLevel failed, hresult %#lx\n", hr);
/* Session::FeatureCurrentState, get */
hr = Session_FeatureCurrentState(pSession, L"One", &myint);
- ok(hr == S_OK, "Session_FeatureCurrentState failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_FeatureCurrentState failed, hresult %#lx\n", hr);
ok(myint == INSTALLSTATE_UNKNOWN, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
/* Session::Message */
hr = Installer_CreateRecord(0, &record);
- ok(hr == S_OK, "Installer_CreateRecord failed: %08x\n", hr);
+ ok(hr == S_OK, "Installer_CreateRecord failed: %#lx\n", hr);
hr = Session_Message(pSession, INSTALLMESSAGE_INFO, record, &myint);
- ok(hr == S_OK, "Session_Message failed: %08x\n", hr);
+ ok(hr == S_OK, "Session_Message failed: %#lx\n", hr);
ok(myint == 0, "Session_Message returned %x\n", myint);
/* Session::EvaluateCondition */
hr = Session_EvaluateCondition(pSession, L"!One>0", &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
hr = Session_EvaluateCondition(pSession, L"!One=-1", &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_TRUE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
/* Session::FeatureRequestState, put */
hr = Session_FeatureRequestStatePut(pSession, L"One", INSTALLSTATE_ADVERTISED);
- ok(hr == S_OK, "Session_FeatureRequestStatePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_FeatureRequestStatePut failed, hresult %#lx\n", hr);
hr = Session_FeatureRequestStateGet(pSession, L"One", &myint);
- ok(hr == S_OK, "Session_FeatureRequestStateGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_FeatureRequestStateGet failed, hresult %#lx\n", hr);
ok(myint == INSTALLSTATE_ADVERTISED, "Feature request state was %d but expected %d\n", myint, INSTALLSTATE_ADVERTISED);
/* Session::EvaluateCondition */
hr = Session_EvaluateCondition(pSession, L"$One=-1", &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
hr = Session_EvaluateCondition(pSession, L"$One>0", &myint);
- ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr);
ok(myint == MSICONDITION_TRUE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
}
@@ -2036,16 +2036,16 @@ static void test_Installer_RegistryValue(void)
/* Does our key exist? Shouldn't; check with all three possible value parameter types */
hr = Installer_RegistryValueE(curr_user, L"Software\\Wine\\Test", &bRet);
- ok(hr == S_OK, "Installer_RegistryValueE failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueE failed, hresult %#lx\n", hr);
ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n");
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", NULL, szString);
- ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 0, szString, VT_BSTR);
- ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueI failed, hresult %#lx\n", hr);
/* Create key */
ok(!RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Test", &hkey ), "RegCreateKeyW failed\n");
@@ -2057,7 +2057,7 @@ static void test_Installer_RegistryValue(void)
ok(!RegSetValueExW(hkey, L"Three", 0, REG_BINARY, (const BYTE *)qw, 4),
"RegSetValueExW failed\n");
bRet = SetEnvironmentVariableA("MSITEST", "Four");
- ok(bRet, "SetEnvironmentVariableA failed %d\n", GetLastError());
+ ok(bRet, "SetEnvironmentVariableA failed %lu\n", GetLastError());
ok(!RegSetValueExW(hkey, L"Four", 0, REG_EXPAND_SZ, (const BYTE *)L"%MSITEST%", sizeof(L"%MSITEST%")),
"RegSetValueExW failed\n");
ok(!RegSetValueExW(hkey, L"Five\0Hi\0", 0, REG_MULTI_SZ, (const BYTE *)L"Five\0Hi\0", sizeof(L"Five\0Hi\0")),
@@ -2075,53 +2075,53 @@ static void test_Installer_RegistryValue(void)
/* Does our key exist? It should, and make sure we retrieve the correct default value */
bRet = FALSE;
hr = Installer_RegistryValueE(curr_user, L"Software\\Wine\\Test", &bRet);
- ok(hr == S_OK, "Installer_RegistryValueE failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueE failed, hresult %#lx\n", hr);
ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n");
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", NULL, szString);
- ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
ok_w2("Default registry value \"%s\" does not match expected \"%s\"\n", szString, L"One");
/* Ask for the value of a nonexistent key */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"%MSITEST%", szString);
- ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
/* Get values of keys */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"One", szString);
- ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"One");
VariantInit(&vararg);
V_VT(&vararg) = VT_BSTR;
V_BSTR(&vararg) = SysAllocString(L"Two");
hr = Installer_RegistryValue(curr_user, L"Software\\Wine\\Test", vararg, &varresult, VT_I4);
- ok(hr == S_OK, "Installer_RegistryValue failed, hresult 0x%08x\n", hr);
- ok(V_I4(&varresult) == 305419896, "Registry value %d does not match expected value\n", V_I4(&varresult));
+ ok(hr == S_OK, "Installer_RegistryValue failed, hresult %#lx\n", hr);
+ ok(V_I4(&varresult) == 305419896, "Registry value %ld does not match expected value\n", V_I4(&varresult));
VariantClear(&varresult);
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Three", szString);
- ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"(REG_BINARY)");
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Four", szString);
- ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"Four");
/* Vista does not NULL-terminate this case */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Five\0Hi\0", szString);
- ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
ok_w2n("Registry value \"%s\" does not match expected \"%s\"\n",
szString, L"Five\nHi", lstrlenW(L"Five\nHi"));
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Six", szString);
- ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr);
ok(!lstrcmpW(szString, L"(REG_\?\?)") || broken(!lstrcmpW(szString, L"(REG_]")),
"Registry value does not match\n");
@@ -2129,36 +2129,36 @@ static void test_Installer_RegistryValue(void)
V_VT(&vararg) = VT_BSTR;
V_BSTR(&vararg) = SysAllocString(L"Seven");
hr = Installer_RegistryValue(curr_user, L"Software\\Wine\\Test", vararg, &varresult, VT_EMPTY);
- ok(hr == S_OK, "Installer_RegistryValue failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValue failed, hresult %#lx\n", hr);
/* Get string class name for the key */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 0, szString, VT_BSTR);
- ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr);
ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, L"");
/* Get name of a value by positive number (RegEnumValue like), valid index */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 2, szString, VT_BSTR);
- ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr);
/* RegEnumValue order seems different on wine */
todo_wine ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, L"Two");
/* Get name of a value by positive number (RegEnumValue like), invalid index */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 10, szString, VT_EMPTY);
- ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr);
/* Get name of a subkey by negative number (RegEnumValue like), valid index */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", -1, szString, VT_BSTR);
- ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr);
ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, L"Eight");
/* Get name of a subkey by negative number (RegEnumValue like), invalid index */
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", -10, szString, VT_EMPTY);
- ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr);
/* clean up */
delete_key(hkey);
@@ -2179,38 +2179,39 @@ static void test_Installer_Products(BOOL bProductInstalled)
/* Installer::Products */
hr = Installer_Products(&pStringList);
- ok(hr == S_OK, "Installer_Products failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_Products failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
/* StringList::_NewEnum */
hr = StringList__NewEnum(pStringList, &pUnk);
- ok(hr == S_OK, "StringList_NewEnum failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "StringList_NewEnum failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
hr = IUnknown_QueryInterface(pUnk, &IID_IEnumVARIANT, (void **)&pEnum);
- ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr);
+ ok (hr == S_OK, "IUnknown::QueryInterface returned %#lx\n", hr);
}
if (!pEnum)
skip("IEnumVARIANT tests\n");
/* StringList::Count */
hr = StringList_Count(pStringList, &iCount);
- ok(hr == S_OK, "StringList_Count failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "StringList_Count failed, hresult %#lx\n", hr);
for (idx=0; idx<iCount; idx++)
{
/* StringList::Item */
memset(szString, 0, sizeof(szString));
hr = StringList_Item(pStringList, idx, szString);
- ok(hr == S_OK, "StringList_Item failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr);
+ ok(hr == S_OK, "StringList_Item failed (idx %d, count %d), hresult %#lx\n", idx, iCount, hr);
if (hr == S_OK)
{
/* Installer::ProductState */
hr = Installer_ProductState(szString, &iValue);
- ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_ProductState failed, hresult %#lx\n", hr);
if (hr == S_OK)
- ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED);
+ ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED,
+ "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED);
/* Not found our product code yet? Check */
if (!bProductFound && !lstrcmpW(szString, L"{837450fa-a39b-4bc8-b321-08b393f784b3}"))
@@ -2220,8 +2221,8 @@ static void test_Installer_Products(BOOL bProductInstalled)
if (pEnum)
{
hr = IEnumVARIANT_Next(pEnum, 1, &var, &celt);
- ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr);
- ok(celt == 1, "%d items were retrieved, expected 1\n", celt);
+ ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult %#lx\n", idx, iCount, hr);
+ ok(celt == 1, "%lu items were retrieved, expected 1\n", celt);
ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR);
ok_w2("%s returned by StringList_Item does not match %s returned by IEnumVARIANT_Next\n", szString, V_BSTR(&var));
VariantClear(&var);
@@ -2248,7 +2249,7 @@ static void test_Installer_Products(BOOL bProductInstalled)
/* IEnumVARIANT::Clone */
hr = IEnumVARIANT_Clone(pEnum, &pEnum2);
- ok(hr == S_OK, "IEnumVARIANT_Clone failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "IEnumVARIANT_Clone failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
/* IEnumVARIANT::Clone is supposed to save the position, but it actually just goes back to the beginning */
@@ -2257,8 +2258,8 @@ static void test_Installer_Products(BOOL bProductInstalled)
if (iCount)
{
hr = IEnumVARIANT_Next(pEnum2, 1, &var, &celt);
- ok(hr == S_OK, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr);
- ok(celt == 1, "%d items were retrieved, expected 0\n", celt);
+ ok(hr == S_OK, "IEnumVARIANT_Next failed, hresult %#lx\n", hr);
+ ok(celt == 1, "%lu items were retrieved, expected 0\n", celt);
ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR);
VariantClear(&var);
}
@@ -2270,33 +2271,33 @@ static void test_Installer_Products(BOOL bProductInstalled)
/* IEnumVARIANT::Skip should fail */
hr = IEnumVARIANT_Skip(pEnum, 1);
- ok(hr == S_FALSE, "IEnumVARIANT_Skip failed, hresult 0x%08x\n", hr);
+ ok(hr == S_FALSE, "IEnumVARIANT_Skip failed, hresult %#lx\n", hr);
/* IEnumVARIANT::Next, NULL variant pointer */
hr = IEnumVARIANT_Next(pEnum, 1, NULL, &celt);
- ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr);
- ok(celt == 0, "%d items were retrieved, expected 0\n", celt);
+ ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult %#lx\n", hr);
+ ok(celt == 0, "%lu items were retrieved, expected 0\n", celt);
/* IEnumVARIANT::Next, should not return any more items */
hr = IEnumVARIANT_Next(pEnum, 1, &var, &celt);
- ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr);
- ok(celt == 0, "%d items were retrieved, expected 0\n", celt);
+ ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult %#lx\n", hr);
+ ok(celt == 0, "%lu items were retrieved, expected 0\n", celt);
VariantClear(&var);
/* IEnumVARIANT::Reset */
hr = IEnumVARIANT_Reset(pEnum);
- ok(hr == S_OK, "IEnumVARIANT_Reset failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "IEnumVARIANT_Reset failed, hresult %#lx\n", hr);
if (iCount)
{
/* IEnumVARIANT::Skip to the last product */
hr = IEnumVARIANT_Skip(pEnum, iCount-1);
- ok(hr == S_OK, "IEnumVARIANT_Skip failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "IEnumVARIANT_Skip failed, hresult %#lx\n", hr);
/* IEnumVARIANT::Next should match the very last retrieved value, also makes sure it works with
* NULL celt pointer. */
hr = IEnumVARIANT_Next(pEnum, 1, &var, NULL);
- ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr);
+ ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult %#lx\n", idx, iCount, hr);
ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR);
ok_w2("%s returned by StringList_Item does not match %s returned by IEnumVARIANT_Next\n", szString, V_BSTR(&var));
VariantClear(&var);
@@ -2308,7 +2309,7 @@ static void test_Installer_Products(BOOL bProductInstalled)
/* StringList::Item using an invalid index */
memset(szString, 0, sizeof(szString));
hr = StringList_Item(pStringList, iCount, szString);
- ok(hr == DISP_E_BADINDEX, "StringList_Item for an invalid index did not return DISP_E_BADINDEX, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_BADINDEX, "StringList_Item for an invalid index did not return DISP_E_BADINDEX, hresult %#lx\n", hr);
if (pEnum) IEnumVARIANT_Release(pEnum);
if (pUnk) IUnknown_Release(pUnk);
@@ -2402,7 +2403,7 @@ static void test_Installer_InstallProduct(void)
/* Avoid an interactive dialog in case of insufficient privileges. */
hr = Installer_UILevelPut(INSTALLUILEVEL_NONE);
- ok(hr == S_OK, "Expected UILevel property put invoke to return S_OK, got 0x%08x\n", hr);
+ ok(hr == S_OK, "Expected UILevel property put invoke to return S_OK, got %#lx\n", hr);
/* Installer::InstallProduct */
hr = Installer_InstallProduct(L"winetest-automation.msi", NULL);
@@ -2412,11 +2413,11 @@ static void test_Installer_InstallProduct(void)
delete_test_files();
return;
}
- ok(hr == S_OK, "Installer_InstallProduct failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_InstallProduct failed, hresult %#lx\n", hr);
/* Installer::ProductState for our product code, which has been installed */
hr = Installer_ProductState(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", &iValue);
- ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_ProductState failed, hresult %#lx\n", hr);
ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT);
/* Installer::ProductInfo for our product code */
@@ -2424,25 +2425,25 @@ static void test_Installer_InstallProduct(void)
/* NULL attribute */
memset(szString, 0, sizeof(szString));
hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", NULL, szString);
- ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr);
ok_exception(hr, L"ProductInfo,Product,Attribute");
/* Nonexistent attribute */
memset(szString, 0, sizeof(szString));
hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"winetest-automation.msi", szString);
- ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr);
ok_exception(hr, L"ProductInfo,Product,Attribute");
/* Package name */
memset(szString, 0, sizeof(szString));
hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"PackageName", szString);
- ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_ProductInfo failed, hresult %#lx\n", hr);
todo_wine ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, L"winetest-automation.msi");
/* Product name */
memset(szString, 0, sizeof(szString));
hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"ProductName", szString);
- ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_ProductInfo failed, hresult %#lx\n", hr);
todo_wine ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, L"MSITEST");
/* Installer::Products */
@@ -2450,25 +2451,25 @@ static void test_Installer_InstallProduct(void)
/* Installer::RelatedProducts for our upgrade code */
hr = Installer_RelatedProducts(L"{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}", &pStringList);
- ok(hr == S_OK, "Installer_RelatedProducts failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RelatedProducts failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
/* StringList::Count */
hr = StringList_Count(pStringList, &iCount);
- ok(hr == S_OK, "StringList_Count failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "StringList_Count failed, hresult %#lx\n", hr);
ok(iCount == 1, "Expected one related product but found %d\n", iCount);
/* StringList::Item */
memset(szString, 0, sizeof(szString));
hr = StringList_Item(pStringList, 0, szString);
- ok(hr == S_OK, "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr);
+ ok(hr == S_OK, "StringList_Item failed (idx 0, count %d), hresult %#lx\n", iCount, hr);
ok_w2("StringList_Item returned %s but expected %s\n", szString, L"{837450fa-a39b-4bc8-b321-08b393f784b3}");
IDispatch_Release(pStringList);
}
hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"LocalPackage", szString);
- ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_ProductInfo failed, hresult %#lx\n", hr);
DeleteFileW( szString );
/* Check & clean up installed files & registry keys */
@@ -2485,67 +2486,67 @@ static void test_Installer_InstallProduct(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
type = REG_SZ;
res = RegQueryValueExA(hkey, "Name", NULL, &type, (LPBYTE)path, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(path, "imaname"), "Expected imaname, got %s\n", path);
size = MAX_PATH;
type = REG_SZ;
res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
size = sizeof(num);
type = REG_DWORD;
res = RegQueryValueExA(hkey, "number", NULL, &type, (LPBYTE)&num, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
- ok(num == 314, "Expected 314, got %d\n", num);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
+ ok(num == 314, "Expected 314, got %lu\n", num);
size = MAX_PATH;
type = REG_SZ;
res = RegQueryValueExA(hkey, "OrderTestName", NULL, &type, (LPBYTE)path, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(path, "OrderTestValue"), "Expected imaname, got %s\n", path);
RegCloseKey(hkey);
res = RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest");
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Remove registry keys written by RegisterProduct standard action */
res = delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{837450fa-a39b-4bc8-b321-08b393f784b3}",
KEY_WOW64_32KEY);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = find_registry_key(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData", "af054738b93a8cb43b12803b397f483b", access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = delete_registry_key(hkey, "af054738b93a8cb43b12803b397f483b", access);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(hkey);
res = delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\af054738b93a8cb43b12803b397f483b", access);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
/* Remove registry keys written by PublishProduct standard action */
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = delete_registry_key(hkey, "Products\\af054738b93a8cb43b12803b397f483b", KEY_ALL_ACCESS);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegDeleteKeyA(hkey, "UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656");
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(hkey);
@@ -2566,42 +2567,42 @@ static void test_Installer(void)
/* Test for error */
hr = Installer_CreateRecord(-1, &pRecord);
- ok(hr == DISP_E_EXCEPTION, "Installer_CreateRecord failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Installer_CreateRecord failed, hresult %#lx\n", hr);
ok_exception(hr, L"CreateRecord,Count");
/* Test for success */
hr = Installer_CreateRecord(1, &pRecord);
- ok(hr == S_OK, "Installer_CreateRecord failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_CreateRecord failed, hresult %#lx\n", hr);
ok(pRecord != NULL, "Installer_CreateRecord should not have returned NULL record\n");
if (pRecord)
{
/* Record::FieldCountGet */
hr = Record_FieldCountGet(pRecord, &iValue);
- ok(hr == S_OK, "Record_FiledCountGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_FiledCountGet failed, hresult %#lx\n", hr);
ok(iValue == 1, "Record_FieldCountGet result was %d but expected 1\n", iValue);
/* Record::IntegerDataGet */
hr = Record_IntegerDataGet(pRecord, 1, &iValue);
- ok(hr == S_OK, "Record_IntegerDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_IntegerDataGet failed, hresult %#lx\n", hr);
ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER);
/* Record::IntegerDataGet, bad index */
hr = Record_IntegerDataGet(pRecord, 10, &iValue);
- ok(hr == S_OK, "Record_IntegerDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_IntegerDataGet failed, hresult %#lx\n", hr);
ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER);
/* Record::IntegerDataPut */
hr = Record_IntegerDataPut(pRecord, 1, 100);
- ok(hr == S_OK, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_IntegerDataPut failed, hresult %#lx\n", hr);
/* Record::IntegerDataPut, bad index */
hr = Record_IntegerDataPut(pRecord, 10, 100);
- ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult %#lx\n", hr);
ok_exception(hr, L"IntegerData,Field");
/* Record::IntegerDataGet */
hr = Record_IntegerDataGet(pRecord, 1, &iValue);
- ok(hr == S_OK, "Record_IntegerDataGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Record_IntegerDataGet failed, hresult %#lx\n", hr);
ok(iValue == 100, "Record_IntegerDataGet result was %d but expected 100\n", iValue);
IDispatch_Release(pRecord);
@@ -2617,7 +2618,7 @@ static void test_Installer(void)
DeleteFileW(szPath);
return;
}
- ok(hr == S_OK, "Installer_OpenPackage failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_OpenPackage failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
test_Session(pSession);
@@ -2626,7 +2627,7 @@ static void test_Installer(void)
/* Installer::OpenDatabase */
hr = Installer_OpenDatabase(szPath, (INT_PTR)MSIDBOPEN_TRANSACT, &pDatabase);
- ok(hr == S_OK, "Installer_OpenDatabase failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_OpenDatabase failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
test_Database(pDatabase, FALSE);
@@ -2635,7 +2636,7 @@ static void test_Installer(void)
/* Installer::SummaryInformation */
hr = Installer_SummaryInformation(szPath, 0, &pSumInfo);
- ok(hr == S_OK, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_SummaryInformation failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
test_SummaryInfo(pSumInfo, summary_info, ARRAY_SIZE(summary_info), TRUE);
@@ -2643,14 +2644,14 @@ static void test_Installer(void)
}
hr = Installer_SummaryInformation(NULL, 0, &pSumInfo);
- ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult %#lx\n", hr);
/* Installer::RegistryValue */
test_Installer_RegistryValue();
/* Installer::ProductState for our product code, which should not be installed */
hr = Installer_ProductState(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", &iValue);
- ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_ProductState failed, hresult %#lx\n", hr);
ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN);
/* Installer::ProductInfo for our product code, which should not be installed */
@@ -2658,13 +2659,13 @@ static void test_Installer(void)
/* Package name */
memset(szPath, 0, sizeof(szPath));
hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"PackageName", szPath);
- ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr);
ok_exception(hr, L"ProductInfo,Product,Attribute");
/* NULL attribute and NULL product code */
memset(szPath, 0, sizeof(szPath));
hr = Installer_ProductInfo(NULL, NULL, szPath);
- ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
+ ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr);
ok_exception(hr, L"ProductInfo,Product,Attribute");
/* Installer::Products */
@@ -2672,12 +2673,12 @@ static void test_Installer(void)
/* Installer::RelatedProducts for our upgrade code, should not find anything */
hr = Installer_RelatedProducts(L"{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}", &pStringList);
- ok(hr == S_OK, "Installer_RelatedProducts failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_RelatedProducts failed, hresult %#lx\n", hr);
if (hr == S_OK)
{
/* StringList::Count */
hr = StringList_Count(pStringList, &iCount);
- ok(hr == S_OK, "StringList_Count failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "StringList_Count failed, hresult %#lx\n", hr);
ok(!iCount, "Expected no related products but found %d\n", iCount);
IDispatch_Release(pStringList);
@@ -2686,7 +2687,7 @@ static void test_Installer(void)
/* Installer::Version */
memset(szPath, 0, sizeof(szPath));
hr = Installer_VersionGet(szPath);
- ok(hr == S_OK, "Installer_VersionGet failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Installer_VersionGet failed, hresult %#lx\n", hr);
/* Installer::InstallProduct and other tests that depend on our product being installed */
test_Installer_InstallProduct();
@@ -2720,16 +2721,16 @@ START_TEST(automation)
get_program_files_dir(PROG_FILES_DIR);
hr = OleInitialize(NULL);
- ok (hr == S_OK, "OleInitialize returned 0x%08x\n", hr);
+ ok (hr == S_OK, "OleInitialize returned %#lx\n", hr);
hr = CLSIDFromProgID(L"WindowsInstaller.Installer", &clsid);
- ok (hr == S_OK, "CLSIDFromProgID returned 0x%08x\n", hr);
+ ok (hr == S_OK, "CLSIDFromProgID returned %#lx\n", hr);
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk);
- ok(hr == S_OK, "CoCreateInstance returned 0x%08x\n", hr);
+ ok(hr == S_OK, "CoCreateInstance returned %#lx\n", hr);
if (pUnk)
{
hr = IUnknown_QueryInterface(pUnk, &IID_IDispatch, (void **)&pInstaller);
- ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr);
+ ok (hr == S_OK, "IUnknown::QueryInterface returned %#lx\n", hr);
test_dispid();
test_dispatch();
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 75e234c6583..c1b011c8871 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1141,7 +1141,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
r = MsiEnableUIPreview(db, &preview);
ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
- sprintf(package_name, "#%u", db);
+ sprintf(package_name, "#%lu", db);
r = MsiOpenPackageA(package_name, &package);
ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index b2a60f5b304..59dcf87a47c 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -548,7 +548,7 @@ static void test_msidecomposedesc(void)
comp[0] = 0x55;
r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len);
ok(r == ERROR_SUCCESS, "returned an error\n");
- ok(len == 41, "got %u\n", len);
+ ok(len == 41, "got %lu\n", len);
ok(!strcmp(prod,"{90110409-6000-11D3-8CFE-0150048383C9}"), "got '%s'\n", prod);
ok(!strcmp(feature,"FollowTheWhiteRabbit"), "got '%s'\n", feature);
ok(!comp[0], "got '%s'\n", comp);
@@ -558,7 +558,7 @@ static void test_msidecomposedesc(void)
comp[0] = 0x55;
r = pMsiDecomposeDescriptorA("yh1BVN)8A$!!!!!MKKSkAlwaysInstalledIntl_1033<", prod, feature, comp, &len);
ok(r == ERROR_SUCCESS, "got %u\n", r);
- ok(len == 45, "got %u\n", len);
+ ok(len == 45, "got %lu\n", len);
ok(!strcmp(prod, "{90150000-006E-0409-0000-0000000FF1CE}"), "got '%s'\n", prod);
ok(!strcmp(feature, "AlwaysInstalledIntl_1033"), "got '%s'\n", feature);
ok(!comp[0], "got '%s'\n", comp);
@@ -907,7 +907,7 @@ static void test_viewmodify(void)
err = MsiViewGetErrorA( hview, buffer, &sz );
ok(err == MSIDBERROR_NOERROR, "got %d\n", err);
ok(!buffer[0], "got \"%s\"\n", buffer);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
r = MsiViewExecute(hview, 0);
ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n");
@@ -928,7 +928,7 @@ static void test_viewmodify(void)
err = MsiViewGetErrorA( hview, buffer, &sz );
ok(err == MSIDBERROR_NOERROR, "got %d\n", err);
ok(!buffer[0], "got \"%s\"\n", buffer);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
r = MsiCloseHandle(hrec);
ok(r == ERROR_SUCCESS, "failed to close record\n");
@@ -960,7 +960,7 @@ static void test_viewmodify(void)
err = MsiViewGetErrorA( hview, buffer, &sz );
ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err);
ok(!strcmp(buffer, "id"), "got \"%s\"\n", buffer);
- ok(sz == 2, "got size %u\n", sz);
+ ok(sz == 2, "got size %lu\n", sz);
/* insert the same thing again */
r = MsiViewExecute(hview, 0);
@@ -1809,7 +1809,7 @@ static void test_streamtable(void)
memset(buf, 0, MAX_PATH);
r = MsiRecordReadStream( rec, 2, buf, &size );
ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r);
- ok( !lstrcmpA(buf, "test.txt\n"), "Expected 'test.txt\\n', got '%s' (%d)\n", buf, size);
+ ok( !lstrcmpA(buf, "test.txt\n"), "Expected 'test.txt\\n', got '%s' (%lu)\n", buf, size);
MsiCloseHandle( rec );
/* open a handle to the "data" stream (and keep it open during removal) */
@@ -1841,7 +1841,7 @@ static void test_streamtable(void)
memset(buf, 0, MAX_PATH);
r = MsiRecordReadStream( rec, 2, buf, &size );
ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r);
- todo_wine ok( size == 0, "Expected empty buffer, got %d bytes\n", size);
+ todo_wine ok( size == 0, "Expected empty buffer, got %lu bytes\n", size);
MsiCloseHandle( rec );
MsiCloseHandle( hdb );
@@ -2246,7 +2246,8 @@ static void test_suminfo_import(void)
{
MSIHANDLE hdb, hsi, view = 0;
LPCSTR query;
- UINT r, count, size, type;
+ UINT r, count, type;
+ DWORD size;
char str_value[50];
INT int_value;
FILETIME ft_value;
@@ -2284,7 +2285,7 @@ static void test_suminfo_import(void)
r = MsiSummaryInfoGetPropertyA(hsi, PID_TITLE, &type, NULL, NULL, str_value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type);
- ok(size == 18, "Expected 18, got %u\n", size);
+ ok(size == 18, "Expected 18, got %lu\n", size);
ok(!strcmp(str_value, "Installer Database"),
"Expected \"Installer Database\", got %s\n", str_value);
@@ -2980,7 +2981,7 @@ static void generate_transform_manual(void)
STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm );
if (FAILED(r))
{
- ok(0, "failed to create stream %08x\n", r);
+ ok(0, "failed to create stream %#lx\n", r);
continue;
}
@@ -3068,7 +3069,7 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle)
CHAR szPackage[12];
MSIHANDLE hPackage;
- sprintf(szPackage, "#%u", hdb);
+ sprintf(szPackage, "#%lu", hdb);
res = MsiOpenPackageA(szPackage, &hPackage);
if (res != ERROR_SUCCESS)
return res;
@@ -3512,7 +3513,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 5, "Expected 5 rows, got %d\n", i );
+ ok( i == 5, "Expected 5 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3533,7 +3534,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 24, "Expected 24 rows, got %d\n", i );
+ ok( i == 24, "Expected 24 rows, got %lu\n", i );
MsiViewClose(hview);
MsiCloseHandle(hview);
@@ -3555,7 +3556,7 @@ static void test_join(void)
MsiCloseHandle(hrec);
}
- ok( i == 2, "Expected 2 rows, got %d\n", i );
+ ok( i == 2, "Expected 2 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3578,7 +3579,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 2, "Expected 2 rows, got %d\n", i );
+ ok( i == 2, "Expected 2 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3601,7 +3602,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 1, "Expected 1 rows, got %d\n", i );
+ ok( i == 1, "Expected 1 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3625,7 +3626,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 1, "Expected 1 rows, got %d\n", i );
+ ok( i == 1, "Expected 1 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3648,7 +3649,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 6, "Expected 6 rows, got %d\n", i );
+ ok( i == 6, "Expected 6 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3672,7 +3673,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 3, "Expected 3 rows, got %d\n", i );
+ ok( i == 3, "Expected 3 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3693,7 +3694,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 6, "Expected 6 rows, got %d\n", i );
+ ok( i == 6, "Expected 6 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3714,7 +3715,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 6, "Expected 6 rows, got %d\n", i );
+ ok( i == 6, "Expected 6 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -3736,7 +3737,7 @@ static void test_join(void)
i++;
MsiCloseHandle(hrec);
}
- ok( i == 6, "Expected 6 rows, got %d\n", i );
+ ok( i == 6, "Expected 6 rows, got %lu\n", i );
ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
MsiViewClose(hview);
@@ -4240,21 +4241,21 @@ static void test_integers(void)
ok(r == 8, "record count wrong: %d\n", r);
i = MsiRecordGetInteger(rec, 1);
- ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i);
+ ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %lu\n", i);
i = MsiRecordGetInteger(rec, 3);
- ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i);
+ ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %lu\n", i);
i = MsiRecordGetInteger(rec, 2);
- ok(i == 2, "Expected 2, got %d\n", i);
+ ok(i == 2, "Expected 2, got %lu\n", i);
i = MsiRecordGetInteger(rec, 4);
- ok(i == 4, "Expected 4, got %d\n", i);
+ ok(i == 4, "Expected 4, got %lu\n", i);
i = MsiRecordGetInteger(rec, 5);
- ok(i == 5, "Expected 5, got %d\n", i);
+ ok(i == 5, "Expected 5, got %lu\n", i);
i = MsiRecordGetInteger(rec, 6);
- ok(i == 6, "Expected 6, got %d\n", i);
+ ok(i == 6, "Expected 6, got %lu\n", i);
i = MsiRecordGetInteger(rec, 7);
- ok(i == 7, "Expected 7, got %d\n", i);
+ ok(i == 7, "Expected 7, got %lu\n", i);
i = MsiRecordGetInteger(rec, 8);
- ok(i == 8, "Expected 8, got %d\n", i);
+ ok(i == 8, "Expected 8, got %lu\n", i);
MsiCloseHandle(rec);
MsiViewClose(view);
@@ -5714,65 +5715,65 @@ static void test_stringtable(void)
MultiByteToWideChar(CP_ACP, 0, msifile, -1, name, 0x20);
hr = StgOpenStorage(name, NULL, mode, NULL, 0, &stg);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stg != NULL, "Expected non-NULL storage\n");
hr = IStorage_OpenStream(stg, moo, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stm != NULL, "Expected non-NULL stream\n");
hr = IStream_Read(stm, data, MAX_PATH, &read);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
- ok(read == 4, "Expected 4, got %d\n", read);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
+ ok(read == 4, "Expected 4, got %lu\n", read);
todo_wine ok(!memcmp(data, data10, read), "Unexpected data\n");
hr = IStream_Release(stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
hr = IStorage_OpenStream(stg, aar, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stm != NULL, "Expected non-NULL stream\n");
hr = IStream_Read(stm, data, MAX_PATH, &read);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
- ok(read == 8, "Expected 8, got %d\n", read);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
+ ok(read == 8, "Expected 8, got %lu\n", read);
todo_wine
{
ok(!memcmp(data, data11, read), "Unexpected data\n");
}
hr = IStream_Release(stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
hr = IStorage_OpenStream(stg, stringdata, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stm != NULL, "Expected non-NULL stream\n");
hr = IStream_Read(stm, buffer, MAX_PATH, &read);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
- ok(read == 24, "Expected 24, got %d\n", read);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
+ ok(read == 24, "Expected 24, got %lu\n", read);
ok(!memcmp(buffer, data12, read), "Unexpected data\n");
hr = IStream_Release(stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
hr = IStorage_OpenStream(stg, stringpool, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stm != NULL, "Expected non-NULL stream\n");
hr = IStream_Read(stm, data, MAX_PATH, &read);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
todo_wine
{
- ok(read == 64, "Expected 64, got %d\n", read);
+ ok(read == 64, "Expected 64, got %lu\n", read);
ok(!memcmp(data, data13, read), "Unexpected data\n");
}
hr = IStream_Release(stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
hr = IStorage_Release(stg);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
DeleteFileA(msifile);
}
@@ -5895,7 +5896,7 @@ static void enum_stream_names(IStorage *stg)
memset(check, 'a', MAX_PATH);
hr = IStorage_EnumElements(stg, 0, NULL, 0, &stgenum);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
n = 0;
while(TRUE)
@@ -5906,12 +5907,12 @@ static void enum_stream_names(IStorage *stg)
break;
ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name),
- "Expected table %d name to match\n", n);
+ "Expected table %lu name to match\n", n);
stm = NULL;
hr = IStorage_OpenStream(stg, stat.pwcsName, NULL,
STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stm != NULL, "Expected non-NULL stream\n");
CoTaskMemFree(stat.pwcsName);
@@ -5919,22 +5920,22 @@ static void enum_stream_names(IStorage *stg)
sz = MAX_PATH;
memset(data, 'a', MAX_PATH);
hr = IStream_Read(stm, data, sz, &count);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(count == database_table_data[n].size,
- "Expected %d, got %d\n", database_table_data[n].size, count);
+ "Expected %lu, got %lu\n", database_table_data[n].size, count);
if (!database_table_data[n].size)
ok(!memcmp(data, check, MAX_PATH), "data should not be changed\n");
else
ok(!memcmp(data, database_table_data[n].data, database_table_data[n].size),
- "Expected table %d data to match\n", n);
+ "Expected table %lu data to match\n", n);
IStream_Release(stm);
n++;
}
- ok(n == 3, "Expected 3, got %d\n", n);
+ ok(n == 3, "Expected 3, got %lu\n", n);
IEnumSTATSTG_Release(stgenum);
}
@@ -5957,7 +5958,7 @@ static void test_defaultdatabase(void)
MsiCloseHandle(hdb);
hr = StgOpenStorage(msifileW, NULL, STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &stg);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stg != NULL, "Expected non-NULL stg\n");
enum_stream_names(stg);
@@ -7188,7 +7189,7 @@ static void test_storages_table(void)
r = MsiRecordReadStream(hrec, 2, buf, &size);
ok(r == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
MsiCloseHandle(hrec);
@@ -7204,23 +7205,23 @@ static void test_storages_table(void)
MultiByteToWideChar(CP_ACP, 0, msifile, -1, name, MAX_PATH);
hr = StgOpenStorage(name, NULL, STGM_DIRECT | STGM_READ |
STGM_SHARE_DENY_WRITE, NULL, 0, &stg);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stg != NULL, "Expected non-NULL storage\n");
MultiByteToWideChar(CP_ACP, 0, "stgname", -1, name, MAX_PATH);
hr = IStorage_OpenStorage(stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE,
NULL, 0, &inner);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(inner != NULL, "Expected non-NULL storage\n");
MultiByteToWideChar(CP_ACP, 0, "storage.bin", -1, name, MAX_PATH);
hr = IStorage_OpenStream(inner, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
ok(stm != NULL, "Expected non-NULL stream\n");
hr = IStream_Read(stm, buf, MAX_PATH, &size);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
+ ok(size == 8, "Expected 8, got %lu\n", size);
ok(!lstrcmpA(buf, "stgdata"), "Expected \"stgdata\", got \"%s\"\n", buf);
IStream_Release(stm);
@@ -7248,7 +7249,7 @@ static void test_dbtopackage(void)
create_custom_action_table(hdb);
add_custom_action_entry(hdb, "'SetProp', 51, 'MYPROP', 'grape'");
- sprintf(package, "#%u", hdb);
+ sprintf(package, "#%lu", hdb);
r = MsiOpenPackageA(package, &hpkg);
if (r == ERROR_INSTALL_PACKAGE_REJECTED)
{
@@ -7263,7 +7264,7 @@ static void test_dbtopackage(void)
r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* run the custom action to set the property */
r = MsiDoActionA(hpkg, "SetProp");
@@ -7275,7 +7276,7 @@ static void test_dbtopackage(void)
r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "grape"), "Expected \"grape\", got \"%s\"\n", buf);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
MsiCloseHandle(hpkg);
@@ -7291,7 +7292,7 @@ static void test_dbtopackage(void)
todo_wine
{
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
MsiCloseHandle(hdb);
@@ -7308,7 +7309,7 @@ static void test_dbtopackage(void)
create_custom_action_table(hdb);
add_custom_action_entry(hdb, "'SetProp', 51, 'MYPROP', 'grape'");
- sprintf(package, "#%u", hdb);
+ sprintf(package, "#%lu", hdb);
r = MsiOpenPackageA(package, &hpkg);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -7318,7 +7319,7 @@ static void test_dbtopackage(void)
r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* run the custom action to set the property */
r = MsiDoActionA(hpkg, "SetProp");
@@ -7330,7 +7331,7 @@ static void test_dbtopackage(void)
r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "grape"), "Expected \"grape\", got \"%s\"\n", buf);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
MsiCloseHandle(hpkg);
@@ -7346,7 +7347,7 @@ static void test_dbtopackage(void)
todo_wine
{
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
MsiCloseHandle(hpkg);
@@ -8583,7 +8584,8 @@ static void test_embedded_nulls(void)
"s72\tL0\n"
"Control\tDialog\n"
"LicenseAgreementDlg\ttext\x11\x19text\0text";
- UINT r, sz;
+ UINT r;
+ DWORD sz;
MSIHANDLE hdb, hrec;
char buffer[32];
@@ -9208,7 +9210,7 @@ static void test_view_get_error(void)
sz = 0;
err = MsiViewGetErrorA(0, NULL, &sz);
ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
err = MsiViewGetErrorA(view, NULL, NULL);
ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err);
@@ -9216,21 +9218,21 @@ static void test_view_get_error(void)
sz = 0;
err = MsiViewGetErrorA(view, NULL, &sz);
ok(err == MSIDBERROR_NOERROR, "got %d\n", err);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
sz = 0;
strcpy(buffer, "x");
err = MsiViewGetErrorA(view, buffer, &sz);
ok(err == MSIDBERROR_MOREDATA, "got %d\n", err);
ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
sz = 1;
strcpy(buffer, "x");
err = MsiViewGetErrorA(view, buffer, &sz);
ok(err == MSIDBERROR_NOERROR, "got %d\n", err);
ok(!buffer[0], "got \"%s\"\n", buffer);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
rec = MsiCreateRecord(2);
MsiRecordSetInteger(rec, 1, 1);
@@ -9243,14 +9245,14 @@ static void test_view_get_error(void)
err = MsiViewGetErrorA(view, buffer, &sz);
ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err);
ok(!strcmp(buffer, "A"), "got \"%s\"\n", buffer);
- ok(sz == 1, "got size %u\n", sz);
+ ok(sz == 1, "got size %lu\n", sz);
sz = 2;
strcpy(buffer, "x");
err = MsiViewGetErrorA(view, buffer, &sz);
todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err);
todo_wine ok(!buffer[0], "got \"%s\"\n", buffer);
- todo_wine ok(sz == 0, "got size %u\n", sz);
+ todo_wine ok(sz == 0, "got size %lu\n", sz);
r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec);
ok(r == ERROR_INVALID_DATA, "got %u\n", r);
@@ -9260,14 +9262,14 @@ static void test_view_get_error(void)
err = MsiViewGetErrorA(view, buffer, &sz);
ok(err == MSIDBERROR_MOREDATA, "got %d\n", err);
ok(!buffer[0], "got \"%s\"\n", buffer);
- ok(sz == 1, "got size %u\n", sz);
+ ok(sz == 1, "got size %lu\n", sz);
sz = 1;
strcpy(buffer, "x");
err = MsiViewGetErrorA(view, buffer, &sz);
todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err);
ok(!buffer[0], "got \"%s\"\n", buffer);
- todo_wine ok(sz == 0, "got size %u\n", sz);
+ todo_wine ok(sz == 0, "got size %lu\n", sz);
r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec);
ok(r == ERROR_INVALID_DATA, "got %u\n", r);
@@ -9277,14 +9279,14 @@ static void test_view_get_error(void)
err = MsiViewGetErrorA(view, buffer, &sz);
ok(err == MSIDBERROR_MOREDATA, "got %d\n", err);
ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer);
- ok(sz == 1, "got size %u\n", sz);
+ ok(sz == 1, "got size %lu\n", sz);
sz = 0;
strcpy(buffer, "x");
err = MsiViewGetErrorA(view, buffer, &sz);
ok(err == MSIDBERROR_MOREDATA, "got %d\n", err);
ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer);
- todo_wine ok(sz == 0, "got size %u\n", sz);
+ todo_wine ok(sz == 0, "got size %lu\n", sz);
MsiCloseHandle(rec);
MsiCloseHandle(view);
diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c
index 06f901fb84c..1cf2021214c 100644
--- a/dlls/msi/tests/format.c
+++ b/dlls/msi/tests/format.c
@@ -35,7 +35,7 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle)
CHAR szPackage[12];
MSIHANDLE hPackage;
- sprintf(szPackage, "#%u", hdb);
+ sprintf(szPackage, "#%lu", hdb);
res = MsiOpenPackageA(szPackage, &hPackage);
if (res != ERROR_SUCCESS)
return res;
@@ -205,7 +205,7 @@ static void test_formatrecord(void)
sz = 123;
r = MsiFormatRecordA(0, hrec, NULL, &sz);
ok( r == ERROR_SUCCESS, "format failed with empty buffer\n");
- ok( sz == 2, "size wrong (%i)\n",sz);
+ ok( sz == 2, "size wrong (%lu)\n",sz);
sz = sizeof buffer;
buffer[0] = 'x';
buffer[1] = 0;
@@ -296,7 +296,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 30, "size wrong %i\n",sz);
+ ok( sz == 30, "size wrong %lu\n",sz);
ok( 0 == strcmp(buffer,"1: boo 2: hoo 3: 4: 5: 6: "),
"wrong output(%s)\n",buffer);
@@ -308,7 +308,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 31, "size wrong %i\n",sz);
+ ok( sz == 31, "size wrong %lu\n",sz);
ok( 0 == strcmp(buffer,"1: 123 2: 4567 3: 4: 5: 6: "),
"wrong output(%s)\n",buffer);
@@ -322,7 +322,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong,(%i)\n",sz);
+ ok( sz == 7, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"hey hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[[1]] [2]");
@@ -334,7 +334,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 9, "size wrong,(%i)\n",sz);
+ ok( sz == 9, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[[2]] hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[[[3]]] [2]");
@@ -348,7 +348,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong,(%i)\n",sz);
+ ok( sz == 7, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"hey hey"), "wrong output (%s)\n",buffer);
r = MsiCloseHandle(hrec);
@@ -369,7 +369,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong,(%i)\n",sz);
+ ok( sz == 7, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"big hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[[3][4][1]] [2]");
@@ -387,7 +387,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong,(%i)\n",sz);
+ ok( sz == 7, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"big hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[[3][[4]][1]] [2]");
@@ -405,7 +405,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 10, "size wrong,(%i)\n",sz);
+ ok( sz == 10, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[1[]2] hey"), "wrong output (%s)\n",buffer);
/* incorrect formats */
@@ -424,7 +424,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 18, "size wrong,(%i)\n",sz);
+ ok( sz == 18, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[[[3][[4]][1]] [2]"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[[3][[4]][1]] [2]]");
@@ -442,7 +442,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 11, "size wrong,(%i)\n",sz);
+ ok( sz == 11, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[1[]2] hey]"), "wrong output (%s)\n",buffer);
@@ -463,7 +463,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 6, "size wrong,(%i)\n",sz);
+ ok( sz == 6, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"12 hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[{[3][1]}] [2]");
@@ -481,10 +481,9 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 8, "size wrong,(%i)\n",sz);
+ ok( sz == 8, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[12] hey"), "wrong output (%s)\n",buffer);
-
r = MsiRecordSetStringA(hrec, 0, "{test} [2]");
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiRecordSetStringA(hrec, 1, "2");
@@ -500,7 +499,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 10, "size wrong,(%i)\n",sz);
+ ok( sz == 10, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{test} hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{[test]} [2]");
@@ -518,7 +517,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 12, "size wrong,(%i)\n",sz);
+ ok( sz == 12, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{[test]} hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{[1][2][3][4]} [2]");
@@ -536,7 +535,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 4, "size wrong,(%i)\n",sz);
+ ok( sz == 4, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer," hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{[1][2][3][dummy]} [2]");
@@ -554,7 +553,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 18, "size wrong,(%i)\n",sz);
+ ok( sz == 18, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{2hey1[dummy]} hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{[1][2][3][4][dummy]} [2]");
@@ -572,7 +571,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 18, "size wrong,(%i)\n",sz);
+ ok( sz == 18, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{2hey1[dummy]} hey"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{{[1][2]}[3][4][dummy]}");
@@ -590,7 +589,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 16, "size wrong,(%i)\n",sz);
+ ok( sz == 16, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{{2hey}1[dummy]}"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{{[1][2]}[3]{[4][dummy]}}");
@@ -608,7 +607,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong,(%i)\n",sz);
+ ok( sz == 0, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{{[1][2]}[3]} {[1][2]}");
@@ -626,7 +625,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 12, "size wrong,(%i)\n",sz);
+ ok( sz == 12, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{{12}3} {12}"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{[1][2]} {{[1][2]}[3]} {[1][2]}");
@@ -644,7 +643,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 15, "size wrong,(%i)\n",sz);
+ ok( sz == 15, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"12 {{12}3} {12}"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{[4]}{[1][2]} {{[1][2]}[3]} {[1][2]}");
@@ -662,7 +661,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 15, "size wrong,(%i)\n",sz);
+ ok( sz == 15, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"12 {{12}3} {12}"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{blah} {[4]}{[1][2]} {{[1][2]}[3]} {[1][2]}");
@@ -680,7 +679,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 22, "size wrong,(%i)\n",sz);
+ ok( sz == 22, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{blah} 12 {{12}3} {12}"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{{[1]}[2]} {[4]}{[1][2]}");
@@ -698,7 +697,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 13, "size wrong,(%i)\n",sz);
+ ok( sz == 13, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{{1}2} {}{12}"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{{[1]}} {[4]}{[1][2]}");
@@ -716,7 +715,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 3, "size wrong,(%i)\n",sz);
+ ok( sz == 3, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer," 12"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "{{{[1]}} {[4]}{[1][2]}");
@@ -735,10 +734,10 @@ static void test_formatrecord(void)
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine{
- ok( sz == 3, "size wrong,(%i)\n",sz);
+ ok( sz == 3, "size wrong,(%lu)\n",sz);
ok( 0 == strcmp(buffer," 12"), "wrong output (%s)\n",buffer);
}
-
+
/* now put play games with escaping */
r = MsiRecordSetStringA(hrec, 0, "[1] [2] [\\3asdf]");
ok( r == ERROR_SUCCESS, "set string failed\n");
@@ -770,7 +769,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 4, "size wrong: %d\n", sz);
+ ok( sz == 4, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"[\\x]"), "wrong output: %s\n", buffer);
r = MsiRecordSetStringA(hrec, 0, "{\\x}");
@@ -778,7 +777,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 4, "size wrong: %d\n", sz);
+ ok( sz == 4, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"{\\x}"), "wrong output: %s\n", buffer);
r = MsiRecordSetStringA(hrec, 0, "[abc\\x]");
@@ -786,7 +785,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong: %d\n", sz);
+ ok( sz == 7, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"[abc\\x]"), "wrong output: %s\n", buffer);
r = MsiRecordSetStringA(hrec, 0, "[\\[]Bracket Text[\\]]");
@@ -794,7 +793,7 @@ static void test_formatrecord(void)
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 20, "size wrong: %d\n", sz);
+ ok( sz == 20, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"[\\[]Bracket Text[\\]]"), "wrong output: %s\n", buffer);
/* now try other formats without a package */
@@ -1091,7 +1090,7 @@ static void test_formatrecord(void)
sz = sizeof(buffer);
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
ok(!lstrcmpA(buffer, "[\\[]"), "Expected \"[\\[]\", got \"%s\"\n", buffer);
r = MsiRecordSetStringA(hrec, 0, "[foo]");
@@ -1329,7 +1328,7 @@ static void test_formatrecord(void)
r = MsiFormatRecordA(0, hrec, buffer, &sz);
todo_wine
{
- ok( sz == 12, "size wrong: got %u, expected 12\n", sz);
+ ok( sz == 12, "size wrong: got %lu, expected 12\n", sz);
ok( 0 == strcmp(buffer,"{[1{{boo}}]}"), "wrong output: got %s, expected [1]\n", buffer);
}
ok( r == ERROR_SUCCESS, "format failed\n");
@@ -1340,7 +1339,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
sz = sizeof buffer;
r = MsiFormatRecordA(0, hrec, buffer, &sz);
- ok( sz == 6, "size wrong: got %u, expected 3\n", sz);
+ ok( sz == 6, "size wrong: got %lu, expected 3\n", sz);
ok( 0 == strcmp(buffer,"{{hoo}"), "wrong output: got %s, expected [1]\n", buffer);
ok( r == ERROR_SUCCESS, "format failed\n");
@@ -1525,7 +1524,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 6, "size wrong(%i)\n",sz);
+ ok( sz == 6, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{abcd}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1533,7 +1532,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 23, "size wrong(%i)\n",sz);
+ ok( sz == 23, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{a[one]bc[two]de[one]f}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1541,7 +1540,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 23, "size wrong(%i)\n",sz);
+ ok( sz == 23, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{a[one]bc[bad]de[two]f}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1549,7 +1548,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong(%i)\n",sz);
+ ok( sz == 7, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{[bad]}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1557,7 +1556,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 14, "size wrong(%i)\n",sz);
+ ok( sz == 14, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{abc{d[one]ef}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1565,7 +1564,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 15, "size wrong(%i)\n",sz);
+ ok( sz == 15, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{abc{d[one]ef}}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1573,7 +1572,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 5, "size wrong(%i)\n",sz);
+ ok( sz == 5, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{abc}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1581,7 +1580,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1589,7 +1588,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1599,7 +1598,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 7, "size wrong(%i)\n",sz);
+ ok( sz == 7, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"hi{jk}}"), "wrong output (%s)\n",buffer);
}
@@ -1610,7 +1609,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 1, "size wrong(%i)\n",sz);
+ ok( sz == 1, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"}"), "wrong output (%s)\n",buffer);
}
@@ -1619,7 +1618,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1627,7 +1626,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1635,7 +1634,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong(%i)\n",sz);
+ ok( sz == 7, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{a{b}c}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1643,7 +1642,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 6, "size wrong(%i)\n",sz);
+ ok( sz == 6, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{a{b}}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1651,7 +1650,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 6, "size wrong(%i)\n",sz);
+ ok( sz == 6, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{{b}c}"), "wrong output (%s)\n",buffer);
sz = sizeof buffer;
@@ -1661,7 +1660,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 2, "size wrong(%i)\n",sz);
+ ok( sz == 2, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"}}"), "wrong output (%s)\n",buffer);
}
@@ -1672,7 +1671,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 8, "size wrong(%i)\n",sz);
+ ok( sz == 8, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"100 -100"), "wrong output (%s)\n",buffer);
sz = sizeof(buffer);
@@ -1682,7 +1681,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 33, "Expected 33, got %d\n",sz);
+ ok(sz == 33, "Expected 33, got %lu\n",sz);
ok(!lstrcmpA(buffer, "one {[noprop] [twoprop]} {abcdef}"),
"Expected \"one {[noprop] [twoprop]} {abcdef}\", got \"%s\"\n", buffer);
@@ -1693,7 +1692,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 29, "Expected 29, got %d\n",sz);
+ ok(sz == 29, "Expected 29, got %lu\n",sz);
ok(!lstrcmpA(buffer, "one {[noprop] [one]} {abcdef}"),
"Expected \"one {[noprop] [one]} {abcdef}\", got \"%s\"\n", buffer);
@@ -1704,7 +1703,7 @@ static void test_formatrecord(void)
ok( r == ERROR_SUCCESS, "set string failed\n");
r = MsiFormatRecordA(0, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 20, "Expected 20, got %d\n",sz);
+ ok(sz == 20, "Expected 20, got %lu\n",sz);
ok(!lstrcmpA(buffer, "one {[one]} {abcdef}"),
"Expected \"one {[one]} {abcdef}\", got \"%s\"\n", buffer);
@@ -1766,7 +1765,7 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed with empty buffer (%i)\n",r);
- ok( sz == 51, "size wrong (%i)\n",sz);
+ ok( sz == 51, "size wrong (%lu)\n",sz);
ok( 0 == strcmp(buffer,"1: 2: 3: 4: 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer);
r = MsiSetPropertyA(package, "prop", "val");
@@ -1789,7 +1788,7 @@ static void test_formatrecord_package(void)
ok( r == ERROR_SUCCESS, "format failed with empty buffer (%i)\n",r);
todo_wine
{
- ok( sz == 66, "size wrong (%i)\n",sz);
+ ok( sz == 66, "size wrong (%lu)\n",sz);
ok( !lstrcmpA(buffer,
"1: [2] 2: stuff 3: prop 4: val 5: 6: 7: 8: 9: 10: 11: 12: "),
"wrong output(%s)\n",buffer);
@@ -1805,7 +1804,7 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 9, "size wrong(%i)\n",sz);
+ ok( sz == 9, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"boo hoo 3"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[1] [2] [\\x]");
@@ -1817,77 +1816,77 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 9, "size wrong(%i)\n",sz);
+ ok( sz == 9, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"boo hoo x"), "wrong output (%s)\n",buffer);
MsiRecordSetStringA(hrec, 0, "[\\x]");
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 1, "size wrong: %d\n", sz);
+ ok( sz == 1, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"x"), "wrong output: %s\n", buffer);
MsiRecordSetStringA(hrec, 0, "{\\x}");
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 4, "size wrong: %d\n", sz);
+ ok( sz == 4, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"{\\x}"), "wrong output: %s\n", buffer);
MsiRecordSetStringA(hrec, 0, "[abc\\x]");
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong: %d\n", sz);
+ ok( sz == 0, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,""), "wrong output: %s\n", buffer);
MsiRecordSetStringA(hrec, 0, "[abc\\xdef]");
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong: %d\n", sz);
+ ok( sz == 0, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,""), "wrong output: %s\n", buffer);
MsiRecordSetStringA(hrec, 0, "\\x");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
ok(!lstrcmpA(buffer, "\\x"), "Expected \"\\x\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\[");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
ok(!lstrcmpA(buffer, "[\\["), "Expected \"[\\[\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\[]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
ok(!lstrcmpA(buffer, "["), "Expected \"[\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[[]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
ok(!lstrcmpA(buffer, "[[]"), "Expected \"[]\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\[]]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
ok(!lstrcmpA(buffer, "[]"), "Expected \"[]\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\[a]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
ok(!lstrcmpA(buffer, "["), "Expected \"[\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\a[]");
@@ -1896,7 +1895,7 @@ static void test_formatrecord_package(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
todo_wine
{
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
ok(!lstrcmpA(buffer, "a"), "Expected \"a\", got \"%s\"\n", buffer);
}
@@ -1904,14 +1903,14 @@ static void test_formatrecord_package(void)
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
ok(!lstrcmpA(buffer, "val"), "Expected \"val\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[prop] [pro\\pblah] [prop]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 8, "Expected 8, got %d\n", sz);
+ ok(sz == 8, "Expected 8, got %lu\n", sz);
ok(!lstrcmpA(buffer, "val val"), "Expected \"val val\", got \"%s\"\n", buffer);
MsiSetPropertyA(package, "b", "ball");
@@ -1919,35 +1918,35 @@ static void test_formatrecord_package(void)
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
ok(!lstrcmpA(buffer, "b"), "Expected \"b\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\c]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
ok(!lstrcmpA(buffer, "c"), "Expected \"c\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\[]prop]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
ok(!lstrcmpA(buffer, "[prop]"), "Expected \"[prop]\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\a]prop]");
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
ok(!lstrcmpA(buffer, "aprop]"), "Expected \"aprop]\", got \"%s\"\n", buffer);
MsiRecordSetStringA(hrec, 0, "[\\[]Bracket Text[\\]]");
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 14, "size wrong: %d\n", sz);
+ ok( sz == 14, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"[Bracket Text]"), "wrong output: %s\n", buffer);
/* null characters */
@@ -1960,7 +1959,7 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 9, "size wrong: %d\n", sz);
+ ok( sz == 9, "size wrong: %lu\n", sz);
ok( 0 == strcmp(buffer,"boo "), "wrong output: %s\n", buffer);
ok(!lstrcmpA(&buffer[5], " hoo"),
"Expected \" hoo\", got \"%s\"\n", &buffer[5]);
@@ -1974,7 +1973,7 @@ static void test_formatrecord_package(void)
sz = sizeof(buffer);
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 8, "Expected 8, got %d\n", sz);
+ ok(sz == 8, "Expected 8, got %lu\n", sz);
ok(!lstrcmpA(buffer, "boo hoo"), "Expected \"boo hoo\", got \"%s\"\n", buffer);
/* properties */
@@ -2022,7 +2021,7 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 12, "size wrong(%i)\n",sz);
+ ok( sz == 12, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"foo baa whoa"), "wrong output (%s)\n",buffer);
r = MsiSetPropertyA(package,"dummya","1");
@@ -2042,7 +2041,7 @@ static void test_formatrecord_package(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 9, "size wrong(%i)\n",sz);
+ ok( sz == 9, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"1 [1] [2]"), "wrong output (%s)\n",buffer);
}
@@ -2065,7 +2064,7 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 10, "size wrong(%i)\n",sz);
+ ok( sz == 10, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"\\blath b 1"), "wrong output (%s)\n",buffer);
r = MsiRecordSetStringA(hrec, 0, "[1] [2] [[\\3asdf]]");
@@ -2081,7 +2080,7 @@ static void test_formatrecord_package(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 11, "size wrong(%i)\n",sz);
+ ok( sz == 11, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"boo hoo [3]"), "wrong output (%s)\n",buffer);
}
@@ -2096,7 +2095,7 @@ static void test_formatrecord_package(void)
sz = sizeof buffer;
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 9, "size wrong(%i)\n",sz);
+ ok( sz == 9, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"boo hoo h"), "wrong output (%s)\n",buffer);
/* nested properties */
@@ -2107,7 +2106,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "[PropC]");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong(%i)\n",sz);
+ ok( sz == 7, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[PropB]"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "PropA", "surprise");
@@ -2117,7 +2116,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "[PropC]");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 5, "size wrong(%i)\n",sz);
+ ok( sz == 5, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"PropB"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "PropA", "surprise");
@@ -2127,7 +2126,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "[[PropC]]");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "PropA", "surprise");
@@ -2137,7 +2136,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "[[PropC]]");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 7, "size wrong(%i)\n",sz);
+ ok( sz == 7, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"[PropA]"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "PropA", "surprise");
@@ -2147,7 +2146,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "[[PropC]]");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 5, "size wrong(%i)\n",sz);
+ ok( sz == 5, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"PropA"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "PropA", "surprise");
@@ -2157,7 +2156,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "[[[PropC]]]");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 8, "size wrong(%i)\n",sz);
+ ok( sz == 8, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"surprise"), "wrong output (%s)\n",buffer);
/* properties inside braces */
@@ -2165,7 +2164,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "{abcd}");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 6, "size wrong(%i)\n",sz);
+ ok( sz == 6, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{abcd}"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "one", "mercury");
@@ -2174,7 +2173,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "{a[one]bc[two]de[one]f}");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed: %d\n", r);
- ok( sz == 25, "size wrong(%i)\n",sz);
+ ok( sz == 25, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"amercurybcvenusdemercuryf"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "one", "mercury");
@@ -2184,7 +2183,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "{a[one]bc[bad]de[two]f}");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "bad", "");
@@ -2192,7 +2191,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "{[bad]}");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "one", "mercury");
@@ -2202,7 +2201,7 @@ static void test_formatrecord_package(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 14, "size wrong(%i)\n",sz);
+ ok( sz == 14, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"abc{dmercuryef"), "wrong output (%s)\n",buffer);
}
@@ -2213,7 +2212,7 @@ static void test_formatrecord_package(void)
ok( r == ERROR_SUCCESS, "format failed\n");
todo_wine
{
- ok( sz == 15, "size wrong(%i)\n",sz);
+ ok( sz == 15, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"abc{dmercuryef}"), "wrong output (%s)\n",buffer);
}
@@ -2222,7 +2221,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "{abc}{{def}hi{j[one]k}}");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 5, "size wrong(%i)\n",sz);
+ ok( sz == 5, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,"{abc}"), "wrong output (%s)\n",buffer);
MsiSetPropertyA(package, "one", "mercury");
@@ -2231,7 +2230,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 0, "{{def}hi{j[one]k}}");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok( r == ERROR_SUCCESS, "format failed\n");
- ok( sz == 0, "size wrong(%i)\n",sz);
+ ok( sz == 0, "size wrong(%lu)\n",sz);
ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer);
sz = sizeof(buffer);
@@ -2239,7 +2238,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 1, "one");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 13, "Expected 13, got %d\n",sz);
+ ok(sz == 13, "Expected 13, got %lu\n",sz);
ok(!lstrcmpA(buffer, "one {abcdef}"),
"Expected \"one {abcdef}\", got \"%s\"\n", buffer);
@@ -2248,7 +2247,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 1, "one");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 13, "Expected 13, got %d\n",sz);
+ ok(sz == 13, "Expected 13, got %lu\n",sz);
ok(!lstrcmpA(buffer, "one {abcdef}"),
"Expected \"one {abcdef}\", got \"%s\"\n", buffer);
@@ -2257,7 +2256,7 @@ static void test_formatrecord_package(void)
MsiRecordSetStringA(hrec, 1, "one");
r = MsiFormatRecordA(package, hrec, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 20, "Expected 20, got %d\n",sz);
+ ok(sz == 20, "Expected 20, got %lu\n",sz);
ok(!lstrcmpA(buffer, "one mercury {abcdef}"),
"Expected \"one mercury {abcdef}\", got \"%s\"\n", buffer);
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index ae5b03e248c..a7388a917d8 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2640,7 +2640,7 @@ static char *load_resource(const char *name)
GetTempFileNameA(".", name, 0, path);
file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %lu\n", path, GetLastError());
res = FindResourceA(NULL, name, "TESTDLL");
ok( res != 0, "couldn't find resource\n" );
@@ -2752,7 +2752,7 @@ static void remove_restore_point(DWORD seq_number)
res = pSRRemoveRestorePoint(seq_number);
if (res != ERROR_SUCCESS)
- trace("Failed to remove the restore point : %08x\n", res);
+ trace("Failed to remove the restore point: %#lx\n", res);
}
static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access )
@@ -2811,29 +2811,29 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyExA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
type = REG_SZ;
res = RegQueryValueExA(hkey, "Name", NULL, &type, (LPBYTE)path, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(path, "imaname"), "Expected imaname, got %s\n", path);
size = MAX_PATH;
type = REG_SZ;
res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
size = sizeof(num);
type = REG_DWORD;
res = RegQueryValueExA(hkey, "number", NULL, &type, (LPBYTE)&num, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
- ok(num == 314, "Expected 314, got %d\n", num);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
+ ok(num == 314, "Expected 314, got %lu\n", num);
size = MAX_PATH;
type = REG_SZ;
res = RegQueryValueExA(hkey, "OrderTestName", NULL, &type, (LPBYTE)path, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(path, "OrderTestValue"), "Expected OrderTestValue, got %s\n", path);
delete_key(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", access);
@@ -2845,7 +2845,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest");
create_database(msifile, up_tables, ARRAY_SIZE(up_tables));
@@ -2857,7 +2857,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest");
create_database(msifile, up2_tables, ARRAY_SIZE(up2_tables));
@@ -2869,7 +2869,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest");
create_database(msifile, up3_tables, ARRAY_SIZE(up3_tables));
@@ -2881,7 +2881,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest");
create_database(msifile, up4_tables, ARRAY_SIZE(up4_tables));
@@ -2893,7 +2893,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
create_database(msifile, up4_tables, ARRAY_SIZE(up4_tables));
@@ -2904,7 +2904,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
create_database(msifile, up5_tables, ARRAY_SIZE(up5_tables));
@@ -2915,7 +2915,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
create_database(msifile, up6_tables, ARRAY_SIZE(up6_tables));
@@ -2926,7 +2926,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
create_database(msifile, up7_tables, ARRAY_SIZE(up7_tables));
@@ -2937,7 +2937,7 @@ static void test_MsiInstallProduct(void)
delete_pf_files();
res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -3789,7 +3789,7 @@ static void generate_transform_manual(void)
STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm);
if (FAILED(r))
{
- ok(0, "failed to create stream %08x\n", r);
+ ok(0, "failed to create stream %#lx\n", r);
continue;
}
@@ -3996,16 +3996,16 @@ static void set_admin_property_stream(LPCSTR file)
MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, MAX_PATH);
hr = StgOpenStorage(fileW, NULL, mode, NULL, 0, &stg);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
if (!stg)
return;
hr = IStorage_CreateStream(stg, L"\x41ca\x4330\x3e71\x44b5\x4233\x45f5\x422c\x4836",
STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
hr = IStream_Write(stm, L"MYPROP=2718 MyProp=42", sizeof(L"MYPROP=2718 MyProp=42"), &count);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
IStream_Release(stm);
IStorage_Release(stg);
@@ -4725,7 +4725,7 @@ static void test_sourcepath(void)
r = MsiInstallProductA(msifile, NULL);
ok(r == spmap[i].err, "%d: Expected %d, got %d\n", i, spmap[i].err, r);
ok(get_pf_file_size("msitest\\augustus") == spmap[i].size,
- "%d: Expected %d, got %d\n", i, spmap[i].size,
+ "%u: Expected %lu, got %lu\n", i, spmap[i].size,
get_pf_file_size("msitest\\augustus"));
if (r == ERROR_SUCCESS)
@@ -5062,7 +5062,7 @@ static void test_shortcut(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
- ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr);
+ ok(SUCCEEDED(hr), "CoInitialize failed %#lx\n", hr);
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -5070,7 +5070,7 @@ static void test_shortcut(void)
CoUninitialize();
hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
- ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr);
+ ok(SUCCEEDED(hr), "CoInitialize failed %#lx\n", hr);
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -5262,14 +5262,14 @@ static void process_pending_renames(HKEY hkey)
BOOL found = FALSE;
ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size);
- ok(!ret, "RegQueryValueExA failed %d\n", ret);
+ ok(!ret, "RegQueryValueExA failed %ld\n", ret);
buf = malloc(size + 1);
buf2ptr = buf2 = calloc(1, size + 1);
ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size);
buf[size] = 0;
- ok(!ret, "RegQueryValueExA failed %d\n", ret);
+ ok(!ret, "RegQueryValueExA failed %ld\n", ret);
if (ret) return;
for (src = buf; *src; src = dst + strlen(dst) + 1)
@@ -5300,12 +5300,12 @@ static void process_pending_renames(HKEY hkey)
{
if (dst[0] == '\\' && dst[1] == '?' && dst[2] == '?' && dst[3] == '\\') dst += 4;
fileret = MoveFileExA(src, dst, flags);
- ok(fileret, "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError());
+ ok(fileret, "Failed to move file %s -> %s (%lu)\n", src, dst, GetLastError());
}
else
{
fileret = DeleteFileA(src);
- ok(fileret || broken(!fileret) /* win2k3 */, "Failed to delete file %s (%u)\n", src, GetLastError());
+ ok(fileret || broken(!fileret) /* win2k3 */, "Failed to delete file %s (%lu)\n", src, GetLastError());
}
}
@@ -5327,7 +5327,7 @@ static BOOL file_matches_data(LPCSTR file, LPCSTR data)
char buf[128];
handle = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok(handle != INVALID_HANDLE_VALUE, "failed to open %s (%u)\n", file, GetLastError());
+ ok(handle != INVALID_HANDLE_VALUE, "failed to open %s (%lu)\n", file, GetLastError());
if (ReadFile(handle, buf, sizeof(buf), &len, NULL) && len >= data_len)
{
@@ -5872,25 +5872,25 @@ static void test_mixed_package(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey);
- ok(!res, "can't open 32-bit component key, got %d\n", res);
+ ok(!res, "can't open 32-bit component key, got %ld\n", res);
res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
- ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
+ ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res);
res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
- ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
+ ok(res, "expected RegQueryValueEx to fail, got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey);
- ok(!res, "can't open 64-bit component key, got %d\n", res);
+ ok(!res, "can't open 64-bit component key, got %ld\n", res);
res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
- ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
+ ok(res, "expected RegQueryValueEx to fail, got %ld\n", res);
res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
- ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
+ ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_CLASSES_ROOT,
"CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32",
0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey);
- ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %ld\n", res);
if (res == ERROR_SUCCESS) {
size = sizeof(value);
res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size);
@@ -5901,7 +5901,7 @@ static void test_mixed_package(void)
res = RegOpenKeyExA(HKEY_CLASSES_ROOT,
"CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32",
0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %ld\n", res);
if (res == ERROR_SUCCESS) {
size = sizeof(value);
res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size);
@@ -5935,25 +5935,25 @@ static void test_mixed_package(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey);
- ok(!res, "can't open 32-bit component key, got %d\n", res);
+ ok(!res, "can't open 32-bit component key, got %ld\n", res);
res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
- ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
+ ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res);
res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
- ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
+ ok(res, "expected RegQueryValueEx to fail, got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey);
- ok(!res, "can't open 64-bit component key, got %d\n", res);
+ ok(!res, "can't open 64-bit component key, got %ld\n", res);
res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
- ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
+ ok(res, "expected RegQueryValueEx to fail, got %ld\n", res);
res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
- ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
+ ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res);
RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_CLASSES_ROOT,
"CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32",
0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey);
- ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %ld\n", res);
if (res == ERROR_SUCCESS) {
size = sizeof(value);
res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size);
@@ -5964,7 +5964,7 @@ static void test_mixed_package(void)
res = RegOpenKeyExA(HKEY_CLASSES_ROOT,
"CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32",
0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey);
- ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %ld\n", res);
if (res == ERROR_SUCCESS) {
size = sizeof(value);
res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size);
@@ -6092,15 +6092,15 @@ static void test_remove_upgrade_code(void)
res = RegOpenKeyExA( HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2",
0, access, &hkey );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
type = 0xdeadbeef;
buf[0] = 0x55;
size = sizeof(buf);
res = RegQueryValueExA( hkey, "94A88FD7F6998CE40A22FB59F6B9C2BB", NULL, &type, (BYTE *)buf, &size );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
- ok( type == REG_SZ, "got %u\n", type );
- ok( size == 1, "got %u\n", size );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
+ ok( type == REG_SZ, "got %lu\n", type );
+ ok( size == 1, "got %lu\n", size );
ok( !buf[0], "wrong data\n" );
RegCloseKey( hkey );
@@ -6110,7 +6110,7 @@ static void test_remove_upgrade_code(void)
res = RegOpenKeyExA( HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2",
0, access, &hkey );
- ok( res == ERROR_FILE_NOT_FOUND, "got %d\n", res );
+ ok( res == ERROR_FILE_NOT_FOUND, "got %ld\n", res );
RemoveDirectoryA( "msitest" );
DeleteFileA( msifile );
@@ -6153,7 +6153,7 @@ static void check_file_matches(const char *filename, const char *text)
file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
ReadFile(file, buffer, sizeof(buffer), &size, NULL);
- ok(size == strlen(text) && !memcmp(buffer, text, size), "got %.*s\n", size, buffer);
+ ok(size == strlen(text) && !memcmp(buffer, text, size), "got %.*s\n", (int)size, buffer);
CloseHandle(file);
}
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 7bfddee4e4e..39cbaf56b79 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -1231,7 +1231,7 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed)
int size;
hr = CoCreateGuid(&guid);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
size = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW));
ok(size == GUID_SIZE, "Expected %d, got %d.\n", GUID_SIZE, size);
@@ -1287,42 +1287,42 @@ static void test_MsiQueryProductState(void)
state = MsiQueryProductStateA(NULL);
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* empty prodcode */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA("");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* garbage prodcode */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA("garbage");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* guid without brackets */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* guid with brackets */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}");
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
/* same length as guid, but random */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93");
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* MSIINSTALLCONTEXT_USERUNMANAGED */
@@ -1330,20 +1330,20 @@ static void test_MsiQueryProductState(void)
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\");
lstrcatA(keypath, prodcode);
@@ -1357,25 +1357,25 @@ static void test_MsiQueryProductState(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local uninstall key exists */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
data = 1;
res = RegSetValueExA(localkey, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* WindowsInstaller value exists */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
RegDeleteValueA(localkey, "WindowsInstaller");
delete_key(localkey, "", access & KEY_WOW64_64KEY);
@@ -1394,28 +1394,28 @@ static void test_MsiQueryProductState(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local product key exists */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* install properties key exists */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
data = 1;
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* WindowsInstaller value exists */
SetLastError(0xdeadbeef);
@@ -1435,18 +1435,18 @@ static void test_MsiQueryProductState(void)
return;
}
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
data = 2;
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* WindowsInstaller value is not 1 */
SetLastError(0xdeadbeef);
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
RegDeleteKeyA(userkey, "");
@@ -1455,7 +1455,7 @@ static void test_MsiQueryProductState(void)
state = MsiQueryProductStateA(prodcode);
error = GetLastError();
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
RegDeleteValueA(props, "WindowsInstaller");
delete_key(props, "", access & KEY_WOW64_64KEY);
@@ -1473,7 +1473,7 @@ static void test_MsiQueryProductState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_ADVERTISED,
@@ -1485,14 +1485,14 @@ static void test_MsiQueryProductState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_ADVERTISED,
"Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_ADVERTISED,
@@ -1500,7 +1500,7 @@ static void test_MsiQueryProductState(void)
data = 1;
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* WindowsInstaller value exists */
state = MsiQueryProductStateA(prodcode);
@@ -1526,7 +1526,7 @@ static void test_MsiQueryProductState(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
@@ -1536,14 +1536,14 @@ static void test_MsiQueryProductState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_ADVERTISED,
"Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_ADVERTISED,
@@ -1551,7 +1551,7 @@ static void test_MsiQueryProductState(void)
data = 1;
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* WindowsInstaller value exists */
state = MsiQueryProductStateA(prodcode);
@@ -1608,10 +1608,10 @@ static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squash
int size;
hr = CoCreateGuid(&guid);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
size = StringFromGUID2(&guid, guidW, MAX_PATH);
- ok(size == 39, "Expected 39, got %d\n", hr);
+ ok(size == 39, "Expected 39, got %d\n", size);
WideCharToMultiByte(CP_ACP, 0, guidW, size, component, MAX_PATH, NULL, NULL);
encode_base85_guid(&guid, base85W);
@@ -1648,63 +1648,63 @@ static void test_MsiQueryFeatureState(void)
state = MsiQueryFeatureStateA(NULL, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* empty prodcode */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA("", "feature");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* garbage prodcode */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA("garbage", "feature");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* guid without brackets */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", "feature");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* guid with brackets */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", "feature");
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
/* same length as guid, but random */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93", "feature");
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* NULL szFeature */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, NULL);
error = GetLastError();
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* empty szFeature */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "");
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
/* feature key does not exist yet */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
/* MSIINSTALLCONTEXT_USERUNMANAGED */
@@ -1712,24 +1712,24 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* feature key exists */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* feature value exists */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -1746,50 +1746,50 @@ static void test_MsiQueryFeatureState(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* userdata features key exists */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaaa", 22);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -1797,7 +1797,7 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -1805,81 +1805,81 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, comp_squashed2);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey2, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLSTATE_LOCAL */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLSTATE_SOURCE */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* bad INSTALLSTATE_SOURCE */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLSTATE_SOURCE */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* bad INSTALLSTATE_SOURCE */
SetLastError(0xdeadbeef);
state = MsiQueryFeatureStateA(prodcode, "feature");
error = GetLastError();
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
+ ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error);
RegDeleteValueA(compkey, prod_squashed);
RegDeleteValueA(compkey2, prod_squashed);
@@ -1901,14 +1901,14 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* feature key exists */
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* feature value exists */
state = MsiQueryFeatureStateA(prodcode, "feature");
@@ -1921,32 +1921,32 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, "\\Features");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* userdata features key exists */
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaaa", 22);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
@@ -1957,7 +1957,7 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -1965,25 +1965,25 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, comp_squashed2);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey2, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
@@ -2012,14 +2012,14 @@ static void test_MsiQueryFeatureState(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* feature key exists */
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* feature value exists */
state = MsiQueryFeatureStateA(prodcode, "feature");
@@ -2031,32 +2031,32 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, "\\Features");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* userdata features key exists */
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaaa", 22);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
@@ -2066,32 +2066,32 @@ static void test_MsiQueryFeatureState(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, "S-1-5-18\\Components\\");
lstrcatA(keypath, comp_squashed2);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey2, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MsiQueryFeatureStateA(prodcode, "feature");
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
@@ -2148,7 +2148,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* empty szProductCode */
state = MAGIC_ERROR;
@@ -2157,7 +2157,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* random szProductCode */
state = MAGIC_ERROR;
@@ -2166,7 +2166,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* GUID-length szProductCode */
state = MAGIC_ERROR;
@@ -2175,7 +2175,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* GUID-length with brackets */
state = MAGIC_ERROR;
@@ -2184,7 +2184,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* actual GUID */
state = MAGIC_ERROR;
@@ -2193,7 +2193,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
state = MAGIC_ERROR;
SetLastError(0xdeadbeef);
@@ -2201,7 +2201,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
@@ -2213,7 +2213,7 @@ static void test_MsiQueryComponentState(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MAGIC_ERROR;
SetLastError(0xdeadbeef);
@@ -2221,7 +2221,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
delete_key(prodkey, "", access & KEY_WOW64_64KEY);
RegCloseKey(prodkey);
@@ -2238,7 +2238,7 @@ static void test_MsiQueryComponentState(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local system product key exists */
state = MAGIC_ERROR;
@@ -2246,10 +2246,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(prodkey, "LocalPackage", 0, REG_SZ, (const BYTE *)"msitest.msi", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
state = MAGIC_ERROR;
@@ -2258,13 +2258,13 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\");
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* component key exists */
state = MAGIC_ERROR;
@@ -2273,10 +2273,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 0);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* component\product exists */
state = MAGIC_ERROR;
@@ -2286,7 +2286,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(state == INSTALLSTATE_NOTUSED || state == INSTALLSTATE_LOCAL,
"Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
/* NULL component, product exists */
state = MAGIC_ERROR;
@@ -2295,10 +2295,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(state == MAGIC_ERROR, "Expected state not changed, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLSTATE_LOCAL */
state = MAGIC_ERROR;
@@ -2307,10 +2307,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLSTATE_SOURCE */
state = MAGIC_ERROR;
@@ -2319,10 +2319,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* bad INSTALLSTATE_SOURCE */
state = MAGIC_ERROR;
@@ -2331,10 +2331,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLSTATE_SOURCE */
state = MAGIC_ERROR;
@@ -2343,10 +2343,10 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01:", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* registry component */
state = MAGIC_ERROR;
@@ -2355,7 +2355,7 @@ static void test_MsiQueryComponentState(void)
error = GetLastError();
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error);
+ ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error);
RegDeleteValueA(prodkey, "LocalPackage");
delete_key(prodkey, "", access & KEY_WOW64_64KEY);
@@ -2375,7 +2375,7 @@ static void test_MsiQueryComponentState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MAGIC_ERROR;
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, component, &state);
@@ -2392,10 +2392,10 @@ static void test_MsiQueryComponentState(void)
lstrcatA(keypath, "\\InstallProperties");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(prodkey, "LocalPackage", 0, REG_SZ, (const BYTE *)"msitest.msi", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(prodkey);
@@ -2410,7 +2410,7 @@ static void test_MsiQueryComponentState(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* component key exists */
state = MAGIC_ERROR;
@@ -2419,7 +2419,7 @@ static void test_MsiQueryComponentState(void)
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 0);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* component\product exists */
state = MAGIC_ERROR;
@@ -2429,7 +2429,7 @@ static void test_MsiQueryComponentState(void)
"Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MAGIC_ERROR;
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, component, &state);
@@ -2447,7 +2447,7 @@ static void test_MsiQueryComponentState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MAGIC_ERROR;
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED, component, &state);
@@ -2463,7 +2463,7 @@ static void test_MsiQueryComponentState(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MAGIC_ERROR;
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED, component, &state);
@@ -2480,10 +2480,10 @@ static void test_MsiQueryComponentState(void)
lstrcatA(keypath, "\\InstallProperties");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(prodkey, "ManagedLocalPackage", 0, REG_SZ, (const BYTE *)"msitest.msi", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
state = MAGIC_ERROR;
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED, component, &state);
@@ -2527,51 +2527,51 @@ static void test_MsiGetComponentPath(void)
size = MAX_PATH;
state = MsiGetComponentPathA(NULL, component, path, &size);
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* NULL szComponent */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, NULL, path, &size);
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(NULL, path, &size);
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* NULL lpPathBuf */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, NULL, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, NULL, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* NULL pcchBuf */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, NULL);
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, NULL);
ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* all params valid */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Components\\");
@@ -2584,21 +2584,21 @@ static void test_MsiGetComponentPath(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local system component key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
path[0] = 0;
@@ -2606,14 +2606,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
@@ -2621,11 +2621,11 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, "\\InstallProperties");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &installprop, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
val = 1;
res = RegSetValueExA(installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* install properties key exists */
path[0] = 0;
@@ -2633,14 +2633,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
create_file("C:\\imapath", 11);
@@ -2650,28 +2650,28 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state);
ok(path[0] == 'a', "got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
size = 0;
path[0] = 'a';
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state);
ok(path[0] == 'a', "got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(compkey, prod_squashed);
delete_key(compkey, "", access & KEY_WOW64_64KEY);
@@ -2688,21 +2688,21 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed component key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %ld\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %ld\n", size);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
path[0] = 0;
@@ -2710,14 +2710,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
@@ -2725,11 +2725,11 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, "\\InstallProperties");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &installprop, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
val = 1;
res = RegSetValueExA(installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* install properties key exists */
path[0] = 0;
@@ -2737,14 +2737,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
create_file("C:\\imapath", 11);
@@ -2754,14 +2754,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(compkey, prod_squashed);
delete_key(compkey, "", access & KEY_WOW64_64KEY);
@@ -2778,18 +2778,18 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed product key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\");
@@ -2798,21 +2798,21 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed component key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
path[0] = 0;
@@ -2820,14 +2820,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
@@ -2835,11 +2835,11 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, "\\InstallProperties");
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &installprop, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
val = 1;
res = RegSetValueExA(installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* install properties key exists */
path[0] = 0;
@@ -2847,14 +2847,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
create_file("C:\\imapath", 11);
@@ -2864,14 +2864,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(compkey, prod_squashed);
delete_key(prodkey, "", access & KEY_WOW64_64KEY);
@@ -2887,18 +2887,18 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user unmanaged product key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\");
@@ -2907,21 +2907,21 @@ static void test_MsiGetComponentPath(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user unmanaged component key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %ld\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %ld\n", size);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
path[0] = 0;
@@ -2929,14 +2929,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
create_file("C:\\imapath", 11);
@@ -2946,14 +2946,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(compkey, prod_squashed);
RegDeleteKeyA(prodkey, "");
@@ -2972,39 +2972,39 @@ static void test_MsiGetComponentPath(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local classes product key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Components\\");
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user component key exists */
size = MAX_PATH;
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %ld\n", size);
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %ld\n", size);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
path[0] = 0;
@@ -3012,14 +3012,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
create_file("C:\\imapath", 11);
@@ -3029,14 +3029,14 @@ static void test_MsiGetComponentPath(void)
state = MsiGetComponentPathA(prodcode, component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
path[0] = 0;
size = MAX_PATH;
state = MsiLocateComponentA(component, path, &size);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(compkey, prod_squashed);
delete_key(prodkey, "", access & KEY_WOW64_64KEY);
@@ -3074,37 +3074,37 @@ static void test_MsiGetComponentPathEx(void)
size = MAX_PATH;
state = pMsiGetComponentPathExA( NULL, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size );
ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state );
- todo_wine ok( !size, "got %u\n", size );
+ todo_wine ok( !size, "got %lu\n", size );
/* NULL component */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, NULL, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size );
ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state );
- todo_wine ok( !size, "got %u\n", size );
+ todo_wine ok( !size, "got %lu\n", size );
/* non-NULL usersid, MSIINSTALLCONTEXT_MACHINE */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, usersid, MSIINSTALLCONTEXT_MACHINE, path, &size);
ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state );
- todo_wine ok( !size, "got %u\n", size );
+ todo_wine ok( !size, "got %lu\n", size );
/* NULL buf */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, NULL, &size );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
- todo_wine ok( size == MAX_PATH * 2, "got %u\n", size );
+ todo_wine ok( size == MAX_PATH * 2, "got %lu\n", size );
/* NULL buflen */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, NULL );
ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state );
- ok( size == MAX_PATH, "got %u\n", size );
+ ok( size == MAX_PATH, "got %lu\n", size );
/* all params valid */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
- todo_wine ok( !size, "got %u\n", size );
+ todo_wine ok( !size, "got %lu\n", size );
lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" );
lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Components\\" );
@@ -3117,7 +3117,7 @@ static void test_MsiGetComponentPathEx(void)
LocalFree( usersid );
return;
}
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* local system component key exists */
size = MAX_PATH;
@@ -3125,7 +3125,7 @@ static void test_MsiGetComponentPathEx(void)
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* product value exists */
path[0] = 0;
@@ -3133,7 +3133,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_ABSENT, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" );
lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Products\\" );
@@ -3141,11 +3141,11 @@ static void test_MsiGetComponentPathEx(void)
lstrcatA( path_key, "\\InstallProperties" );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_installprop, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
val = 1;
res = RegSetValueExA( key_installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(val) );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* install properties key exists */
path[0] = 0;
@@ -3153,7 +3153,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_ABSENT, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
create_file( "c:\\testcomponentpath", 21 );
@@ -3163,14 +3163,14 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_MOREDATA, "got %d\n", state );
ok( !path[0], "got %s\n", path );
- todo_wine ok( size == 40, "got %u\n", size );
+ todo_wine ok( size == 40, "got %lu\n", size );
path[0] = 0;
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_LOCAL, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %d\n", size );
+ ok( size == 20, "got %lu\n", size );
RegDeleteValueA( key_comp, prod_squashed );
delete_key( key_comp, "", access & KEY_WOW64_64KEY );
@@ -3184,13 +3184,13 @@ static void test_MsiGetComponentPathEx(void)
lstrcatA( path_key, prod_squashed );
res = RegCreateKeyA( HKEY_CURRENT_USER, path_key, &key_prod );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* user unmanaged product key exists */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
- todo_wine ok(!size, "got %u\n", size);
+ todo_wine ok(!size, "got %lu\n", size);
lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" );
lstrcatA( path_key, "Installer\\UserData\\" );
@@ -3199,16 +3199,16 @@ static void test_MsiGetComponentPathEx(void)
lstrcatA( path_key, comp_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* user unmanaged component key exists */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
- todo_wine ok(!size, "got %u\n", size);
+ todo_wine ok(!size, "got %lu\n", size);
res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* product value exists */
path[0] = 0;
@@ -3216,7 +3216,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size );
ok( state == INSTALLSTATE_ABSENT, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
create_file( "c:\\testcomponentpath", 21 );
@@ -3226,7 +3226,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size );
ok( state == INSTALLSTATE_LOCAL, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
RegDeleteValueA( key_comp, prod_squashed );
RegDeleteKeyA( key_prod, "" );
@@ -3242,7 +3242,7 @@ static void test_MsiGetComponentPathEx(void)
lstrcatA( path_key, prod_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_prod, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* user managed product key exists */
size = MAX_PATH;
@@ -3256,7 +3256,7 @@ static void test_MsiGetComponentPathEx(void)
lstrcatA( path_key, comp_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* user managed component key exists */
size = MAX_PATH;
@@ -3264,7 +3264,7 @@ static void test_MsiGetComponentPathEx(void)
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* product value exists */
path[0] = 0;
@@ -3272,7 +3272,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size );
ok( state == INSTALLSTATE_ABSENT, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" );
lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Products\\" );
@@ -3280,11 +3280,11 @@ static void test_MsiGetComponentPathEx(void)
lstrcatA( path_key, "\\InstallProperties" );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_installprop, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
val = 1;
res = RegSetValueExA( key_installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(val) );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* install properties key exists */
path[0] = 0;
@@ -3292,7 +3292,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size );
ok( state == INSTALLSTATE_ABSENT, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
create_file( "c:\\testcomponentpath", 21 );
@@ -3302,7 +3302,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size );
ok( state == INSTALLSTATE_LOCAL, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
RegDeleteValueA( key_comp, prod_squashed );
delete_key( key_prod, "", access & KEY_WOW64_64KEY );
@@ -3323,29 +3323,29 @@ static void test_MsiGetComponentPathEx(void)
LocalFree( usersid );
return;
}
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* local classes product key exists */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
- todo_wine ok(!size, "got %u\n", size);
+ todo_wine ok(!size, "got %lu\n", size);
lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" );
lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Components\\" );
lstrcatA( path_key, comp_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* local user component key exists */
size = MAX_PATH;
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
- todo_wine ok(!size, "got %u\n", size);
+ todo_wine ok(!size, "got %lu\n", size);
res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
/* product value exists */
path[0] = 0;
@@ -3353,7 +3353,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_ABSENT, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
create_file( "c:\\testcomponentpath", 21 );
@@ -3363,7 +3363,7 @@ static void test_MsiGetComponentPathEx(void)
state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size );
ok( state == INSTALLSTATE_LOCAL, "got %d\n", state );
ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path );
- ok( size == 20, "got %u\n", size );
+ ok( size == 20, "got %lu\n", size );
RegDeleteValueA( key_comp, prod_squashed );
delete_key( key_prod, "", access & KEY_WOW64_64KEY );
@@ -3414,21 +3414,21 @@ static void test_MsiProvideComponent(void)
INSTALLMODE_NODETECTION, buf, &len);
ok(r == ERROR_SUCCESS, "got %u\n", r);
ok(buf[0], "empty path\n");
- ok(len == lstrlenA(buf), "got %u\n", len);
+ ok(len == lstrlenA(buf), "got %lu\n", len);
len2 = 0;
r = pMsiProvideComponentA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", "sourcedir",
"{DD422F92-3ED8-49B5-A0B7-F266F98357DF}",
INSTALLMODE_NODETECTION, NULL, &len2);
ok(r == ERROR_SUCCESS, "got %u\n", r);
- ok(len2 == len, "got %u\n", len2);
+ ok(len2 == len, "got %lu\n", len2);
len2 = 0;
r = pMsiProvideComponentA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", "sourcedir",
"{DD422F92-3ED8-49B5-A0B7-F266F98357DF}",
INSTALLMODE_NODETECTION, buf, &len2);
ok(r == ERROR_MORE_DATA, "got %u\n", r);
- ok(len2 == len, "got %u\n", len2);
+ ok(len2 == len, "got %lu\n", len2);
/* wide version */
@@ -3438,19 +3438,19 @@ static void test_MsiProvideComponent(void)
L"{DD422F92-3ED8-49B5-A0B7-F266F98357DF}", INSTALLMODE_NODETECTION, bufW, &len);
ok(r == ERROR_SUCCESS, "got %u\n", r);
ok(bufW[0], "empty path\n");
- ok(len == lstrlenW(bufW), "got %u\n", len);
+ ok(len == lstrlenW(bufW), "got %lu\n", len);
len2 = 0;
r = pMsiProvideComponentW(L"{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", L"sourcedir",
L"{DD422F92-3ED8-49B5-A0B7-F266F98357DF}", INSTALLMODE_NODETECTION, NULL, &len2);
ok(r == ERROR_SUCCESS, "got %u\n", r);
- ok(len2 == len, "got %u\n", len2);
+ ok(len2 == len, "got %lu\n", len2);
len2 = 0;
r = pMsiProvideComponentW(L"{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", L"sourcedir",
L"{DD422F92-3ED8-49B5-A0B7-F266F98357DF}", INSTALLMODE_NODETECTION, bufW, &len2);
ok(r == ERROR_MORE_DATA, "got %u\n", r);
- ok(len2 == len, "got %u\n", len2);
+ ok(len2 == len, "got %lu\n", len2);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "got %u\n", r);
@@ -3490,13 +3490,13 @@ static void test_MsiProvideQualifiedComponentEx(void)
if (is_wow64) access |= KEY_WOW64_64KEY;
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
lstrcpyA( desc, prod_base85 );
memcpy( desc + lstrlenA(desc), "feature<\0", sizeof("feature<\0") );
res = RegSetValueExA( hkey, "qualifier", 0, REG_MULTI_SZ, (const BYTE *)desc,
lstrlenA(prod_base85) + sizeof("feature<\0") );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len );
ok( r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r );
@@ -3511,7 +3511,7 @@ static void test_MsiProvideQualifiedComponentEx(void)
lstrcatA( keypath, prod_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey2, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
state = MsiQueryProductStateA( prod );
ok( state == INSTALLSTATE_ADVERTISED, "got %d\n", state );
@@ -3523,13 +3523,13 @@ static void test_MsiProvideQualifiedComponentEx(void)
lstrcatA( keypath, prod_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey3, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
state = MsiQueryFeatureStateA( prod, "feature" );
ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state );
res = RegSetValueExA( hkey3, "feature", 0, REG_SZ, (const BYTE *)"", 1 );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
state = MsiQueryFeatureStateA( prod, "feature" );
ok( state == INSTALLSTATE_ADVERTISED, "got %d\n", state );
@@ -3546,10 +3546,10 @@ static void test_MsiProvideQualifiedComponentEx(void)
lstrcatA( keypath, "\\Features" );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey4, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
res = RegSetValueExA( hkey4, "feature", 0, REG_SZ, (const BYTE *)comp2_base85, sizeof(comp2_base85) );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
state = MsiQueryFeatureStateA( prod, "feature" );
ok( state == INSTALLSTATE_ADVERTISED, "got %d\n", state );
@@ -3558,10 +3558,10 @@ static void test_MsiProvideQualifiedComponentEx(void)
lstrcatA( keypath, comp2_squashed );
res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey5, NULL );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\nosuchfile", sizeof("c:\\nosuchfile") );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
state = MsiQueryFeatureStateA( prod, "feature" );
ok( state == INSTALLSTATE_LOCAL, "got %d\n", state );
@@ -3576,13 +3576,13 @@ static void test_MsiProvideQualifiedComponentEx(void)
create_file_data( path, "test", 100 );
res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1 );
- ok( res == ERROR_SUCCESS, "got %d\n", res );
+ ok( res == ERROR_SUCCESS, "got %ld\n", res );
buf[0] = 0;
len = sizeof(buf);
r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len );
ok( r == ERROR_SUCCESS, "got %u\n", r );
- ok( len == lstrlenA(path), "got %u\n", len );
+ ok( len == lstrlenA(path), "got %lu\n", len );
ok( !lstrcmpA( path, buf ), "got '%s'\n", buf );
DeleteFileA( "msitest\\text.txt" );
@@ -3680,7 +3680,7 @@ static void test_MsiGetProductCode(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user unmanaged component key exists */
lstrcpyA(product, "prod");
@@ -3689,7 +3689,7 @@ static void test_MsiGetProductCode(void)
ok(!lstrcmpA(product, "prod"), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
lstrcpyA(product, "prod");
@@ -3698,7 +3698,7 @@ static void test_MsiGetProductCode(void)
ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product);
res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\Managed\\");
@@ -3707,7 +3707,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed product key of first product exists */
lstrcpyA(product, "prod");
@@ -3722,7 +3722,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user unmanaged product key exists */
lstrcpyA(product, "prod");
@@ -3743,7 +3743,7 @@ static void test_MsiGetProductCode(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local classes product key exists */
lstrcpyA(product, "prod");
@@ -3761,7 +3761,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, prod2_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed product key of second product exists */
lstrcpyA(product, "prod");
@@ -3781,7 +3781,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user component key exists */
lstrcpyA(product, "prod");
@@ -3790,7 +3790,7 @@ static void test_MsiGetProductCode(void)
ok(!lstrcmpA(product, "prod"), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
lstrcpyA(product, "prod");
@@ -3799,7 +3799,7 @@ static void test_MsiGetProductCode(void)
ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product);
res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\Managed\\");
@@ -3808,7 +3808,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed product key of first product exists */
lstrcpyA(product, "prod");
@@ -3823,7 +3823,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user unmanaged product key exists */
lstrcpyA(product, "prod");
@@ -3844,7 +3844,7 @@ static void test_MsiGetProductCode(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local classes product key exists */
lstrcpyA(product, "prod");
@@ -3862,7 +3862,7 @@ static void test_MsiGetProductCode(void)
lstrcatA(keypath, prod2_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user managed product key of second product exists */
lstrcpyA(product, "prod");
@@ -3939,7 +3939,7 @@ static void test_MsiEnumClients(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user unmanaged component key exists */
product[0] = '\0';
@@ -3954,7 +3954,7 @@ static void test_MsiEnumClients(void)
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
r = MsiEnumClientsA(component, 0, product);
@@ -3974,7 +3974,7 @@ static void test_MsiEnumClients(void)
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* try index 1, second product value does exist */
product[0] = '\0';
@@ -4009,7 +4009,7 @@ static void test_MsiEnumClients(void)
lstrcatA(keypath, comp_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &compkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user local component key exists */
product[0] = '\0';
@@ -4024,7 +4024,7 @@ static void test_MsiEnumClients(void)
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product value exists */
product[0] = '\0';
@@ -4044,7 +4044,7 @@ static void test_MsiEnumClients(void)
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* try index 1, second product value does exist */
product[0] = '\0';
@@ -4082,19 +4082,20 @@ static void get_version_info(LPSTR path, LPSTR *vercheck, LPDWORD verchecksz,
LPSTR version;
VS_FIXEDFILEINFO *ffi;
DWORD size = GetFileVersionInfoSizeA(path, NULL);
+ UINT len;
USHORT *lang;
version = malloc(size);
GetFileVersionInfoA(path, 0, size, version);
- VerQueryValueA(version, "\\", (LPVOID *)&ffi, &size);
+ VerQueryValueA(version, "\\", (LPVOID *)&ffi, &len);
*vercheck = malloc(MAX_PATH);
sprintf(*vercheck, "%d.%d.%d.%d", HIWORD(ffi->dwFileVersionMS),
LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS),
LOWORD(ffi->dwFileVersionLS));
*verchecksz = lstrlenA(*vercheck);
- VerQueryValueA(version, "\\VarFileInfo\\Translation", (void **)&lang, &size);
+ VerQueryValueA(version, "\\VarFileInfo\\Translation", (void **)&lang, &len);
*langcheck = malloc(MAX_PATH);
sprintf(*langcheck, "%d", *lang);
*langchecksz = lstrlenA(*langcheck);
@@ -4125,10 +4126,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
/* empty szFilePath */
r = MsiGetFileVersionA("", NULL, NULL, NULL, NULL);
@@ -4143,10 +4144,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
/* nonexistent szFilePath */
versz = MAX_PATH;
@@ -4158,10 +4159,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
/* nonexistent szFilePath, valid lpVersionBuf, NULL pcchVersionBuf */
versz = MAX_PATH;
@@ -4173,10 +4174,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
/* nonexistent szFilePath, valid lpLangBuf, NULL pcchLangBuf */
versz = MAX_PATH;
@@ -4188,10 +4189,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
/* nonexistent szFilePath, valid lpVersionBuf, pcchVersionBuf is zero */
versz = 0;
@@ -4203,10 +4204,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == 0, "Expected 0, got %d\n", versz);
+ ok(versz == 0, "Expected 0, got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
/* nonexistent szFilePath, valid lpLangBuf, pcchLangBuf is zero */
versz = MAX_PATH;
@@ -4218,10 +4219,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == 0, "Expected 0, got %d\n", langsz);
+ ok(langsz == 0, "Expected 0, got %lu\n", langsz);
/* nonexistent szFilePath, rest NULL */
r = MsiGetFileVersionA("nonexistent", NULL, NULL, NULL, NULL);
@@ -4239,10 +4240,10 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(version, "version");
lstrcpyA(lang, "lang");
r = MsiGetFileVersionA("ver.txt", version, &versz, lang, &langsz);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
ok(r == ERROR_FILE_INVALID,
@@ -4262,10 +4263,10 @@ static void test_MsiGetFileVersion(void)
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
- ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(versz == MAX_PATH, "got %lu\n", versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
- ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(langsz == MAX_PATH, "got %lu\n", langsz);
}
GetSystemDirectoryA(path, MAX_PATH);
@@ -4287,7 +4288,7 @@ static void test_MsiGetFileVersion(void)
free(langcheck);
return;
}
- ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
+ ok(versz == verchecksz, "Expected %lu, got %lu\n", verchecksz, versz);
ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang);
ok(!lstrcmpA(version, vercheck),
"Expected %s, got %s\n", vercheck, version);
@@ -4297,9 +4298,8 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(version, "version");
r = MsiGetFileVersionA(path, version, &versz, NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
- ok(!lstrcmpA(version, vercheck),
- "Expected %s, got %s\n", vercheck, version);
+ ok(versz == verchecksz, "Expected %lu, got %lu\n", verchecksz, versz);
+ ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version);
/* only check language */
langsz = MAX_PATH;
@@ -4316,13 +4316,13 @@ static void test_MsiGetFileVersion(void)
versz = MAX_PATH;
r = MsiGetFileVersionA(path, NULL, &versz, NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
+ ok(versz == verchecksz, "Expected %lu, got %lu\n", verchecksz, versz);
/* get pcchLangBuf */
langsz = MAX_PATH;
r = MsiGetFileVersionA(path, NULL, NULL, NULL, &langsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz);
+ ok(langsz >= langchecksz, "Expected %lu >= %lu\n", langsz, langchecksz);
/* pcchVersionBuf not big enough */
versz = 5;
@@ -4331,7 +4331,7 @@ static void test_MsiGetFileVersion(void)
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!strncmp(version, vercheck, 4),
"Expected first 4 characters of \"%s\", got \"%s\"\n", vercheck, version);
- ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
+ ok(versz == verchecksz, "Expected %lu, got %lu\n", verchecksz, versz);
/* pcchLangBuf not big enough */
langsz = 4;
@@ -4339,7 +4339,7 @@ static void test_MsiGetFileVersion(void)
r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(lstrcmpA(lang, "lang"), "lang not set\n");
- ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz);
+ ok(langsz >= langchecksz, "Expected %lu >= %lu\n", langsz, langchecksz);
/* pcchVersionBuf big enough, pcchLangBuf not big enough */
versz = MAX_PATH;
@@ -4347,9 +4347,9 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(version, "version");
r = MsiGetFileVersionA(path, version, &versz, NULL, &langsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
+ ok(versz == verchecksz, "Expected %lu, got %lu\n", verchecksz, versz);
ok(!lstrcmpA(version, vercheck), "Expected \"%s\", got \"%s\"\n", vercheck, version);
- ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz);
+ ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %lu >= %lu\n", langsz, langchecksz);
/* pcchVersionBuf not big enough, pcchLangBuf big enough */
versz = 5;
@@ -4357,8 +4357,8 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(lang, "lang");
r = MsiGetFileVersionA(path, NULL, &versz, lang, &langsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
- ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz);
+ ok(versz == verchecksz, "Expected %lu, got %lu\n", verchecksz, versz);
+ ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %lu >= %lu\n", langsz, langchecksz);
ok(strstr(lang, langcheck) != NULL, "expected %s in %s\n", langcheck, lang);
/* NULL pcchVersionBuf and pcchLangBuf */
@@ -4403,7 +4403,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* empty szProduct */
sz = MAX_PATH;
@@ -4412,7 +4412,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* garbage szProduct */
sz = MAX_PATH;
@@ -4421,7 +4421,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* guid without brackets */
sz = MAX_PATH;
@@ -4431,7 +4431,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* guid with brackets */
sz = MAX_PATH;
@@ -4441,7 +4441,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* same length as guid, but random */
sz = MAX_PATH;
@@ -4451,7 +4451,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* not installed, NULL szAttribute */
sz = MAX_PATH;
@@ -4460,7 +4460,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* not installed, NULL lpValueBuf */
sz = MAX_PATH;
@@ -4469,7 +4469,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* not installed, NULL pcchValueBuf */
sz = MAX_PATH;
@@ -4478,7 +4478,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
/* created guid cannot possibly be an installed product code */
sz = MAX_PATH;
@@ -4487,7 +4487,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, usersid);
@@ -4501,7 +4501,7 @@ static void test_MsiGetProductInfo(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product code exists */
sz = MAX_PATH;
@@ -4510,7 +4510,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
delete_key(prodkey, "", access & KEY_WOW64_64KEY);
RegCloseKey(prodkey);
@@ -4527,7 +4527,7 @@ static void test_MsiGetProductInfo(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user product code exists */
sz = MAX_PATH;
@@ -4536,7 +4536,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, usersid);
@@ -4544,7 +4544,7 @@ static void test_MsiGetProductInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* both local and managed product code exist */
sz = MAX_PATH;
@@ -4553,10 +4553,10 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "%lun", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -4564,10 +4564,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -4575,7 +4575,7 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
/* pcchBuf is NULL */
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, NULL);
@@ -4585,13 +4585,13 @@ static void test_MsiGetProductInfo(void)
sz = MAX_PATH;
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
/* lpValueBuf is NULL, pcchValueBuf is too small */
sz = 2;
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
/* lpValueBuf is non-NULL, pcchValueBuf is too small */
sz = 2;
@@ -4599,7 +4599,7 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(!lstrcmpA(buf, "apple"), "Expected buf to remain unchanged, got \"%s\"\n", buf);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
/* lpValueBuf is non-NULL, pcchValueBuf is exactly 4 */
sz = 4;
@@ -4608,10 +4608,10 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(buf, "apple"),
"Expected buf to remain unchanged, got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "IMadeThis", 0, REG_SZ, (LPBYTE)"random", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* random property not supported by MSI, value exists */
sz = MAX_PATH;
@@ -4620,7 +4620,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
RegDeleteValueA(propkey, "IMadeThis");
RegDeleteValueA(propkey, "HelpLink");
@@ -4635,7 +4635,7 @@ static void test_MsiGetProductInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
sz = MAX_PATH;
@@ -4644,7 +4644,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -4652,7 +4652,7 @@ static void test_MsiGetProductInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user product key exists */
sz = MAX_PATH;
@@ -4661,10 +4661,10 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "got %lu\n", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -4672,10 +4672,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -4683,7 +4683,7 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
RegDeleteValueA(propkey, "HelpLink");
delete_key(propkey, "", access & KEY_WOW64_64KEY);
@@ -4703,7 +4703,7 @@ static void test_MsiGetProductInfo(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* classes product key exists */
sz = MAX_PATH;
@@ -4712,7 +4712,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -4720,7 +4720,7 @@ static void test_MsiGetProductInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user product key exists */
sz = MAX_PATH;
@@ -4729,10 +4729,10 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -4741,7 +4741,7 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
delete_key(propkey, "", access & KEY_WOW64_64KEY);
delete_key(localkey, "", access & KEY_WOW64_64KEY);
@@ -4753,7 +4753,7 @@ static void test_MsiGetProductInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Local System product key exists */
sz = MAX_PATH;
@@ -4762,10 +4762,10 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -4773,10 +4773,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -4784,11 +4784,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink type is REG_DWORD */
sz = MAX_PATH;
@@ -4796,10 +4796,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -4807,11 +4807,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
- res = RegSetValueExA(propkey, "DisplayName", 0, REG_DWORD,
- (const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ res = RegSetValueExA(propkey, "DisplayName", 0, REG_DWORD, (const BYTE *)&val, sizeof(DWORD));
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName type is REG_DWORD */
sz = MAX_PATH;
@@ -4819,10 +4818,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"1.1.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -4830,11 +4829,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "1.1.1"), "Expected \"1.1.1\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayVersion", 0,
REG_DWORD, (const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion type is REG_DWORD */
sz = MAX_PATH;
@@ -4842,10 +4841,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"tele", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -4853,11 +4852,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "tele"), "Expected \"tele\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpTelephone", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone type is REG_DWORD */
sz = MAX_PATH;
@@ -4865,10 +4864,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -4876,11 +4875,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallLocation", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation type is REG_DWORD */
sz = MAX_PATH;
@@ -4888,10 +4887,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -4899,11 +4898,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallSource", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource type is REG_DWORD */
sz = MAX_PATH;
@@ -4911,10 +4910,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -4922,11 +4921,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallDate", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate type is REG_DWORD */
sz = MAX_PATH;
@@ -4934,10 +4933,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -4945,11 +4944,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PUBLISHERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "Publisher", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher type is REG_DWORD */
sz = MAX_PATH;
@@ -4957,10 +4956,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PUBLISHERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"pack", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -4968,11 +4967,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "pack"), "Expected \"pack\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage type is REG_DWORD */
sz = MAX_PATH;
@@ -4980,10 +4979,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "UrlInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UrlInfoAbout value exists */
sz = MAX_PATH;
@@ -4991,11 +4990,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "UrlInfoAbout", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UrlInfoAbout type is REG_DWORD */
sz = MAX_PATH;
@@ -5003,10 +5002,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "UrlUpdateInfo", 0, REG_SZ, (LPBYTE)"info", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UrlUpdateInfo value exists */
sz = MAX_PATH;
@@ -5014,11 +5013,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "info"), "Expected \"info\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "UrlUpdateInfo", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UrlUpdateInfo type is REG_DWORD */
sz = MAX_PATH;
@@ -5026,10 +5025,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"1", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -5037,11 +5036,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMinor", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor type is REG_DWORD */
sz = MAX_PATH;
@@ -5049,10 +5048,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"1", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -5060,11 +5059,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMajor", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor type is REG_DWORD */
sz = MAX_PATH;
@@ -5072,10 +5071,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -5083,11 +5082,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductID", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID type is REG_DWORD */
sz = MAX_PATH;
@@ -5095,10 +5094,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -5106,11 +5105,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegCompany", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany type is REG_DWORD */
sz = MAX_PATH;
@@ -5118,10 +5117,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegOwner", 0, REG_SZ, (LPBYTE)"own", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -5129,11 +5128,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGOWNERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "own"), "Expected \"own\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegOwner", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner type is REG_DWORD */
sz = MAX_PATH;
@@ -5141,10 +5140,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGOWNERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstanceType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstanceType value exists */
sz = MAX_PATH;
@@ -5152,11 +5151,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstanceType", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstanceType type is REG_DWORD */
sz = MAX_PATH;
@@ -5164,10 +5163,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstanceType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstanceType value exists */
sz = MAX_PATH;
@@ -5175,11 +5174,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "type"), "Expected \"type\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstanceType", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstanceType type is REG_DWORD */
sz = MAX_PATH;
@@ -5187,10 +5186,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "Transforms", 0, REG_SZ, (LPBYTE)"tforms", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -5198,11 +5197,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "Transforms", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms type is REG_DWORD */
sz = MAX_PATH;
@@ -5210,10 +5209,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Transforms", 0, REG_SZ, (LPBYTE)"tforms", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -5221,11 +5220,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "tforms"), "Expected \"tforms\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Transforms", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms type is REG_DWORD */
sz = MAX_PATH;
@@ -5233,10 +5232,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -5244,11 +5243,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "Language", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language type is REG_DWORD */
sz = MAX_PATH;
@@ -5256,10 +5255,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -5267,11 +5266,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Language", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language type is REG_DWORD */
sz = MAX_PATH;
@@ -5279,10 +5278,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -5290,11 +5289,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductName", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName type is REG_DWORD */
sz = MAX_PATH;
@@ -5302,10 +5301,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -5313,11 +5312,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductName", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName type is REG_DWORD */
sz = MAX_PATH;
@@ -5325,10 +5324,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "Assignment", 0, REG_SZ, (LPBYTE)"at", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Assignment value exists */
sz = MAX_PATH;
@@ -5336,11 +5335,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "Assignment", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Assignment type is REG_DWORD */
sz = MAX_PATH;
@@ -5348,10 +5347,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Assignment", 0, REG_SZ, (LPBYTE)"at", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Assignment value exists */
sz = MAX_PATH;
@@ -5359,11 +5358,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "at"), "Expected \"at\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Assignment", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Assignment type is REG_DWORD */
sz = MAX_PATH;
@@ -5371,10 +5370,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode value exists */
sz = MAX_PATH;
@@ -5382,11 +5381,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageCode", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode type is REG_DWORD */
sz = MAX_PATH;
@@ -5394,10 +5393,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode value exists */
sz = MAX_PATH;
@@ -5406,11 +5405,11 @@ static void test_MsiGetProductInfo(void)
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(buf, "code"), "Expected \"code\", got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageCode", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode type is REG_DWORD */
sz = MAX_PATH;
@@ -5418,10 +5417,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageCode", 0, REG_SZ, (LPBYTE)pack_squashed, 33);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode value exists */
sz = MAX_PATH;
@@ -5429,10 +5428,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, packcode), "Expected \"%s\", got \"%s\"\n", packcode, buf);
- ok(sz == 38, "Expected 38, got %d\n", sz);
+ ok(sz == 38, "Expected 38, got %lu\n", sz);
res = RegSetValueExA(propkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -5440,11 +5439,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "Version", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version type is REG_DWORD */
sz = MAX_PATH;
@@ -5452,10 +5451,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -5463,11 +5462,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Version", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version type is REG_DWORD */
sz = MAX_PATH;
@@ -5475,10 +5474,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"ico", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -5486,11 +5485,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductIcon", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon type is REG_DWORD */
sz = MAX_PATH;
@@ -5498,10 +5497,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"ico", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -5509,11 +5508,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "ico"), "Expected \"ico\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductIcon", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon type is REG_DWORD */
sz = MAX_PATH;
@@ -5521,7 +5520,7 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
/* SourceList key does not exist */
sz = MAX_PATH;
@@ -5531,10 +5530,10 @@ static void test_MsiGetProductInfo(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"),
"Expected buf to be unchanged, got \"%s\"\n", buf);
- ok(sz == MAX_PATH, "Expected sz to be unchanged, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected sz to be unchanged, got %lu\n", sz);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists, but PackageName val does not exist */
sz = MAX_PATH;
@@ -5542,10 +5541,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(source, "PackageName", 0, REG_SZ, (LPBYTE)"packname", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName val exists */
sz = MAX_PATH;
@@ -5553,11 +5552,11 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "packname"), "Expected \"packname\", got \"%s\"\n", buf);
- ok(sz == 8, "Expected 8, got %d\n", sz);
+ ok(sz == 8, "Expected 8, got %lu\n", sz);
res = RegSetValueExA(source, "PackageName", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName type is REG_DWORD */
sz = MAX_PATH;
@@ -5565,10 +5564,10 @@ static void test_MsiGetProductInfo(void)
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Authorized value exists */
sz = MAX_PATH;
@@ -5578,12 +5577,12 @@ static void test_MsiGetProductInfo(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
}
res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp type is REG_DWORD */
sz = MAX_PATH;
@@ -5593,11 +5592,11 @@ static void test_MsiGetProductInfo(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
}
res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Authorized value exists */
sz = MAX_PATH;
@@ -5607,12 +5606,12 @@ static void test_MsiGetProductInfo(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
}
res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp type is REG_DWORD */
sz = MAX_PATH;
@@ -5622,7 +5621,7 @@ static void test_MsiGetProductInfo(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
}
RegDeleteValueA(propkey, "HelpLink");
@@ -5708,7 +5707,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* empty szProductCode */
sz = MAX_PATH;
@@ -5718,7 +5717,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* garbage szProductCode */
sz = MAX_PATH;
@@ -5728,7 +5727,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* guid without brackets */
sz = MAX_PATH;
@@ -5739,7 +5738,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* guid with brackets */
sz = MAX_PATH;
@@ -5750,7 +5749,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* szValue is non-NULL while pcchValue is NULL */
lstrcpyA(buf, "apple");
@@ -5769,7 +5768,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* szProperty is NULL */
sz = MAX_PATH;
@@ -5780,7 +5779,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* szProperty is empty */
sz = MAX_PATH;
@@ -5791,7 +5790,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* szProperty is not a valid property */
sz = MAX_PATH;
@@ -5802,7 +5801,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* same length as guid, but random */
sz = MAX_PATH;
@@ -5813,7 +5812,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
/* MSIINSTALLCONTEXT_USERUNMANAGED */
@@ -5829,7 +5828,7 @@ static void test_MsiGetProductInfoEx(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user product key exists */
sz = MAX_PATH;
@@ -5840,10 +5839,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -5854,10 +5853,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -5867,7 +5866,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
RegDeleteValueA(propkey, "LocalPackage");
@@ -5880,10 +5879,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage exists, but HelpLink does not exist */
sz = MAX_PATH;
@@ -5893,10 +5892,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -5906,10 +5905,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"phone", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -5919,7 +5918,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "phone"), "Expected \"phone\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
/* szValue and pcchValue are NULL */
r = pMsiGetProductInfoExA(prodcode, usersid,
@@ -5935,7 +5934,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
ok(r == ERROR_MORE_DATA,
"Expected ERROR_MORE_DATA, got %d\n", r);
- ok(sz == 10, "Expected 10, got %d\n", sz);
+ ok(sz == 10, "Expected 10, got %lu\n", sz);
/* szValue is NULL, pcchValue is exactly 5 */
sz = 5;
@@ -5943,7 +5942,7 @@ static void test_MsiGetProductInfoEx(void)
MSIINSTALLCONTEXT_USERUNMANAGED,
INSTALLPROPERTY_HELPTELEPHONEA, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 10, "Expected 10, got %d\n", sz);
+ ok(sz == 10, "Expected 10, got %lu\n", sz);
/* szValue is NULL, pcchValue is MAX_PATH */
sz = MAX_PATH;
@@ -5951,7 +5950,7 @@ static void test_MsiGetProductInfoEx(void)
MSIINSTALLCONTEXT_USERUNMANAGED,
INSTALLPROPERTY_HELPTELEPHONEA, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(sz == 10, "Expected 10, got %d\n", sz);
+ ok(sz == 10, "Expected 10, got %lu\n", sz);
/* pcchValue is exactly 0 */
sz = 0;
@@ -5962,10 +5961,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_MORE_DATA,
"Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
- ok(sz == 10, "Expected 10, got %d\n", sz);
+ ok(sz == 10, "Expected 10, got %lu\n", sz);
res = RegSetValueExA(propkey, "notvalid", 0, REG_SZ, (LPBYTE)"invalid", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* szProperty is not a valid property */
sz = MAX_PATH;
@@ -5976,10 +5975,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -5989,10 +5988,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -6002,10 +6001,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -6015,10 +6014,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -6028,10 +6027,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -6041,10 +6040,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "local"), "Expected \"local\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -6054,10 +6053,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PUBLISHERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "URLInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLInfoAbout value exists */
sz = MAX_PATH;
@@ -6067,10 +6066,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "URLUpdateInfo", 0, REG_SZ, (LPBYTE)"update", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLUpdateInfo value exists */
sz = MAX_PATH;
@@ -6080,10 +6079,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "update"), "Expected \"update\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -6093,10 +6092,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "2"), "Expected \"2\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"3", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -6106,10 +6105,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "3"), "Expected \"3\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"3.2.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -6119,10 +6118,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "3.2.1"), "Expected \"3.2.1\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -6132,10 +6131,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -6145,10 +6144,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -6158,10 +6157,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_REGOWNERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "owner"), "Expected \"owner\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "Transforms", 0, REG_SZ, (LPBYTE)"trans", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -6172,10 +6171,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -6186,10 +6185,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -6200,10 +6199,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "AssignmentType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -6216,10 +6215,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode value exists */
sz = MAX_PATH;
@@ -6230,10 +6229,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -6244,10 +6243,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"icon", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -6258,10 +6257,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
sz = MAX_PATH;
@@ -6272,10 +6271,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp value exists */
sz = MAX_PATH;
@@ -6286,7 +6285,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
RegDeleteValueA(propkey, "AuthorizedLUAApp");
RegDeleteValueA(propkey, "PackageName");
@@ -6325,7 +6324,7 @@ static void test_MsiGetProductInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
sz = MAX_PATH;
@@ -6336,7 +6335,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
RegDeleteKeyA(userkey, "");
RegCloseKey(userkey);
@@ -6345,7 +6344,7 @@ static void test_MsiGetProductInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_CURRENT_USER, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
@@ -6361,10 +6360,10 @@ static void test_MsiGetProductInfoEx(void)
return;
}
ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(prodkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -6375,10 +6374,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"phone", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -6389,10 +6388,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -6403,10 +6402,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -6417,10 +6416,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -6431,10 +6430,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -6445,10 +6444,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -6459,10 +6458,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -6473,10 +6472,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "URLInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLInfoAbout value exists */
sz = MAX_PATH;
@@ -6487,10 +6486,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "URLUpdateInfo", 0, REG_SZ, (LPBYTE)"update", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLUpdateInfo value exists */
sz = MAX_PATH;
@@ -6501,10 +6500,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -6515,10 +6514,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"3", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -6529,10 +6528,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"3.2.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -6543,10 +6542,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -6557,10 +6556,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -6571,10 +6570,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -6585,10 +6584,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Transforms", 0, REG_SZ, (LPBYTE)"trans", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -6598,10 +6597,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "trans"), "Expected \"trans\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -6611,10 +6610,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -6624,10 +6623,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "AssignmentType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -6639,10 +6638,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -6657,11 +6656,11 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
}
res = RegSetValueExA(prodkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -6671,10 +6670,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"icon", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -6684,10 +6683,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "icon"), "Expected \"icon\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
sz = MAX_PATH;
@@ -6700,11 +6699,11 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
}
res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp value exists */
sz = MAX_PATH;
@@ -6714,7 +6713,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
RegDeleteValueA(prodkey, "AuthorizedLUAApp");
RegDeleteValueA(prodkey, "PackageName");
@@ -6753,7 +6752,7 @@ static void test_MsiGetProductInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local user product key exists */
sz = MAX_PATH;
@@ -6764,10 +6763,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -6778,10 +6777,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ManagedLocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ManagedLocalPackage value exists */
sz = MAX_PATH;
@@ -6791,10 +6790,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -6804,10 +6803,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"phone", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -6817,10 +6816,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "phone"), "Expected \"phone\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -6830,10 +6829,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -6843,10 +6842,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -6856,10 +6855,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -6869,10 +6868,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -6882,10 +6881,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "local"), "Expected \"local\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -6895,10 +6894,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PUBLISHERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "URLInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLInfoAbout value exists */
sz = MAX_PATH;
@@ -6908,10 +6907,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "URLUpdateInfo", 0, REG_SZ, (LPBYTE)"update", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLUpdateInfo value exists */
sz = MAX_PATH;
@@ -6921,10 +6920,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "update"), "Expected \"update\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -6934,10 +6933,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "2"), "Expected \"2\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"3", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -6947,10 +6946,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "3"), "Expected \"3\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"3.2.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -6960,10 +6959,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "3.2.1"), "Expected \"3.2.1\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -6973,10 +6972,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -6986,10 +6985,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -6999,10 +6998,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_REGOWNERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "owner"), "Expected \"owner\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "Transforms", 0, REG_SZ, (LPBYTE)"trans", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -7013,10 +7012,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -7027,10 +7026,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -7041,10 +7040,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "AssignmentType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -7057,10 +7056,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode value exists */
sz = MAX_PATH;
@@ -7071,10 +7070,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -7085,10 +7084,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"icon", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -7099,10 +7098,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
sz = MAX_PATH;
@@ -7113,10 +7112,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp value exists */
sz = MAX_PATH;
@@ -7127,7 +7126,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
RegDeleteValueA(propkey, "AuthorizedLUAApp");
RegDeleteValueA(propkey, "PackageName");
@@ -7166,7 +7165,7 @@ static void test_MsiGetProductInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
sz = MAX_PATH;
@@ -7176,7 +7175,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
delete_key(userkey, "", access & KEY_WOW64_64KEY);
RegCloseKey(userkey);
@@ -7185,7 +7184,7 @@ static void test_MsiGetProductInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* current user product key exists */
sz = MAX_PATH;
@@ -7196,10 +7195,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists, user product key does not exist */
sz = MAX_PATH;
@@ -7210,7 +7209,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, usersid);
@@ -7218,10 +7217,10 @@ static void test_MsiGetProductInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(userkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists, user product key does exist */
sz = MAX_PATH;
@@ -7232,10 +7231,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"phone", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -7246,10 +7245,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -7260,10 +7259,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -7274,10 +7273,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -7288,10 +7287,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -7302,10 +7301,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -7316,10 +7315,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -7330,10 +7329,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "URLInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLInfoAbout value exists */
sz = MAX_PATH;
@@ -7344,10 +7343,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "URLUpdateInfo", 0, REG_SZ, (LPBYTE)"update", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLUpdateInfo value exists */
sz = MAX_PATH;
@@ -7358,10 +7357,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -7372,10 +7371,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"3", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -7386,10 +7385,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"3.2.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -7400,10 +7399,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -7414,10 +7413,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -7428,10 +7427,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -7442,10 +7441,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(userkey, "Transforms", 0, REG_SZ, (LPBYTE)"trans", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -7455,10 +7454,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "trans"), "Expected \"trans\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(userkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -7468,10 +7467,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(userkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -7481,10 +7480,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(userkey, "AssignmentType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -7496,10 +7495,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(userkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -7514,11 +7513,11 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
}
res = RegSetValueExA(userkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -7528,10 +7527,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(userkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"icon", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -7541,10 +7540,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "icon"), "Expected \"icon\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(userkey, "PackageName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
sz = MAX_PATH;
@@ -7557,11 +7556,11 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
}
res = RegSetValueExA(userkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp value exists */
sz = MAX_PATH;
@@ -7571,7 +7570,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
RegDeleteValueA(userkey, "AuthorizedLUAApp");
RegDeleteValueA(userkey, "PackageName");
@@ -7614,13 +7613,13 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local system product key exists */
sz = MAX_PATH;
@@ -7631,10 +7630,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
sz = MAX_PATH;
@@ -7645,10 +7644,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -7658,10 +7657,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -7671,10 +7670,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPLINKA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"phone", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -7684,10 +7683,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "phone"), "Expected \"phone\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -7697,10 +7696,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -7710,10 +7709,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -7723,10 +7722,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -7736,10 +7735,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -7749,10 +7748,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "local"), "Expected \"local\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -7762,10 +7761,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PUBLISHERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(propkey, "URLInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLInfoAbout value exists */
sz = MAX_PATH;
@@ -7775,10 +7774,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "URLUpdateInfo", 0, REG_SZ, (LPBYTE)"update", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLUpdateInfo value exists */
sz = MAX_PATH;
@@ -7788,10 +7787,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "update"), "Expected \"update\", got \"%s\"\n", buf);
- ok(sz == 6, "Expected 6, got %d\n", sz);
+ ok(sz == 6, "Expected 6, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -7801,10 +7800,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "2"), "Expected \"2\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"3", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -7814,10 +7813,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "3"), "Expected \"3\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(propkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"3.2.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -7827,10 +7826,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "3.2.1"), "Expected \"3.2.1\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -7840,10 +7839,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -7853,10 +7852,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(propkey, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -7866,10 +7865,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_REGOWNERA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "owner"), "Expected \"owner\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(propkey, "Transforms", 0, REG_SZ, (LPBYTE)"trans", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -7880,10 +7879,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -7894,10 +7893,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -7908,10 +7907,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "AssignmentType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -7924,10 +7923,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageCode value exists */
sz = MAX_PATH;
@@ -7938,10 +7937,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -7952,10 +7951,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"icon", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -7966,10 +7965,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "PackageName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
sz = MAX_PATH;
@@ -7980,10 +7979,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp value exists */
sz = MAX_PATH;
@@ -7994,7 +7993,7 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
RegDeleteValueA(propkey, "AuthorizedLUAApp");
RegDeleteValueA(propkey, "PackageName");
@@ -8037,7 +8036,7 @@ static void test_MsiGetProductInfoEx(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local classes product key exists */
sz = MAX_PATH;
@@ -8047,10 +8046,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
res = RegSetValueExA(prodkey, "HelpLink", 0, REG_SZ, (LPBYTE)"link", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpLink value exists */
sz = MAX_PATH;
@@ -8061,10 +8060,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "HelpTelephone", 0, REG_SZ, (LPBYTE)"phone", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* HelpTelephone value exists */
sz = MAX_PATH;
@@ -8075,10 +8074,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstallDate", 0, REG_SZ, (LPBYTE)"date", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallDate value exists */
sz = MAX_PATH;
@@ -8089,10 +8088,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "DisplayName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
sz = MAX_PATH;
@@ -8103,10 +8102,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstallLocation", 0, REG_SZ, (LPBYTE)"loc", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallLocation value exists */
sz = MAX_PATH;
@@ -8117,10 +8116,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "InstallSource", 0, REG_SZ, (LPBYTE)"source", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallSource value exists */
sz = MAX_PATH;
@@ -8131,10 +8130,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "LocalPackage", 0, REG_SZ, (LPBYTE)"local", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
sz = MAX_PATH;
@@ -8145,10 +8144,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Publisher", 0, REG_SZ, (LPBYTE)"pub", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Publisher value exists */
sz = MAX_PATH;
@@ -8159,10 +8158,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "URLInfoAbout", 0, REG_SZ, (LPBYTE)"about", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLInfoAbout value exists */
sz = MAX_PATH;
@@ -8173,10 +8172,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "URLUpdateInfo", 0, REG_SZ, (LPBYTE)"update", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URLUpdateInfo value exists */
sz = MAX_PATH;
@@ -8187,10 +8186,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "VersionMinor", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMinor value exists */
sz = MAX_PATH;
@@ -8201,10 +8200,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "VersionMajor", 0, REG_SZ, (LPBYTE)"3", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* VersionMajor value exists */
sz = MAX_PATH;
@@ -8215,10 +8214,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "DisplayVersion", 0, REG_SZ, (LPBYTE)"3.2.1", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayVersion value exists */
sz = MAX_PATH;
@@ -8229,10 +8228,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductID", 0, REG_SZ, (LPBYTE)"id", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
sz = MAX_PATH;
@@ -8243,10 +8242,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "RegCompany", 0, REG_SZ, (LPBYTE)"comp", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
sz = MAX_PATH;
@@ -8257,10 +8256,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
sz = MAX_PATH;
@@ -8271,10 +8270,10 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Transforms", 0, REG_SZ, (LPBYTE)"trans", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Transforms value exists */
sz = MAX_PATH;
@@ -8284,10 +8283,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "trans"), "Expected \"trans\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
res = RegSetValueExA(prodkey, "Language", 0, REG_SZ, (LPBYTE)"lang", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Language value exists */
sz = MAX_PATH;
@@ -8297,10 +8296,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_LANGUAGEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductName value exists */
sz = MAX_PATH;
@@ -8310,10 +8309,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "AssignmentType", 0, REG_SZ, (LPBYTE)"type", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -8325,10 +8324,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageCode", 0, REG_SZ, (LPBYTE)"code", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* FIXME */
@@ -8343,11 +8342,11 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
}
res = RegSetValueExA(prodkey, "Version", 0, REG_SZ, (LPBYTE)"ver", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Version value exists */
sz = MAX_PATH;
@@ -8357,10 +8356,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_VERSIONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
- ok(sz == 3, "Expected 3, got %d\n", sz);
+ ok(sz == 3, "Expected 3, got %lu\n", sz);
res = RegSetValueExA(prodkey, "ProductIcon", 0, REG_SZ, (LPBYTE)"icon", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductIcon value exists */
sz = MAX_PATH;
@@ -8370,10 +8369,10 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "icon"), "Expected \"icon\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
res = RegSetValueExA(prodkey, "PackageName", 0, REG_SZ, (LPBYTE)"name", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
sz = MAX_PATH;
@@ -8386,11 +8385,11 @@ static void test_MsiGetProductInfoEx(void)
ok(r == ERROR_UNKNOWN_PRODUCT,
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
- ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);
+ ok(sz == MAX_PATH, "Expected MAX_PATH, got %lu\n", sz);
}
res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* AuthorizedLUAApp value exists */
sz = MAX_PATH;
@@ -8400,7 +8399,7 @@ static void test_MsiGetProductInfoEx(void)
INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ ok(sz == 4, "Expected 4, got %lu\n", sz);
RegDeleteValueA(prodkey, "AuthorizedLUAApp");
RegDeleteValueA(prodkey, "PackageName");
@@ -8467,9 +8466,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* empty szProductCode */
INIT_USERINFO();
@@ -8479,9 +8478,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* garbage szProductCode */
INIT_USERINFO();
@@ -8491,9 +8490,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* guid without brackets */
INIT_USERINFO();
@@ -8504,9 +8503,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* guid with brackets */
INIT_USERINFO();
@@ -8517,9 +8516,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* NULL lpUserNameBuf */
INIT_USERINFO();
@@ -8528,9 +8527,9 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_UNKNOWN, got %d\n", state);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* NULL pcchUserNameBuf */
INIT_USERINFO();
@@ -8540,8 +8539,8 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* both lpUserNameBuf and pcchUserNameBuf NULL */
INIT_USERINFO();
@@ -8550,8 +8549,8 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_UNKNOWN, got %d\n", state);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* NULL lpOrgNameBuf */
INIT_USERINFO();
@@ -8560,9 +8559,9 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_UNKNOWN, got %d\n", state);
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* NULL pcchOrgNameBuf */
INIT_USERINFO();
@@ -8572,8 +8571,8 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* both lpOrgNameBuf and pcchOrgNameBuf NULL */
INIT_USERINFO();
@@ -8582,8 +8581,8 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_UNKNOWN, got %d\n", state);
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* NULL lpSerialBuf */
INIT_USERINFO();
@@ -8592,9 +8591,9 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_UNKNOWN, got %d\n", state);
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* NULL pcchSerialBuf */
INIT_USERINFO();
@@ -8604,8 +8603,8 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
/* both lpSerialBuf and pcchSerialBuf NULL */
INIT_USERINFO();
@@ -8614,8 +8613,8 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_UNKNOWN, got %d\n", state);
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
/* MSIINSTALLCONTEXT_USERMANAGED */
@@ -8632,7 +8631,7 @@ static void test_MsiGetUserInfo(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product key exists */
INIT_USERINFO();
@@ -8642,9 +8641,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\");
@@ -8659,10 +8658,10 @@ static void test_MsiGetUserInfo(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyExA(userprod, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
INIT_USERINFO();
@@ -8672,9 +8671,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* RegOwner doesn't exist, lpUserNameBuf and pcchUserNameBuf are NULL */
INIT_USERINFO();
@@ -8683,8 +8682,8 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(org, ""), "Expected empty string, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(orgsz == 0, "Expected 0, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(orgsz == 0, "Expected 0, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
/* RegOwner, RegCompany don't exist, out params are NULL */
INIT_USERINFO();
@@ -8692,10 +8691,10 @@ static void test_MsiGetUserInfo(void)
ok(state == USERINFOSTATE_ABSENT,
"Expected USERINFOSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
INIT_USERINFO();
@@ -8705,12 +8704,12 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, ""), "Expected empty string, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 0, "Expected 0, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 0, "Expected 0, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "RegCompany", 0, REG_SZ, (LPBYTE)"company", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
INIT_USERINFO();
@@ -8720,12 +8719,12 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "ProductID", 0, REG_SZ, (LPBYTE)"ID", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
INIT_USERINFO();
@@ -8735,9 +8734,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "ID"), "Expected \"ID\", got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == 2, "Expected 2, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == 2, "Expected 2, got %lu\n", serialsz);
/* pcchUserNameBuf is too small */
INIT_USERINFO();
@@ -8748,9 +8747,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* pcchUserNameBuf has no room for NULL terminator */
INIT_USERINFO();
@@ -8764,9 +8763,9 @@ static void test_MsiGetUserInfo(void)
}
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* pcchUserNameBuf is too small, lpUserNameBuf is NULL */
INIT_USERINFO();
@@ -8777,9 +8776,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "ID"), "Expected \"ID\", got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == 2, "Expected 2, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == 2, "Expected 2, got %lu\n", serialsz);
RegDeleteValueA(props, "ProductID");
RegDeleteValueA(props, "RegCompany");
@@ -8798,7 +8797,7 @@ static void test_MsiGetUserInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product key exists */
INIT_USERINFO();
@@ -8808,9 +8807,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\");
@@ -8819,10 +8818,10 @@ static void test_MsiGetUserInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userprod, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyExA(userprod, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
INIT_USERINFO();
@@ -8832,9 +8831,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* RegOwner doesn't exist, lpUserNameBuf and pcchUserNameBuf are NULL */
INIT_USERINFO();
@@ -8843,8 +8842,8 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(org, ""), "Expected empty string, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(orgsz == 0, "Expected 0, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(orgsz == 0, "Expected 0, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
/* RegOwner, RegCompany don't exist, out params are NULL */
INIT_USERINFO();
@@ -8852,10 +8851,10 @@ static void test_MsiGetUserInfo(void)
ok(state == USERINFOSTATE_ABSENT,
"Expected USERINFOSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
INIT_USERINFO();
@@ -8865,12 +8864,12 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, ""), "Expected empty string, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 0, "Expected 0, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 0, "Expected 0, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "RegCompany", 0, REG_SZ, (LPBYTE)"company", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
INIT_USERINFO();
@@ -8880,12 +8879,12 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "ProductID", 0, REG_SZ, (LPBYTE)"ID", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
INIT_USERINFO();
@@ -8895,9 +8894,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "ID"), "Expected \"ID\", got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == 2, "Expected 2, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == 2, "Expected 2, got %lu\n", serialsz);
RegDeleteValueA(props, "ProductID");
RegDeleteValueA(props, "RegCompany");
@@ -8922,7 +8921,7 @@ static void test_MsiGetUserInfo(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* product key exists */
INIT_USERINFO();
@@ -8932,9 +8931,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH, "Expected MAX_PATH, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH, "Expected MAX_PATH, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18");
@@ -8942,10 +8941,10 @@ static void test_MsiGetUserInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userprod, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyExA(userprod, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
INIT_USERINFO();
@@ -8955,9 +8954,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "apple"), "Expected user to be unchanged, got \"%s\"\n", user);
ok(!lstrcmpA(org, "orange"), "Expected org to be unchanged, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", usersz);
- ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %d\n", orgsz);
- ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %d\n", serialsz);
+ ok(usersz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", usersz);
+ ok(orgsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", serialsz);
/* RegOwner doesn't exist, lpUserNameBuf and pcchUserNameBuf are NULL */
INIT_USERINFO();
@@ -8966,8 +8965,8 @@ static void test_MsiGetUserInfo(void)
"Expected USERINFOSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(org, ""), "Expected empty string, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(orgsz == 0, "Expected 0, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(orgsz == 0, "Expected 0, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
/* RegOwner, RegCompany don't exist, out params are NULL */
INIT_USERINFO();
@@ -8975,10 +8974,10 @@ static void test_MsiGetUserInfo(void)
ok(state == USERINFOSTATE_ABSENT,
"Expected USERINFOSTATE_ABSENT, got %d\n", state);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "RegOwner", 0, REG_SZ, (LPBYTE)"owner", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegOwner value exists */
INIT_USERINFO();
@@ -8988,12 +8987,12 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, ""), "Expected empty string, got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 0, "Expected 0, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 0, "Expected 0, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "RegCompany", 0, REG_SZ, (LPBYTE)"company", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* RegCompany value exists */
INIT_USERINFO();
@@ -9003,12 +9002,12 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "banana"), "Expected serial to be unchanged, got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == MAX_PATH - 1, "Expected MAX_PATH - 1, got %lu\n", serialsz);
res = RegSetValueExA(props, "ProductID", 0, REG_SZ, (LPBYTE)"ID", 3);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ProductID value exists */
INIT_USERINFO();
@@ -9018,9 +9017,9 @@ static void test_MsiGetUserInfo(void)
ok(!lstrcmpA(user, "owner"), "Expected \"owner\", got \"%s\"\n", user);
ok(!lstrcmpA(org, "company"), "Expected \"company\", got \"%s\"\n", org);
ok(!lstrcmpA(serial, "ID"), "Expected \"ID\", got \"%s\"\n", serial);
- ok(usersz == 5, "Expected 5, got %d\n", usersz);
- ok(orgsz == 7, "Expected 7, got %d\n", orgsz);
- ok(serialsz == 2, "Expected 2, got %d\n", serialsz);
+ ok(usersz == 5, "Expected 5, got %lu\n", usersz);
+ ok(orgsz == 7, "Expected 7, got %lu\n", orgsz);
+ ok(serialsz == 2, "Expected 2, got %lu\n", serialsz);
RegDeleteValueA(props, "ProductID");
RegDeleteValueA(props, "RegCompany");
@@ -9127,7 +9126,7 @@ static void test_MsiOpenProduct(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product key exists */
hprod = 0xdeadbeef;
@@ -9149,7 +9148,7 @@ static void test_MsiOpenProduct(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
hprod = 0xdeadbeef;
@@ -9159,7 +9158,7 @@ static void test_MsiOpenProduct(void)
ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
res = RegCreateKeyExA(userkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
hprod = 0xdeadbeef;
@@ -9172,7 +9171,7 @@ static void test_MsiOpenProduct(void)
lstrcatA(val, "\\winetest.msi");
res = RegSetValueExA(props, "ManagedLocalPackage", 0, REG_SZ,
(const BYTE *)val, lstrlenA(val) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ManagedLocalPackage value exists */
hprod = 0xdeadbeef;
@@ -9184,7 +9183,7 @@ static void test_MsiOpenProduct(void)
r = MsiGetPropertyA(hprod, "ProductCode", val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, prodcode), "Expected \"%s\", got \"%s\"\n", prodcode, val);
- ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ ok(size == lstrlenA(prodcode), "Expected %d, got %lu\n", lstrlenA(prodcode), size);
MsiCloseHandle(hprod);
@@ -9202,7 +9201,7 @@ static void test_MsiOpenProduct(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* unmanaged product key exists */
hprod = 0xdeadbeef;
@@ -9218,7 +9217,7 @@ static void test_MsiOpenProduct(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
hprod = 0xdeadbeef;
@@ -9228,7 +9227,7 @@ static void test_MsiOpenProduct(void)
ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
res = RegCreateKeyExA(userkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
hprod = 0xdeadbeef;
@@ -9241,7 +9240,7 @@ static void test_MsiOpenProduct(void)
lstrcatA(val, "\\winetest.msi");
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)val, lstrlenA(val) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
hprod = 0xdeadbeef;
@@ -9253,7 +9252,7 @@ static void test_MsiOpenProduct(void)
r = MsiGetPropertyA(hprod, "ProductCode", val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, prodcode), "Expected \"%s\", got \"%s\"\n", prodcode, val);
- ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ ok(size == lstrlenA(prodcode), "Expected %d, got %lu\n", lstrlenA(prodcode), size);
MsiCloseHandle(hprod);
@@ -9277,7 +9276,7 @@ static void test_MsiOpenProduct(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product key exists */
hprod = 0xdeadbeef;
@@ -9291,7 +9290,7 @@ static void test_MsiOpenProduct(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
hprod = 0xdeadbeef;
@@ -9301,7 +9300,7 @@ static void test_MsiOpenProduct(void)
ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
res = RegCreateKeyExA(userkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
hprod = 0xdeadbeef;
@@ -9314,7 +9313,7 @@ static void test_MsiOpenProduct(void)
lstrcatA(val, "\\winetest.msi");
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)val, lstrlenA(val) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage value exists */
hprod = 0xdeadbeef;
@@ -9326,19 +9325,19 @@ static void test_MsiOpenProduct(void)
r = MsiGetPropertyA(hprod, "ProductCode", val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, prodcode), "Expected \"%s\", got \"%s\"\n", prodcode, val);
- ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ ok(size == lstrlenA(prodcode), "Expected %d, got %lu\n", lstrlenA(prodcode), size);
MsiCloseHandle(hprod);
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)"winetest.msi", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(val, path);
lstrcatA(val, "\\winetest.msi");
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)val, lstrlenA(val) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
DeleteFileA(msifile);
@@ -9404,7 +9403,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, expectedsid);
@@ -9417,7 +9416,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
skip("Not enough rights to perform tests\n");
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product key exists */
lstrcpyA(patchcode, "apple");
@@ -9437,10 +9436,10 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patches key exists */
lstrcpyA(patchcode, "apple");
@@ -9460,12 +9459,12 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not REG_MULTI_SZ */
lstrcpyA(patchcode, "apple");
@@ -9486,11 +9485,11 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)"a\0b\0c\0\0", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not a squashed guid */
lstrcpyA(patchcode, "apple");
@@ -9511,13 +9510,13 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists */
lstrcpyA(patchcode, "apple");
@@ -9537,11 +9536,11 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
(const BYTE *)"whatever", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch squashed value exists */
lstrcpyA(patchcode, "apple");
@@ -9562,7 +9561,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* increase the index */
lstrcpyA(patchcode, "apple");
@@ -9582,7 +9581,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* increase again */
lstrcpyA(patchcode, "apple");
@@ -9603,7 +9602,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szPatchCode is NULL */
lstrcpyA(targetprod, "banana");
@@ -9621,7 +9620,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* szTargetProductCode is NULL */
lstrcpyA(patchcode, "apple");
@@ -9639,7 +9638,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* pdwTargetProductContext is NULL */
lstrcpyA(patchcode, "apple");
@@ -9657,7 +9656,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* szTargetUserSid is NULL */
lstrcpyA(patchcode, "apple");
@@ -9675,7 +9674,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(context == MSIINSTALLCONTEXT_USERMANAGED,
"Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
ok(size == lstrlenA(expectedsid) * sizeof(WCHAR),
- "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d*sizeof(WCHAR), got %lu\n", lstrlenA(expectedsid), size);
/* pcchTargetUserSid is exactly the length of szTargetUserSid */
lstrcpyA(patchcode, "apple");
@@ -9696,7 +9695,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!strncmp(targetsid, expectedsid, lstrlenA(expectedsid) - 1),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid) * sizeof(WCHAR),
- "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d*sizeof(WCHAR), got %lu\n", lstrlenA(expectedsid), size);
/* pcchTargetUserSid has enough room for NULL terminator */
lstrcpyA(patchcode, "apple");
@@ -9717,7 +9716,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* both szTargetuserSid and pcchTargetUserSid are NULL */
lstrcpyA(patchcode, "apple");
@@ -9753,7 +9752,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, expectedsid);
@@ -9766,7 +9765,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
skip("Not enough rights to perform tests\n");
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData product key exists */
lstrcpyA(patchcode, "apple");
@@ -9786,10 +9785,10 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData patches key exists */
lstrcpyA(patchcode, "apple");
@@ -9809,10 +9808,10 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udpatch, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* specific UserData patch key exists */
lstrcpyA(patchcode, "apple");
@@ -9833,12 +9832,12 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_SUPERSEDED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value exists */
lstrcpyA(patchcode, "apple");
@@ -9859,7 +9858,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* MSIPATCHSTATE_OBSOLETED */
@@ -9880,12 +9879,12 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_OBSOLETED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value is obsoleted */
lstrcpyA(patchcode, "apple");
@@ -9906,7 +9905,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* MSIPATCHSTATE_REGISTERED */
/* FIXME */
@@ -9932,7 +9931,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* same patch in multiple places, only one is enumerated */
lstrcpyA(patchcode, "apple");
@@ -9952,7 +9951,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
RegDeleteValueA(hpatch, "State");
delete_key(hpatch, "", access & KEY_WOW64_64KEY);
@@ -10007,13 +10006,13 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* current user product key exists */
lstrcpyA(patchcode, "apple");
@@ -10033,10 +10032,10 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyA(prodkey, "Patches", &patches);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
lstrcpyA(patchcode, "apple");
@@ -10056,12 +10055,12 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not REG_MULTI_SZ */
lstrcpyA(patchcode, "apple");
@@ -10082,11 +10081,11 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)"a\0b\0c\0\0", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not a squashed guid */
lstrcpyA(patchcode, "apple");
@@ -10107,13 +10106,13 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
patch_squashed[lstrlenA(patch_squashed) + 1] = 0;
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists */
lstrcpyA(patchcode, "apple");
@@ -10135,11 +10134,11 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
(const BYTE *)"whatever", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch code value exists */
lstrcpyA(patchcode, "apple");
@@ -10161,7 +10160,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, expectedsid);
@@ -10174,7 +10173,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
skip("Not enough rights to perform tests\n");
goto error;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* userdata patch key exists */
lstrcpyA(patchcode, "apple");
@@ -10195,7 +10194,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* MSIPATCHSTATE_SUPERSEDED */
@@ -10216,7 +10215,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, expectedsid);
@@ -10229,7 +10228,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
skip("Not enough rights to perform tests\n");
goto error;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData product key exists */
lstrcpyA(patchcode, "apple");
@@ -10249,10 +10248,10 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData patches key exists */
lstrcpyA(patchcode, "apple");
@@ -10272,10 +10271,10 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udpatch, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* specific UserData patch key exists */
lstrcpyA(patchcode, "apple");
@@ -10296,12 +10295,12 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_SUPERSEDED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value exists */
lstrcpyA(patchcode, "apple");
@@ -10322,7 +10321,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* MSIPATCHSTATE_OBSOLETED */
@@ -10343,12 +10342,12 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_OBSOLETED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value is obsoleted */
lstrcpyA(patchcode, "apple");
@@ -10369,7 +10368,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* MSIPATCHSTATE_REGISTERED */
/* FIXME */
@@ -10395,7 +10394,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
ok(!lstrcmpA(targetsid, expectedsid),
"Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
ok(size == lstrlenA(expectedsid),
- "Expected %d, got %d\n", lstrlenA(expectedsid), size);
+ "Expected %d, got %lu\n", lstrlenA(expectedsid), size);
/* same patch in multiple places, only one is enumerated */
lstrcpyA(patchcode, "apple");
@@ -10415,7 +10414,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
RegDeleteValueA(hpatch, "State");
delete_key(hpatch, "", access & KEY_WOW64_64KEY);
@@ -10475,7 +10474,7 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
@@ -10486,7 +10485,7 @@ static void test_MsiEnumPatchesEx_machine(void)
skip("Not enough rights to perform tests\n");
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local product key exists */
lstrcpyA(patchcode, "apple");
@@ -10506,10 +10505,10 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
lstrcpyA(patchcode, "apple");
@@ -10529,12 +10528,12 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not REG_MULTI_SZ */
lstrcpyA(patchcode, "apple");
@@ -10555,11 +10554,11 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)"a\0b\0c\0\0", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not a squashed guid */
lstrcpyA(patchcode, "apple");
@@ -10580,13 +10579,13 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists */
lstrcpyA(patchcode, "apple");
@@ -10606,11 +10605,11 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
(const BYTE *)"whatever", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch code value exists */
lstrcpyA(patchcode, "apple");
@@ -10629,7 +10628,7 @@ static void test_MsiEnumPatchesEx_machine(void)
ok(context == MSIINSTALLCONTEXT_MACHINE,
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
@@ -10641,7 +10640,7 @@ static void test_MsiEnumPatchesEx_machine(void)
skip("Not enough rights to perform tests\n");
goto done;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData product key exists */
lstrcpyA(patchcode, "apple");
@@ -10661,10 +10660,10 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""),
"Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData Patches key exists */
lstrcpyA(patchcode, "apple");
@@ -10684,10 +10683,10 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""),
"Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
res = RegCreateKeyExA(udpatch, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData Product patch key exists */
lstrcpyA(patchcode, "apple");
@@ -10707,12 +10706,12 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_APPLIED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value exists */
lstrcpyA(patchcode, "apple");
@@ -10732,7 +10731,7 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""),
"Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* MSIPATCHSTATE_SUPERSEDED */
@@ -10753,12 +10752,12 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_SUPERSEDED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value is MSIPATCHSTATE_SUPERSEDED */
lstrcpyA(patchcode, "apple");
@@ -10777,7 +10776,7 @@ static void test_MsiEnumPatchesEx_machine(void)
ok(context == MSIINSTALLCONTEXT_MACHINE,
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* MSIPATCHSTATE_OBSOLETED */
@@ -10798,12 +10797,12 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_OBSOLETED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value is obsoleted */
lstrcpyA(patchcode, "apple");
@@ -10822,7 +10821,7 @@ static void test_MsiEnumPatchesEx_machine(void)
ok(context == MSIINSTALLCONTEXT_MACHINE,
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* MSIPATCHSTATE_REGISTERED */
/* FIXME */
@@ -10846,7 +10845,7 @@ static void test_MsiEnumPatchesEx_machine(void)
ok(context == MSIINSTALLCONTEXT_MACHINE,
"Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* same patch in multiple places, only one is enumerated */
lstrcpyA(patchcode, "apple");
@@ -10866,7 +10865,7 @@ static void test_MsiEnumPatchesEx_machine(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
delete_key(hpatch, "", access & KEY_WOW64_64KEY);
RegDeleteValueA(hpatch, "State");
@@ -10923,7 +10922,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* garbage szProductCode */
lstrcpyA(patchcode, "apple");
@@ -10944,7 +10943,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid without brackets */
lstrcpyA(patchcode, "apple");
@@ -10966,7 +10965,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid with brackets */
lstrcpyA(patchcode, "apple");
@@ -10988,7 +10987,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szUserSid is S-1-5-18 */
lstrcpyA(patchcode, "apple");
@@ -11010,7 +11009,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwContext is MSIINSTALLCONTEXT_MACHINE, but szUserSid is non-NULL */
lstrcpyA(patchcode, "apple");
@@ -11031,7 +11030,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwContext is out of bounds */
lstrcpyA(patchcode, "apple");
@@ -11052,7 +11051,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwContext is out of bounds */
lstrcpyA(patchcode, "apple");
@@ -11073,7 +11072,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwFilter is out of bounds */
lstrcpyA(patchcode, "apple");
@@ -11094,7 +11093,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwFilter is out of bounds */
lstrcpyA(patchcode, "apple");
@@ -11115,7 +11114,7 @@ static void test_MsiEnumPatchesEx(void)
"Expected context to be unchanged, got %d\n", context);
ok(!lstrcmpA(targetsid, "kiwi"),
"Expected targetsid to be unchanged, got %s\n", targetsid);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* pcchTargetUserSid is NULL while szTargetUserSid is non-NULL */
lstrcpyA(patchcode, "apple");
@@ -11179,7 +11178,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* empty szProduct */
size = MAX_PATH;
@@ -11192,7 +11191,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* garbage szProduct */
size = MAX_PATH;
@@ -11205,7 +11204,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid without brackets */
size = MAX_PATH;
@@ -11219,7 +11218,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid with brackets */
size = MAX_PATH;
@@ -11233,7 +11232,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* same length as guid, but random */
size = MAX_PATH;
@@ -11247,7 +11246,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* MSIINSTALLCONTEXT_USERMANAGED */
@@ -11261,7 +11260,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, usersid);
@@ -11275,7 +11274,7 @@ static void test_MsiEnumPatches(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product key exists */
size = MAX_PATH;
@@ -11287,10 +11286,10 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patches key exists */
size = MAX_PATH;
@@ -11304,12 +11303,12 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not REG_MULTI_SZ */
size = MAX_PATH;
@@ -11323,11 +11322,11 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)"a\0b\0c\0\0", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not a squashed guid */
size = MAX_PATH;
@@ -11340,13 +11339,13 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists */
size = MAX_PATH;
@@ -11361,11 +11360,11 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
(const BYTE *)"whatever", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch squashed value exists */
size = MAX_PATH;
@@ -11377,7 +11376,7 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
/* lpPatchBuf is NULL */
size = MAX_PATH;
@@ -11387,7 +11386,7 @@ static void test_MsiEnumPatches(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* lpTransformsBuf is NULL, pcchTransformsBuf is not */
size = MAX_PATH;
@@ -11397,7 +11396,7 @@ static void test_MsiEnumPatches(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(patch, "apple"),
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* pcchTransformsBuf is NULL, lpTransformsBuf is not */
lstrcpyA(patch, "apple");
@@ -11421,7 +11420,7 @@ static void test_MsiEnumPatches(void)
ok(!lstrcmpA(transforms, "whate") ||
broken(!lstrcmpA(transforms, "banana")), /* Windows Installer < 3.0 */
"Expected \"whate\", got \"%s\"\n", transforms);
- ok(size == 8 || size == 16, "Expected 8 or 16, got %d\n", size);
+ ok(size == 8 || size == 16, "Expected 8 or 16, got %lu\n", size);
/* increase the index */
size = MAX_PATH;
@@ -11433,7 +11432,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* increase again */
size = MAX_PATH;
@@ -11445,7 +11444,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
RegDeleteValueA(patches, "Patches");
delete_key(patches, "", access & KEY_WOW64_64KEY);
@@ -11465,13 +11464,13 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* current user product key exists */
size = MAX_PATH;
@@ -11483,10 +11482,10 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyA(prodkey, "Patches", &patches);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -11500,12 +11499,12 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not REG_MULTI_SZ */
size = MAX_PATH;
@@ -11519,11 +11518,11 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)"a\0b\0c\0\0", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not a squashed guid */
size = MAX_PATH;
@@ -11536,13 +11535,13 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists */
size = MAX_PATH;
@@ -11557,11 +11556,11 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
(const BYTE *)"whatever", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch code value exists */
size = MAX_PATH;
@@ -11577,7 +11576,7 @@ static void test_MsiEnumPatches(void)
ok(!lstrcmpA(transforms, "banana") ||
broken(!lstrcmpA(transforms, "whatever")), /* Windows Installer < 3.0 */
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -11585,7 +11584,7 @@ static void test_MsiEnumPatches(void)
lstrcatA(keypath, patch_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* userdata patch key exists */
size = MAX_PATH;
@@ -11597,7 +11596,7 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
delete_key(userkey, "", access & KEY_WOW64_64KEY);
RegCloseKey(userkey);
@@ -11620,7 +11619,7 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
@@ -11632,7 +11631,7 @@ static void test_MsiEnumPatches(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local product key exists */
size = MAX_PATH;
@@ -11644,10 +11643,10 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -11661,12 +11660,12 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not REG_MULTI_SZ */
size = MAX_PATH;
@@ -11680,11 +11679,11 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)"a\0b\0c\0\0", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists, is not a squashed guid */
size = MAX_PATH;
@@ -11697,13 +11696,13 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
(const BYTE *)patch_squashed,
lstrlenA(patch_squashed) + 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches value exists */
size = MAX_PATH;
@@ -11718,11 +11717,11 @@ static void test_MsiEnumPatches(void)
"Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch);
ok(!lstrcmpA(transforms, "banana"),
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
(const BYTE *)"whatever", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch code value exists */
size = MAX_PATH;
@@ -11734,14 +11733,14 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udprod, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData product key exists */
size = MAX_PATH;
@@ -11753,10 +11752,10 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData Patches key exists */
size = MAX_PATH;
@@ -11768,10 +11767,10 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(udpatch, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData Product patch key exists */
size = MAX_PATH;
@@ -11787,12 +11786,12 @@ static void test_MsiEnumPatches(void)
ok(!lstrcmpA(transforms, "banana") ||
broken(!lstrcmpA(transforms, "whatever")), /* Windows Installer < 3.0 */
"Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
data = MSIPATCHSTATE_APPLIED;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&data, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value exists */
size = MAX_PATH;
@@ -11804,7 +11803,7 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
/* now duplicate some of the tests for the W version */
@@ -11822,7 +11821,7 @@ static void test_MsiEnumPatches(void)
ok(!lstrcmpA(transforms, "whate") ||
broken(!lstrcmpA(transforms, "banana")), /* Windows Installer < 3.0 */
"Expected \"whate\", got \"%s\"\n", transforms);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
/* patch code value exists */
size = MAX_PATH;
@@ -11836,7 +11835,7 @@ static void test_MsiEnumPatches(void)
"Expected \"%s\", got \"%s\"\n", patchcode, patch);
ok(!lstrcmpA(transforms, "whatever"),
"Expected \"whatever\", got \"%s\"\n", transforms);
- ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+ ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %lu\n", size);
RegDeleteValueA(patches, patch_squashed);
RegDeleteValueA(patches, "Patches");
@@ -11889,7 +11888,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* empty szPatchCode */
size = MAX_PATH;
@@ -11900,7 +11899,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* garbage szPatchCode */
size = MAX_PATH;
@@ -11912,7 +11911,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid without brackets */
size = MAX_PATH;
@@ -11924,7 +11923,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid with brackets */
size = MAX_PATH;
@@ -11936,7 +11935,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* same length as guid, but random */
size = MAX_PATH;
@@ -11948,7 +11947,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* NULL szProductCode */
lstrcpyA(val, "apple");
@@ -11959,7 +11958,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* empty szProductCode */
size = MAX_PATH;
@@ -11970,7 +11969,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* garbage szProductCode */
size = MAX_PATH;
@@ -11982,7 +11981,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid without brackets */
size = MAX_PATH;
@@ -11994,7 +11993,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* guid with brackets */
size = MAX_PATH;
@@ -12006,7 +12005,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* same length as guid, but random */
size = MAX_PATH;
@@ -12018,7 +12017,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szUserSid cannot be S-1-5-18 for MSIINSTALLCONTEXT_USERMANAGED */
size = MAX_PATH;
@@ -12030,7 +12029,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szUserSid cannot be S-1-5-18 for MSIINSTALLCONTEXT_USERUNMANAGED */
size = MAX_PATH;
@@ -12042,7 +12041,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szUserSid cannot be S-1-5-18 for MSIINSTALLCONTEXT_MACHINE */
size = MAX_PATH;
@@ -12054,7 +12053,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szUserSid must be NULL for MSIINSTALLCONTEXT_MACHINE */
size = MAX_PATH;
@@ -12066,7 +12065,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwContext is out of range */
size = MAX_PATH;
@@ -12078,7 +12077,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwContext is out of range */
size = MAX_PATH;
@@ -12090,7 +12089,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* dwContext is invalid */
size = MAX_PATH;
@@ -12101,7 +12100,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* MSIINSTALLCONTEXT_USERMANAGED */
@@ -12114,7 +12113,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -12128,7 +12127,7 @@ static void test_MsiGetPatchInfoEx(void)
LocalFree(usersid);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData product key exists */
size = MAX_PATH;
@@ -12140,10 +12139,10 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
size = MAX_PATH;
@@ -12154,10 +12153,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12168,10 +12167,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCHA, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(patches, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12182,7 +12181,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, usersid);
@@ -12190,7 +12189,7 @@ static void test_MsiGetPatchInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* managed product key exists */
size = MAX_PATH;
@@ -12201,10 +12200,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "Patches", 0, NULL, 0, access, NULL, &prodpatches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12215,11 +12214,11 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(prodpatches, patch_squashed, 0, REG_SZ,
(const BYTE *)"transforms", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* specific patch value exists */
size = MAX_PATH;
@@ -12230,7 +12229,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -12238,7 +12237,7 @@ static void test_MsiGetPatchInfoEx(void)
lstrcatA(keypath, patch_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData Patches key exists */
size = MAX_PATH;
@@ -12248,11 +12247,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
res = RegSetValueExA(udpatch, "ManagedLocalPackage", 0, REG_SZ,
(const BYTE *)"pack", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* ManagedLocalPatch value exists */
size = MAX_PATH;
@@ -12262,7 +12261,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(val, "apple");
@@ -12271,11 +12270,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "transforms"), "Expected \"transforms\", got \"%s\"\n", val);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
res = RegSetValueExA(hpatch, "Installed", 0, REG_SZ,
(const BYTE *)"mydate", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Installed value exists */
size = MAX_PATH;
@@ -12285,11 +12284,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_INSTALLDATEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "mydate"), "Expected \"mydate\", got \"%s\"\n", val);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
res = RegSetValueExA(hpatch, "Uninstallable", 0, REG_SZ,
(const BYTE *)"yes", 4);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Uninstallable value exists */
size = MAX_PATH;
@@ -12299,11 +12298,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_UNINSTALLABLEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "yes"), "Expected \"yes\", got \"%s\"\n", val);
- ok(size == 3, "Expected 3, got %d\n", size);
+ ok(size == 3, "Expected 3, got %lu\n", size);
res = RegSetValueExA(hpatch, "State", 0, REG_SZ,
(const BYTE *)"good", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value exists */
size = MAX_PATH;
@@ -12313,12 +12312,12 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_PATCHSTATEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "good"), "Expected \"good\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
size = 1;
res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
(const BYTE *)&size, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* State value exists */
size = MAX_PATH;
@@ -12328,12 +12327,12 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_PATCHSTATEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
size = 1;
res = RegSetValueExA(hpatch, "Uninstallable", 0, REG_DWORD,
(const BYTE *)&size, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Uninstallable value exists */
size = MAX_PATH;
@@ -12343,11 +12342,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_UNINSTALLABLEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
res = RegSetValueExA(hpatch, "DisplayName", 0, REG_SZ,
(const BYTE *)"display", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* DisplayName value exists */
size = MAX_PATH;
@@ -12357,11 +12356,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_DISPLAYNAMEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "display"), "Expected \"display\", got \"%s\"\n", val);
- ok(size == 7, "Expected 7, got %d\n", size);
+ ok(size == 7, "Expected 7, got %lu\n", size);
res = RegSetValueExA(hpatch, "MoreInfoURL", 0, REG_SZ,
(const BYTE *)"moreinfo", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* MoreInfoURL value exists */
size = MAX_PATH;
@@ -12371,7 +12370,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_MOREINFOURLA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "moreinfo"), "Expected \"moreinfo\", got \"%s\"\n", val);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
/* szProperty is invalid */
size = MAX_PATH;
@@ -12382,7 +12381,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PROPERTY,
"Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* lpValue is NULL, while pcchValue is non-NULL */
size = MAX_PATH;
@@ -12390,7 +12389,7 @@ static void test_MsiGetPatchInfoEx(void)
MSIINSTALLCONTEXT_USERMANAGED,
INSTALLPROPERTY_MOREINFOURLA, NULL, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(size == 16, "Expected 16, got %d\n", size);
+ ok(size == 16, "Expected 16, got %lu\n", size);
/* pcchValue is NULL, while lpValue is non-NULL */
lstrcpyA(val, "apple");
@@ -12416,7 +12415,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(val, "moreinf"),
"Expected \"moreinf\", got \"%s\"\n", val);
- ok(size == 16, "Expected 16, got %d\n", size);
+ ok(size == 16, "Expected 16, got %lu\n", size);
/* pcchValue has exactly enough room for NULL terminator */
size = 9;
@@ -12427,7 +12426,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "moreinfo"),
"Expected \"moreinfo\", got \"%s\"\n", val);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
/* pcchValue is too small, lpValue is NULL */
size = 0;
@@ -12435,7 +12434,7 @@ static void test_MsiGetPatchInfoEx(void)
MSIINSTALLCONTEXT_USERMANAGED,
INSTALLPROPERTY_MOREINFOURLA, NULL, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(size == 16, "Expected 16, got %d\n", size);
+ ok(size == 16, "Expected 16, got %lu\n", size);
RegDeleteValueA(prodpatches, patch_squashed);
delete_key(prodpatches, "", access & KEY_WOW64_64KEY);
@@ -12453,7 +12452,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
/* UserData is sufficient for all properties
* except INSTALLPROPERTY_TRANSFORMS
@@ -12465,7 +12464,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, val, &size);
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
RegDeleteValueA(hpatch, "MoreInfoURL");
RegDeleteValueA(hpatch, "Display");
@@ -12495,7 +12494,7 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -12503,7 +12502,7 @@ static void test_MsiGetPatchInfoEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udprod, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData product key exists */
size = MAX_PATH;
@@ -12515,10 +12514,10 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
size = MAX_PATH;
@@ -12529,10 +12528,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12543,10 +12542,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(patches, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12557,13 +12556,13 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* current user product key exists */
size = MAX_PATH;
@@ -12574,10 +12573,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyA(prodkey, "Patches", &prodpatches);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12588,11 +12587,11 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(prodpatches, patch_squashed, 0, REG_SZ,
(const BYTE *)"transforms", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* specific patch value exists */
size = MAX_PATH;
@@ -12603,7 +12602,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
lstrcatA(keypath, usersid);
@@ -12611,7 +12610,7 @@ static void test_MsiGetPatchInfoEx(void)
lstrcatA(keypath, patch_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData Patches key exists */
size = MAX_PATH;
@@ -12621,11 +12620,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
res = RegSetValueExA(udpatch, "LocalPackage", 0, REG_SZ,
(const BYTE *)"pack", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPatch value exists */
size = MAX_PATH;
@@ -12635,7 +12634,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(val, "apple");
@@ -12644,7 +12643,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "transforms"), "Expected \"transforms\", got \"%s\"\n", val);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(prodpatches, patch_squashed);
delete_key(prodpatches, "", access & KEY_WOW64_64KEY);
@@ -12662,7 +12661,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
/* UserData is sufficient for all properties
* except INSTALLPROPERTY_TRANSFORMS
@@ -12674,7 +12673,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, val, &size);
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
RegDeleteValueA(udpatch, "LocalPackage");
delete_key(udpatch, "", access & KEY_WOW64_64KEY);
@@ -12699,14 +12698,14 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer");
lstrcatA(keypath, "\\UserData\\S-1-5-18\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udprod, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local UserData product key exists */
size = MAX_PATH;
@@ -12718,10 +12717,10 @@ static void test_MsiGetPatchInfoEx(void)
"Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* InstallProperties key exists */
size = MAX_PATH;
@@ -12732,10 +12731,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(udprod, "Patches", 0, NULL, 0, access, NULL, &patches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12746,10 +12745,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(patches, patch_squashed, 0, NULL, 0, access, NULL, &hpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12760,7 +12759,7 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
@@ -12772,7 +12771,7 @@ static void test_MsiGetPatchInfoEx(void)
LocalFree( usersid );
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* local product key exists */
size = MAX_PATH;
@@ -12783,10 +12782,10 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "Patches", 0, NULL, 0, access, NULL, &prodpatches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Patches key exists */
size = MAX_PATH;
@@ -12797,11 +12796,11 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
res = RegSetValueExA(prodpatches, patch_squashed, 0, REG_SZ,
(const BYTE *)"transforms", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* specific patch value exists */
size = MAX_PATH;
@@ -12812,14 +12811,14 @@ static void test_MsiGetPatchInfoEx(void)
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer");
lstrcatA(keypath, "\\UserData\\S-1-5-18\\Patches\\");
lstrcatA(keypath, patch_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData Patches key exists */
size = MAX_PATH;
@@ -12829,11 +12828,11 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
res = RegSetValueExA(udpatch, "LocalPackage", 0, REG_SZ,
(const BYTE *)"pack", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPatch value exists */
size = MAX_PATH;
@@ -12843,7 +12842,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(val, "apple");
@@ -12852,7 +12851,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "transforms"), "Expected \"transforms\", got \"%s\"\n", val);
- ok(size == 10, "Expected 10, got %d\n", size);
+ ok(size == 10, "Expected 10, got %lu\n", size);
RegDeleteValueA(prodpatches, patch_squashed);
delete_key(prodpatches, "", access & KEY_WOW64_64KEY);
@@ -12870,7 +12869,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
/* UserData is sufficient for all properties
* except INSTALLPROPERTY_TRANSFORMS
@@ -12882,7 +12881,7 @@ static void test_MsiGetPatchInfoEx(void)
INSTALLPROPERTY_TRANSFORMSA, val, &size);
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
RegDeleteValueA(udpatch, "LocalPackage");
delete_key(udpatch, "", access & KEY_WOW64_64KEY);
@@ -12942,7 +12941,7 @@ static void test_MsiGetPatchInfo(void)
skip("Not enough rights to perform tests\n");
return;
}
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
/* product key exists */
size = MAX_PATH;
@@ -12950,10 +12949,10 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
res = RegCreateKeyExA(hkey_product, "Patches", 0, NULL, 0, access, NULL, &hkey_patches, NULL);
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
/* patches key exists */
size = MAX_PATH;
@@ -12961,10 +12960,10 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
res = RegCreateKeyExA(hkey_patches, patch_squashed, 0, NULL, 0, access, NULL, &hkey_patch, NULL);
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
/* patch key exists */
size = MAX_PATH;
@@ -12972,7 +12971,7 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer");
lstrcatA(keypath, "\\UserData\\S-1-5-18\\Products\\");
@@ -12984,7 +12983,7 @@ static void test_MsiGetPatchInfo(void)
skip("Not enough rights to perform tests\n");
goto done;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %ld\n", res);
/* UserData product key exists */
size = MAX_PATH;
@@ -12992,10 +12991,10 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
res = RegCreateKeyExA(hkey_udproduct, "InstallProperties", 0, NULL, 0, access, NULL, &hkey_udprops, NULL);
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
/* InstallProperties key exists */
size = MAX_PATH;
@@ -13003,10 +13002,10 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
res = RegCreateKeyExA(hkey_udproduct, "Patches", 0, NULL, 0, access, NULL, &hkey_udpatches, NULL);
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
/* UserData Patches key exists */
size = MAX_PATH;
@@ -13014,13 +13013,13 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
res = RegCreateKeyExA(hkey_udproduct, "Patches", 0, NULL, 0, access, NULL, &hkey_udproductpatches, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyExA(hkey_udproductpatches, patch_squashed, 0, NULL, 0, access, NULL, &hkey_udproductpatch, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* UserData product patch key exists */
size = MAX_PATH;
@@ -13028,17 +13027,17 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected val to be unchanged got \"%s\"\n", val);
- ok(size == MAX_PATH, "expected size to be unchanged got %u\n", size);
+ ok(size == MAX_PATH, "expected size to be unchanged got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer");
lstrcatA(keypath, "\\UserData\\S-1-5-18\\Patches\\");
lstrcatA(keypath, patch_squashed);
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey_udpatch, NULL);
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
res = RegSetValueExA(hkey_udpatch, "LocalPackage", 0, REG_SZ, (const BYTE *)"c:\\test.msp", 12);
- ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+ ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %ld\n", res);
/* UserData Patch key exists */
size = 0;
@@ -13046,28 +13045,28 @@ static void test_MsiGetPatchInfo(void)
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", r);
ok(!lstrcmpA(val, "apple"), "expected \"apple\", got \"%s\"\n", val);
- ok(size == 11, "expected 11 got %u\n", size);
+ ok(size == 11, "expected 11 got %lu\n", size);
size = MAX_PATH;
lstrcpyA(val, "apple");
r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS got %u\n", r);
ok(!lstrcmpA(val, "c:\\test.msp"), "expected \"c:\\test.msp\", got \"%s\"\n", val);
- ok(size == 11, "expected 11 got %u\n", size);
+ ok(size == 11, "expected 11 got %lu\n", size);
size = 0;
valW[0] = 0;
r = MsiGetPatchInfoW(patch_codeW, INSTALLPROPERTY_LOCALPACKAGEW, valW, &size);
ok(r == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", r);
ok(!valW[0], "expected 0 got %u\n", valW[0]);
- ok(size == 11, "expected 11 got %u\n", size);
+ ok(size == 11, "expected 11 got %lu\n", size);
size = MAX_PATH;
valW[0] = 0;
r = MsiGetPatchInfoW(patch_codeW, INSTALLPROPERTY_LOCALPACKAGEW, valW, &size);
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS got %u\n", r);
ok(valW[0], "expected > 0 got %u\n", valW[0]);
- ok(size == 11, "expected 11 got %u\n", size);
+ ok(size == 11, "expected 11 got %lu\n", size);
delete_key(hkey_udproductpatch, "", access & KEY_WOW64_64KEY);
RegCloseKey(hkey_udproductpatch);
@@ -13193,37 +13192,37 @@ static void test_MsiGetFileSignatureInformation(void)
DWORD len;
hr = MsiGetFileSignatureInformationA( NULL, 0, NULL, NULL, NULL );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( NULL, 0, NULL, NULL, &len );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( NULL, 0, &cert, NULL, &len );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( "", 0, NULL, NULL, NULL );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, &len );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len );
- todo_wine ok(hr == CRYPT_E_FILE_ERROR, "expected CRYPT_E_FILE_ERROR got 0x%08x\n", hr);
+ todo_wine ok(hr == CRYPT_E_FILE_ERROR, "expected CRYPT_E_FILE_ERROR got %#lx\n", hr);
create_file_data( "signature.bin", "signature", sizeof("signature") );
hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, &len );
- ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", hr);
cert = (const CERT_CONTEXT *)0xdeadbeef;
hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len );
- todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FUNCTION_FAILED), "got 0x%08x\n", hr);
+ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FUNCTION_FAILED), "got %#lx\n", hr);
ok(cert == NULL, "got %p\n", cert);
DeleteFileA( "signature.bin" );
@@ -13292,7 +13291,7 @@ static void test_MsiEnumProductsEx(void)
len = sizeof(sid);
r = pMsiEnumProductsExA( NULL, NULL, 0, 0, NULL, NULL, NULL, &len );
ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r );
- ok( len == sizeof(sid), "got %u\n", len );
+ ok( len == sizeof(sid), "got %lu\n", len );
r = pMsiEnumProductsExA( NULL, NULL, MSIINSTALLCONTEXT_ALL, 0, NULL, NULL, NULL, NULL );
ok( r == ERROR_SUCCESS, "got %u\n", r );
@@ -13301,14 +13300,14 @@ static void test_MsiEnumProductsEx(void)
len = sizeof(sid);
r = pMsiEnumProductsExA( product0, NULL, MSIINSTALLCONTEXT_ALL, 0, NULL, NULL, sid, &len );
ok( r == ERROR_NO_MORE_ITEMS, "got %u\n", r );
- ok( len == sizeof(sid), "got %u\n", len );
+ ok( len == sizeof(sid), "got %lu\n", len );
ok( !sid[0], "got %s\n", sid );
sid[0] = 0;
len = sizeof(sid);
r = pMsiEnumProductsExA( product0, usersid, MSIINSTALLCONTEXT_ALL, 0, NULL, NULL, sid, &len );
ok( r == ERROR_NO_MORE_ITEMS, "got %u\n", r );
- ok( len == sizeof(sid), "got %u\n", len );
+ ok( len == sizeof(sid), "got %lu\n", len );
ok( !sid[0], "got %s\n", sid );
sid[0] = 0;
@@ -13326,7 +13325,7 @@ static void test_MsiEnumProductsEx(void)
ok( r == ERROR_SUCCESS, "got %u\n", r );
ok( guid[0], "empty guid\n" );
ok( context != 0xdeadbeef, "context unchanged\n" );
- ok( !len, "got %u\n", len );
+ ok( !len, "got %lu\n", len );
ok( !sid[0], "got %s\n", sid );
guid[0] = 0;
@@ -13337,7 +13336,7 @@ static void test_MsiEnumProductsEx(void)
ok( r == ERROR_SUCCESS, "got %u\n", r );
ok( guid[0], "empty guid\n" );
ok( context != 0xdeadbeef, "context unchanged\n" );
- ok( !len, "got %u\n", len );
+ ok( !len, "got %lu\n", len );
ok( !sid[0], "got %s\n", sid );
guid[0] = 0;
@@ -13353,7 +13352,7 @@ static void test_MsiEnumProductsEx(void)
ok( r == ERROR_SUCCESS, "got %u\n", r );
ok( guid[0], "empty guid\n" );
ok( context != 0xdeadbeef, "context unchanged\n" );
- ok( !len, "got %u\n", len );
+ ok( !len, "got %lu\n", len );
ok( !sid[0], "got %s\n", sid );
index = 0;
@@ -13368,21 +13367,21 @@ static void test_MsiEnumProductsEx(void)
{
ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context );
ok( !sid[0], "got \"%s\"\n", sid );
- ok( !len, "unexpected length %u\n", len );
+ ok( !len, "unexpected length %lu\n", len );
found1 = TRUE;
}
if (!strcmp( product2, guid ))
{
ok( context == MSIINSTALLCONTEXT_USERMANAGED, "got %u\n", context );
ok( sid[0], "empty sid\n" );
- ok( len == strlen(sid), "unexpected length %u\n", len );
+ ok( len == strlen(sid), "unexpected length %lu\n", len );
found2 = TRUE;
}
if (!strcmp( product3, guid ))
{
ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context );
ok( sid[0], "empty sid\n" );
- ok( len == strlen(sid), "unexpected length %u\n", len );
+ ok( len == strlen(sid), "unexpected length %lu\n", len );
found3 = TRUE;
}
if (found1 && found2 && found3) break;
@@ -13548,7 +13547,7 @@ static void test_MsiEnumComponentsEx(void)
{
ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context );
ok( !sid[0], "got \"%s\"\n", sid );
- ok( !len, "unexpected length %u\n", len );
+ ok( !len, "unexpected length %lu\n", len );
found1 = TRUE;
if (found2) break;
}
@@ -13556,7 +13555,7 @@ static void test_MsiEnumComponentsEx(void)
{
ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context );
ok( sid[0], "empty sid\n" );
- ok( len == strlen(sid), "unexpected length %u\n", len );
+ ok( len == strlen(sid), "unexpected length %lu\n", len );
found2 = TRUE;
if (found1) break;
}
@@ -13749,17 +13748,17 @@ static void test_MsiConfigureProductEx(void)
lstrcatA(keypath, "83374883CBB1401418CAF2AA7CCEDDDC\\InstallProperties");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
type = REG_SZ;
size = MAX_PATH;
res = RegQueryValueExA(props, "LocalPackage", NULL, &type,
(LPBYTE)localpackage, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)"C:\\idontexist.msi", 18);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LocalPackage is used to find the cached msi package */
r = MsiConfigureProductExA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}",
@@ -13799,33 +13798,33 @@ static void test_MsiConfigureProductEx(void)
lstrcatA(keypath, "83374883CBB1401418CAF2AA7CCEDDDC\\InstallProperties");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
type = REG_SZ;
size = MAX_PATH;
res = RegQueryValueExA(props, "LocalPackage", NULL, &type,
(LPBYTE)localpackage, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)"C:\\idontexist.msi", 18);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "SOFTWARE\\Classes\\Installer\\Products\\");
lstrcatA(keypath, "83374883CBB1401418CAF2AA7CCEDDDC\\SourceList");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &source);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
type = REG_SZ;
size = MAX_PATH;
res = RegQueryValueExA(source, "PackageName", NULL, &type,
(LPBYTE)packagename, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(source, "PackageName", 0, REG_SZ,
(const BYTE *)"idontexist.msi", 15);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList is altered */
r = MsiConfigureProductExA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}",
@@ -13841,12 +13840,12 @@ static void test_MsiConfigureProductEx(void)
/* restore PackageName */
res = RegSetValueExA(source, "PackageName", 0, REG_SZ,
(const BYTE *)packagename, lstrlenA(packagename) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* restore LocalPackage */
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)localpackage, lstrlenA(localpackage) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* finally remove the product */
r = MsiConfigureProductExA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}",
@@ -13918,7 +13917,7 @@ static void test_MsiSetFeatureAttributes(void)
r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL,
- "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs);
+ "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got %#lx\n", attrs);
r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
@@ -13927,7 +13926,7 @@ static void test_MsiSetFeatureAttributes(void)
r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL,
- "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs);
+ "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got %#lx\n", attrs);
r = MsiDoActionA( package, "FileCost" );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
@@ -13939,7 +13938,7 @@ static void test_MsiSetFeatureAttributes(void)
r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORSOURCE,
- "expected INSTALLFEATUREATTRIBUTE_FAVORSOURCE, got 0x%08x\n", attrs);
+ "expected INSTALLFEATUREATTRIBUTE_FAVORSOURCE, got %#lx\n", attrs);
r = MsiDoActionA( package, "CostFinalize" );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
@@ -13996,15 +13995,15 @@ static void test_MsiGetFeatureInfo(void)
title_len = help_len = 0;
r = MsiGetFeatureInfoA( package, "One", NULL, NULL, &title_len, NULL, &help_len );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
- ok(title_len == 3, "expected 3, got %u\n", title_len);
- ok(help_len == 3, "expected 3, got %u\n", help_len);
+ ok(title_len == 3, "expected 3, got %lu\n", title_len);
+ ok(help_len == 3, "expected 3, got %lu\n", help_len);
title[0] = help[0] = 0;
title_len = help_len = 0;
r = MsiGetFeatureInfoA( package, "One", NULL, title, &title_len, help, &help_len );
ok(r == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %u\n", r);
- ok(title_len == 3, "expected 3, got %u\n", title_len);
- ok(help_len == 3, "expected 3, got %u\n", help_len);
+ ok(title_len == 3, "expected 3, got %lu\n", title_len);
+ ok(help_len == 3, "expected 3, got %lu\n", help_len);
attrs = 0;
title[0] = help[0] = 0;
@@ -14012,9 +14011,9 @@ static void test_MsiGetFeatureInfo(void)
help_len = sizeof(help);
r = MsiGetFeatureInfoA( package, "One", &attrs, title, &title_len, help, &help_len );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
- ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got %u\n", attrs);
- ok(title_len == 3, "expected 3, got %u\n", title_len);
- ok(help_len == 3, "expected 3, got %u\n", help_len);
+ ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got %lu\n", attrs);
+ ok(title_len == 3, "expected 3, got %lu\n", title_len);
+ ok(help_len == 3, "expected 3, got %lu\n", help_len);
ok(!strcmp(title, "One"), "expected \"One\", got \"%s\"\n", title);
ok(!strcmp(help, "One"), "expected \"One\", got \"%s\"\n", help);
@@ -14024,9 +14023,9 @@ static void test_MsiGetFeatureInfo(void)
help_len = sizeof(help);
r = MsiGetFeatureInfoA( package, "Two", &attrs, title, &title_len, help, &help_len );
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
- ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got %u\n", attrs);
- ok(!title_len, "expected 0, got %u\n", title_len);
- ok(!help_len, "expected 0, got %u\n", help_len);
+ ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got %lu\n", attrs);
+ ok(!title_len, "expected 0, got %lu\n", title_len);
+ ok(!help_len, "expected 0, got %lu\n", help_len);
ok(!title[0], "expected \"\", got \"%s\"\n", title);
ok(!help[0], "expected \"\", got \"%s\"\n", help);
@@ -14179,7 +14178,7 @@ static void test_lastusedsource(void)
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value);
- ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size);
+ ok(size == lstrlenA(path), "expected %d, got %lu\n", lstrlenA(path), size);
r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL FULL=1");
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
@@ -14205,7 +14204,7 @@ static void test_lastusedsource(void)
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value);
- ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size);
+ ok(size == lstrlenA(path), "expected %d, got %lu\n", lstrlenA(path), size);
r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL FULL=1");
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
@@ -14230,7 +14229,7 @@ static void test_lastusedsource(void)
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value);
- ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size);
+ ok(size == lstrlenA(path), "expected %d, got %lu\n", lstrlenA(path), size);
r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL FULL=1");
ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 556bc016997..05633c4b6df 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -250,10 +250,10 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed)
int size;
hr = CoCreateGuid(&guid);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
size = StringFromGUID2(&guid, guidW, MAX_PATH);
- ok(size == 39, "Expected 39, got %d\n", hr);
+ ok(size == 39, "Expected 39, got %#lx\n", hr);
WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL);
squash_guid(guidW, squashedW);
@@ -954,7 +954,7 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle)
CHAR szPackage[12];
MSIHANDLE hPackage;
- sprintf(szPackage, "#%u", hdb);
+ sprintf(szPackage, "#%lu", hdb);
res = MsiOpenPackageA(szPackage, &hPackage);
if (res != ERROR_SUCCESS)
{
@@ -1075,7 +1075,7 @@ static void remove_restore_point(DWORD seq_number)
res = pSRRemoveRestorePoint(seq_number);
if (res != ERROR_SUCCESS)
- trace("Failed to remove the restore point : %08x\n", res);
+ trace("Failed to remove the restore point: %#lx\n", res);
}
static BOOL is_root(const char *path)
@@ -2143,7 +2143,7 @@ static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect, int
DWORD sz = sizeof(buffer);
UINT r = MsiGetPropertyA(hpkg, prop, buffer, &sz);
ok(!r, "'%s': got %u\n", prop, r);
- ok(sz == lstrlenA(buffer), "'%s': expected %u, got %u\n", prop, lstrlenA(buffer), sz);
+ ok(sz == lstrlenA(buffer), "'%s': expected %u, got %lu\n", prop, lstrlenA(buffer), sz);
if (match_case)
ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer);
else
@@ -2189,21 +2189,21 @@ static void test_props(void)
sz = sizeof buffer;
r = MsiGetPropertyA( hpkg, "boo", NULL, &sz );
ok(!r, "got %u\n", r);
- ok(sz == 0, "got size %d\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
sz = 0;
strcpy(buffer,"x");
r = MsiGetPropertyA( hpkg, "boo", buffer, &sz );
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!strcmp(buffer,"x"), "got \"%s\"\n", buffer);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
sz = 1;
strcpy(buffer,"x");
r = MsiGetPropertyA( hpkg, "boo", buffer, &sz );
ok(!r, "got %u\n", r);
ok(!buffer[0], "got \"%s\"\n", buffer);
- ok(sz == 0, "got size %u\n", sz);
+ ok(sz == 0, "got size %lu\n", sz);
/* set the property to something */
r = MsiSetPropertyA( 0, NULL, NULL );
@@ -2253,68 +2253,68 @@ static void test_props(void)
sz = 0;
r = MsiGetPropertyA(hpkg, "boo", NULL, &sz);
ok(!r, "got %u\n", r);
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 0;
strcpy(buffer, "q");
r = MsiGetPropertyA(hpkg, "boo", buffer, &sz);
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!strcmp(buffer, "q"), "got \"%s\"", buffer);
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 1;
strcpy(buffer,"x");
r = MsiGetPropertyA( hpkg, "boo", buffer, &sz );
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!buffer[0], "got \"%s\"\n", buffer);
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 3;
strcpy(buffer,"x");
r = MsiGetPropertyA( hpkg, "boo", buffer, &sz );
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!strcmp(buffer,"xy"), "got \"%s\"\n", buffer);
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 4;
strcpy(buffer,"x");
r = MsiGetPropertyA( hpkg, "boo", buffer, &sz );
ok(!r, "got %u\n", r);
ok(!strcmp(buffer,"xyz"), "got \"%s\"\n", buffer);
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 0;
r = MsiGetPropertyW(hpkg, L"boo", NULL, &sz);
ok(!r, "got %u\n", r);
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 0;
lstrcpyW(bufferW, L"boo");
r = MsiGetPropertyW(hpkg, L"boo", bufferW, &sz);
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!lstrcmpW(bufferW, L"boo"), "got %s\n", wine_dbgstr_w(bufferW));
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 1;
lstrcpyW(bufferW, L"boo");
r = MsiGetPropertyW(hpkg, L"boo", bufferW, &sz );
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW));
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 3;
lstrcpyW(bufferW, L"boo");
r = MsiGetPropertyW(hpkg, L"boo", bufferW, &sz );
ok(r == ERROR_MORE_DATA, "got %u\n", r);
ok(!lstrcmpW(bufferW, L"xy"), "got %s\n", wine_dbgstr_w(bufferW));
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
sz = 4;
lstrcpyW(bufferW, L"boo");
r = MsiGetPropertyW(hpkg, L"boo", bufferW, &sz );
ok(!r, "got %u\n", r);
ok(!lstrcmpW(bufferW, L"xyz"), "got %s\n", wine_dbgstr_w(bufferW));
- ok(sz == 3, "got size %u\n", sz);
+ ok(sz == 3, "got size %lu\n", sz);
/* properties are case-sensitive */
check_prop(hpkg, "BOO", "", 1);
@@ -2354,7 +2354,7 @@ static BOOL find_prop_in_property(MSIHANDLE hdb, LPCSTR prop, LPCSTR val, int le
r = MsiRecordGetStringA(hrec, 2, buffer, &sz);
if (r == ERROR_SUCCESS && !memcmp(buffer, val, len) && !buffer[len])
{
- ok(sz == len, "wrong size %u\n", sz);
+ ok(sz == len, "wrong size %lu\n", sz);
found = TRUE;
}
}
@@ -2420,7 +2420,7 @@ static void test_property_table(void)
r = run_query(hdb, query);
ok(r == ERROR_SUCCESS, "failed to add column\n");
- sprintf(package, "#%i", hdb);
+ sprintf(package, "#%lu", hdb);
r = MsiOpenPackageA(package, &hpkg);
ok(r != ERROR_SUCCESS, "MsiOpenPackage succeeded\n");
if (r == ERROR_SUCCESS)
@@ -2482,7 +2482,7 @@ static void test_property_table(void)
r = MsiGetPropertyA( hpkg, "prop2", buffer, &sz );
ok( r == ERROR_SUCCESS, "get property failed: %d\n", r);
ok( !memcmp( buffer, "\0np", sizeof("\0np") ), "wrong value\n");
- ok( sz == sizeof("\0np") - 1, "got %u\n", sz );
+ ok( sz == sizeof("\0np") - 1, "got %lu\n", sz );
found = find_prop_in_property(hdb, "prop2", "\0np", 3);
ok(found == TRUE, "prop2 should be in the _Property table\n");
@@ -2602,7 +2602,7 @@ static void test_msipackage(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
/* database exists, but is empty */
- sprintf(name, "#%d", hdb);
+ sprintf(name, "#%lu", hdb);
r = MsiOpenPackageA(name, &hpack);
ok(r == ERROR_INSTALL_PACKAGE_INVALID,
"Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r);
@@ -2620,7 +2620,7 @@ static void test_msipackage(void)
ok(r == ERROR_SUCCESS, "failed to create InstallExecuteSequence table\n");
/* a few key tables exist */
- sprintf(name, "#%d", hdb);
+ sprintf(name, "#%lu", hdb);
r = MsiOpenPackageA(name, &hpack);
ok(r == ERROR_INSTALL_PACKAGE_INVALID,
"Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r);
@@ -2632,7 +2632,7 @@ static void test_msipackage(void)
r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- sprintf(name, "#%d", hdb);
+ sprintf(name, "#%lu", hdb);
/* The following summary information props must exist:
* - PID_REVNUMBER
@@ -2959,7 +2959,7 @@ static void test_formatrecord_tables(void)
r = MsiGetPropertyA( hpkg, "prop", buf, &size );
ok( r == ERROR_SUCCESS, "get property failed: %d\n", r);
ok( !memcmp( buf, "\0np", sizeof("\0np") ), "wrong value\n");
- ok( size == sizeof("\0np") - 1, "got %u\n", size );
+ ok( size == sizeof("\0np") - 1, "got %lu\n", size );
r = MsiSetPropertyA( hpkg, "prop", "[~]np" );
ok( r == ERROR_SUCCESS, "cannot set property: %d\n", r);
@@ -4397,73 +4397,73 @@ static void test_appsearch_reglocator(void)
skip("Not enough rights to perform tests\n");
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(classes, "Value1", 0, REG_SZ,
(const BYTE *)"regszdata", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine", &hkcu);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hkcu, "Value1", 0, REG_SZ,
(const BYTE *)"regszdata", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
users = 0;
res = RegCreateKeyA(HKEY_USERS, "S-1-5-18\\Software\\Wine", &users);
ok(res == ERROR_SUCCESS ||
broken(res == ERROR_INVALID_PARAMETER),
- "Expected ERROR_SUCCESS, got %d\n", res);
+ "Expected ERROR_SUCCESS, got %ld\n", res);
if (res == ERROR_SUCCESS)
{
res = RegSetValueExA(users, "Value1", 0, REG_SZ,
(const BYTE *)"regszdata", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
}
res = RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine", &hklm);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueA(hklm, NULL, REG_SZ, "defvalue", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hklm, "Value1", 0, REG_SZ,
(const BYTE *)"regszdata", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
val = 42;
res = RegSetValueExA(hklm, "Value2", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
val = -42;
res = RegSetValueExA(hklm, "Value3", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hklm, "Value4", 0, REG_EXPAND_SZ,
(const BYTE *)"%PATH%", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hklm, "Value5", 0, REG_EXPAND_SZ,
(const BYTE *)"my%NOVAR%", 10);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hklm, "Value6", 0, REG_MULTI_SZ,
(const BYTE *)"one\0two\0", 9);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
binary[0] = 0x1234abcd;
binary[1] = 0x567890ef;
res = RegSetValueExA(hklm, "Value7", 0, REG_BINARY,
(const BYTE *)binary, sizeof(binary));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hklm, "Value8", 0, REG_SZ,
(const BYTE *)"#regszdata", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
strcpy(expected, CURR_DIR);
if (is_root(CURR_DIR)) expected[2] = 0;
@@ -4472,50 +4472,50 @@ static void test_appsearch_reglocator(void)
sprintf(path, "%s\\FileName1", expected);
res = RegSetValueExA(hklm, "Value9", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
sprintf(path, "%s\\FileName2", expected);
res = RegSetValueExA(hklm, "Value10", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(path, expected);
res = RegSetValueExA(hklm, "Value11", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(hklm, "Value12", 0, REG_SZ,
(const BYTE *)"", 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
create_file_with_version("FileName3.dll", MAKELONG(2, 1), MAKELONG(4, 3));
sprintf(path, "%s\\FileName3.dll", expected);
res = RegSetValueExA(hklm, "Value13", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
create_file_with_version("FileName4.dll", MAKELONG(1, 2), MAKELONG(3, 4));
sprintf(path, "%s\\FileName4.dll", expected);
res = RegSetValueExA(hklm, "Value14", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
create_file_with_version("FileName5.dll", MAKELONG(2, 1), MAKELONG(4, 3));
sprintf(path, "%s\\FileName5.dll", expected);
res = RegSetValueExA(hklm, "Value15", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
sprintf(path, "\"%s\\FileName1\" -option", expected);
res = RegSetValueExA(hklm, "value16", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
+ ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %ld\n", res);
space = strchr(expected, ' ') != NULL;
sprintf(path, "%s\\FileName1 -option", expected);
res = RegSetValueExA(hklm, "value17", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
+ ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %ld\n", res);
hdb = create_package_db();
ok(hdb, "Expected a valid database handle\n");
@@ -6215,7 +6215,7 @@ static void test_MsiGetSourcePath(void)
"Expected ERROR_INVALID_HANDLE, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* NULL szFolder */
size = MAX_PATH;
@@ -6225,7 +6225,7 @@ static void test_MsiGetSourcePath(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* empty szFolder */
size = MAX_PATH;
@@ -6234,7 +6234,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* try TARGETDIR */
size = MAX_PATH;
@@ -6243,21 +6243,21 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* try SourceDir */
size = MAX_PATH;
@@ -6266,7 +6266,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* try SOURCEDIR */
size = MAX_PATH;
@@ -6275,7 +6275,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* source path does not exist, but the property exists */
size = MAX_PATH;
@@ -6283,14 +6283,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* try SubDir */
size = MAX_PATH;
@@ -6299,7 +6299,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* try SubDir2 */
size = MAX_PATH;
@@ -6308,7 +6308,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
@@ -6321,7 +6321,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after CostInitialize */
size = MAX_PATH;
@@ -6329,7 +6329,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after CostInitialize */
size = MAX_PATH;
@@ -6338,7 +6338,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* source path does not exist, but the property exists */
size = MAX_PATH;
@@ -6346,14 +6346,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after CostInitialize */
size = MAX_PATH;
@@ -6361,7 +6361,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
/* try SubDir2 after CostInitialize */
size = MAX_PATH;
@@ -6369,7 +6369,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path);
- ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size);
+ ok(size == lstrlenA(sub2), "Expected %d, got %lu\n", lstrlenA(sub2), size);
r = MsiDoActionA(hpkg, "ResolveSource");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -6380,7 +6380,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after ResolveSource */
size = MAX_PATH;
@@ -6388,7 +6388,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after ResolveSource */
size = MAX_PATH;
@@ -6397,7 +6397,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* source path does not exist, but the property exists */
size = MAX_PATH;
@@ -6405,14 +6405,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after ResolveSource */
size = MAX_PATH;
@@ -6420,7 +6420,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
/* try SubDir2 after ResolveSource */
size = MAX_PATH;
@@ -6428,7 +6428,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path);
- ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size);
+ ok(size == lstrlenA(sub2), "Expected %d, got %lu\n", lstrlenA(sub2), size);
r = MsiDoActionA(hpkg, "FileCost");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -6439,7 +6439,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after FileCost */
size = MAX_PATH;
@@ -6447,7 +6447,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after FileCost */
size = MAX_PATH;
@@ -6456,7 +6456,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* source path does not exist, but the property exists */
size = MAX_PATH;
@@ -6464,14 +6464,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after FileCost */
size = MAX_PATH;
@@ -6479,7 +6479,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
/* try SubDir2 after FileCost */
size = MAX_PATH;
@@ -6487,7 +6487,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path);
- ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size);
+ ok(size == lstrlenA(sub2), "Expected %d, got %lu\n", lstrlenA(sub2), size);
r = MsiDoActionA(hpkg, "CostFinalize");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -6498,7 +6498,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after CostFinalize */
size = MAX_PATH;
@@ -6506,7 +6506,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after CostFinalize */
size = MAX_PATH;
@@ -6515,7 +6515,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* source path does not exist, but the property exists */
size = MAX_PATH;
@@ -6523,14 +6523,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after CostFinalize */
size = MAX_PATH;
@@ -6538,7 +6538,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
/* try SubDir2 after CostFinalize */
size = MAX_PATH;
@@ -6546,7 +6546,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path);
- ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size);
+ ok(size == lstrlenA(sub2), "Expected %d, got %lu\n", lstrlenA(sub2), size);
/* nonexistent directory */
size = MAX_PATH;
@@ -6555,13 +6555,13 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* NULL szPathBuf */
size = MAX_PATH;
r = MsiGetSourcePathA(hpkg, "SourceDir", NULL, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* NULL pcchPathBuf */
lstrcpyA(path, "kiwi");
@@ -6578,7 +6578,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* pcchPathBuf does not have room for NULL terminator */
size = lstrlenA(cwd);
@@ -6587,7 +6587,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!strncmp(path, cwd, lstrlenA(cwd) - 1),
"Expected path with no backslash, got \"%s\"\n", path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* pcchPathBuf has room for NULL terminator */
size = lstrlenA(cwd) + 1;
@@ -6595,7 +6595,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* remove property */
r = MsiSetPropertyA(hpkg, "SourceDir", NULL);
@@ -6607,7 +6607,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* set property to a valid directory */
r = MsiSetPropertyA(hpkg, "SOURCEDIR", cwd);
@@ -6620,7 +6620,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
MsiCloseHandle(hpkg);
@@ -6641,7 +6641,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* try SourceDir */
size = MAX_PATH;
@@ -6650,7 +6650,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* try SOURCEDIR */
size = MAX_PATH;
@@ -6659,7 +6659,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* source path nor the property exist */
size = MAX_PATH;
@@ -6667,14 +6667,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* try SubDir */
size = MAX_PATH;
@@ -6683,7 +6683,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* try SubDir2 */
size = MAX_PATH;
@@ -6692,7 +6692,7 @@ static void test_MsiGetSourcePath(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
r = MsiDoActionA(hpkg, "CostInitialize");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -6703,7 +6703,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after CostInitialize */
size = MAX_PATH;
@@ -6711,7 +6711,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after CostInitialize */
size = MAX_PATH;
@@ -6721,7 +6721,7 @@ static void test_MsiGetSourcePath(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
}
/* source path does not exist, but the property exists */
@@ -6730,14 +6730,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after CostInitialize */
size = MAX_PATH;
@@ -6745,7 +6745,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir2 after CostInitialize */
size = MAX_PATH;
@@ -6753,7 +6753,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
r = MsiDoActionA(hpkg, "ResolveSource");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -6764,7 +6764,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after ResolveSource */
size = MAX_PATH;
@@ -6772,7 +6772,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after ResolveSource */
size = MAX_PATH;
@@ -6782,7 +6782,7 @@ static void test_MsiGetSourcePath(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
}
/* source path and the property exist */
@@ -6791,14 +6791,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after ResolveSource */
size = MAX_PATH;
@@ -6806,7 +6806,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir2 after ResolveSource */
size = MAX_PATH;
@@ -6814,7 +6814,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
r = MsiDoActionA(hpkg, "FileCost");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -6825,7 +6825,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after CostFinalize */
size = MAX_PATH;
@@ -6833,7 +6833,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after CostFinalize */
size = MAX_PATH;
@@ -6843,7 +6843,7 @@ static void test_MsiGetSourcePath(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
}
/* source path and the property exist */
@@ -6852,14 +6852,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after CostFinalize */
size = MAX_PATH;
@@ -6867,7 +6867,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir2 after CostFinalize */
size = MAX_PATH;
@@ -6875,7 +6875,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
r = MsiDoActionA(hpkg, "CostFinalize");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -6886,7 +6886,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "TARGETDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SourceDir after CostFinalize */
size = MAX_PATH;
@@ -6894,7 +6894,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SOURCEDIR after CostFinalize */
size = MAX_PATH;
@@ -6904,7 +6904,7 @@ static void test_MsiGetSourcePath(void)
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
}
/* source path and the property exist */
@@ -6913,14 +6913,14 @@ static void test_MsiGetSourcePath(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir after CostFinalize */
size = MAX_PATH;
@@ -6928,7 +6928,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* try SubDir2 after CostFinalize */
size = MAX_PATH;
@@ -6936,7 +6936,7 @@ static void test_MsiGetSourcePath(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
MsiCloseHandle(hpkg);
DeleteFileA(msifile);
@@ -7026,7 +7026,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
CreateDirectoryA("short", NULL);
@@ -7036,7 +7036,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
CreateDirectoryA("long", NULL);
@@ -7046,7 +7046,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "two");
@@ -7058,7 +7058,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "four");
@@ -7070,7 +7070,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir3", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "six");
@@ -7082,7 +7082,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir4", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "eight");
@@ -7094,7 +7094,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir5", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "ten");
@@ -7106,7 +7106,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir6", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "twelve");
@@ -7118,7 +7118,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir7", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
MsiCloseHandle(hpkg);
RemoveDirectoryA("short");
@@ -7170,7 +7170,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
CreateDirectoryA("short", NULL);
@@ -7180,7 +7180,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
CreateDirectoryA("long", NULL);
@@ -7190,7 +7190,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "one");
@@ -7202,7 +7202,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "three");
@@ -7214,7 +7214,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir3", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "five");
@@ -7226,7 +7226,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir4", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "seven");
@@ -7238,7 +7238,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir5", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "nine");
@@ -7250,7 +7250,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir6", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd);
lstrcatA(subsrc, "eleven");
@@ -7262,7 +7262,7 @@ static void test_shortlongsource(void)
r = MsiGetSourcePathA(hpkg, "SubDir7", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path);
- ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
+ ok(size == lstrlenA(subsrc), "Expected %d, got %lu\n", lstrlenA(subsrc), size);
MsiCloseHandle(hpkg);
RemoveDirectoryA("short");
@@ -7298,7 +7298,7 @@ static void test_sourcedir(void)
add_directory_entry(hdb, "'TARGETDIR', '', 'SourceDir'");
- sprintf(package, "#%u", hdb);
+ sprintf(package, "#%lu", hdb);
r = MsiOpenPackageA(package, &hpkg);
if (r == ERROR_INSTALL_PACKAGE_REJECTED)
{
@@ -7315,7 +7315,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* SOURCEDIR prop */
size = MAX_PATH;
@@ -7323,7 +7323,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
@@ -7336,7 +7336,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* SOURCEDIR after CostInitialize */
size = MAX_PATH;
@@ -7344,7 +7344,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
r = MsiDoActionA(hpkg, "FileCost");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -7355,7 +7355,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* SOURCEDIR after FileCost */
size = MAX_PATH;
@@ -7363,7 +7363,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
r = MsiDoActionA(hpkg, "CostFinalize");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -7374,7 +7374,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* SOURCEDIR after CostFinalize */
size = MAX_PATH;
@@ -7382,14 +7382,14 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyA(path, "kiwi");
r = MsiGetSourcePathA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"), "Expected \"kiwi\", got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "Expected %d, got %lu\n", MAX_PATH, size);
/* SOURCEDIR after calling MsiGetSourcePath */
size = MAX_PATH;
@@ -7398,7 +7398,7 @@ static void test_sourcedir(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
todo_wine {
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
}
r = MsiDoActionA(hpkg, "ResolveSource");
@@ -7410,7 +7410,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR after ResolveSource */
size = MAX_PATH;
@@ -7418,7 +7418,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* random casing */
size = MAX_PATH;
@@ -7426,12 +7426,12 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SoUrCeDiR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
MsiCloseHandle(hpkg);
/* reset the package state */
- sprintf(package, "#%i", hdb);
+ sprintf(package, "#%lu", hdb);
r = MsiOpenPackageA(package, &hpkg);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -7445,7 +7445,7 @@ static void test_sourcedir(void)
todo_wine
{
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
size = MAX_PATH;
@@ -7454,7 +7454,7 @@ static void test_sourcedir(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* SourceDir after MsiGetSourcePath */
size = MAX_PATH;
@@ -7464,7 +7464,7 @@ static void test_sourcedir(void)
todo_wine
{
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
/* SOURCEDIR prop */
@@ -7475,7 +7475,7 @@ static void test_sourcedir(void)
todo_wine
{
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
size = MAX_PATH;
@@ -7484,7 +7484,7 @@ static void test_sourcedir(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* SOURCEDIR prop after MsiGetSourcePath */
size = MAX_PATH;
@@ -7494,7 +7494,7 @@ static void test_sourcedir(void)
todo_wine
{
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
r = MsiDoActionA(hpkg, "CostInitialize");
@@ -7508,7 +7508,7 @@ static void test_sourcedir(void)
todo_wine
{
ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
}
size = MAX_PATH;
@@ -7516,7 +7516,7 @@ static void test_sourcedir(void)
r = MsiGetSourcePathA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SourceDir after MsiGetSourcePath */
size = MAX_PATH;
@@ -7524,7 +7524,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR after CostInitialize */
size = MAX_PATH;
@@ -7532,7 +7532,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR source path still does not exist */
size = MAX_PATH;
@@ -7541,7 +7541,7 @@ static void test_sourcedir(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
r = MsiDoActionA(hpkg, "FileCost");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -7552,7 +7552,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR after FileCost */
size = MAX_PATH;
@@ -7560,7 +7560,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR source path still does not exist */
size = MAX_PATH;
@@ -7569,7 +7569,7 @@ static void test_sourcedir(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
r = MsiDoActionA(hpkg, "CostFinalize");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -7580,7 +7580,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR after CostFinalize */
size = MAX_PATH;
@@ -7588,7 +7588,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR source path still does not exist */
size = MAX_PATH;
@@ -7597,7 +7597,7 @@ static void test_sourcedir(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
r = MsiDoActionA(hpkg, "ResolveSource");
ok(r == ERROR_SUCCESS, "file cost failed\n");
@@ -7608,7 +7608,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SourceDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR after ResolveSource */
size = MAX_PATH;
@@ -7616,7 +7616,7 @@ static void test_sourcedir(void)
r = MsiGetPropertyA(hpkg, "SOURCEDIR", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
- ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
+ ok(size == lstrlenA(cwd), "Expected %d, got %lu\n", lstrlenA(cwd), size);
/* SOURCEDIR source path still does not exist */
size = MAX_PATH;
@@ -7625,7 +7625,7 @@ static void test_sourcedir(void)
ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r);
ok(!lstrcmpA(path, "kiwi"),
"Expected path to be unchanged, got \"%s\"\n", path);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
MsiCloseHandle(hpkg);
@@ -7731,11 +7731,11 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD
lasterr = GetLastError();
ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle,
- "(%d, handle, %d): Expected %d, got %d\n",
+ "(%lu, handle, %d): Expected %d, got %d\n",
line, idx, ares[idx].gothandle,
(hfile != INVALID_HANDLE_VALUE));
- ok(lasterr == ares[idx].lasterr, "(%d, lasterr, %d): Expected %d, got %d\n",
+ ok(lasterr == ares[idx].lasterr, "(%lu, lasterr, %u): Expected %lu, got %lu\n",
line, idx, ares[idx].lasterr, lasterr);
CloseHandle(hfile);
@@ -8010,7 +8010,7 @@ static void test_MsiGetProductProperty(void)
DeleteFileA(msifile);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
@@ -8024,17 +8024,17 @@ static void test_MsiGetProductProperty(void)
RegCloseKey(prodkey);
return;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegCreateKeyExA(userkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
lstrcpyA(val, path);
lstrcatA(val, "\\");
lstrcatA(val, msifile);
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
(const BYTE *)val, lstrlenA(val) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
hprod = 0xdeadbeef;
r = MsiOpenProductA(prodcode, &hprod);
@@ -8049,7 +8049,7 @@ static void test_MsiGetProductProperty(void)
"Expected ERROR_INVALID_HANDLE, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
@@ -8058,7 +8058,7 @@ static void test_MsiGetProductProperty(void)
"Expected ERROR_INVALID_HANDLE, got %d\n", r);
ok(!lstrcmpW(valW, L"apple"),
"Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW));
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szProperty is NULL */
size = MAX_PATH;
@@ -8068,7 +8068,7 @@ static void test_MsiGetProductProperty(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
@@ -8077,7 +8077,7 @@ static void test_MsiGetProductProperty(void)
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpW(valW, L"apple"),
"Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW));
- ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+ ok(size == MAX_PATH, "Expected size to be unchanged, got %lu\n", size);
/* szProperty is empty */
size = MAX_PATH;
@@ -8085,14 +8085,14 @@ static void test_MsiGetProductProperty(void)
r = MsiGetProductPropertyA(hprod, "", val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
r = MsiGetProductPropertyW(hprod, L"", valW, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(*valW == 0, "Expected \"\", got %s\n", wine_dbgstr_w(valW));
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* get the property */
size = MAX_PATH;
@@ -8102,7 +8102,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpA(val, prodcode),
"Expected \"%s\", got \"%s\"\n", prodcode, val);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
@@ -8111,20 +8111,20 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpW(valW, prodcodeW),
"Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW));
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
/* lpValueBuf is NULL */
size = MAX_PATH;
r = MsiGetProductPropertyA(hprod, "ProductCode", NULL, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
size = MAX_PATH;
r = MsiGetProductPropertyW(hprod, L"ProductCode", NULL, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
/* pcchValueBuf is NULL */
lstrcpyA(val, "apple");
@@ -8134,7 +8134,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpA(val, "apple"),
"Expected val to be unchanged, got \"%s\"\n", val);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
lstrcpyW(valW, L"apple");
r = MsiGetProductPropertyW(hprod, L"ProductCode", valW, NULL);
@@ -8143,7 +8143,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpW(valW, L"apple"),
"Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW));
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
/* pcchValueBuf is too small */
size = 4;
@@ -8153,7 +8153,7 @@ static void test_MsiGetProductProperty(void)
ok(!strncmp(val, prodcode, 3),
"Expected first 3 chars of \"%s\", got \"%s\"\n", prodcode, val);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
size = 4;
lstrcpyW(valW, L"apple");
@@ -8162,7 +8162,7 @@ static void test_MsiGetProductProperty(void)
ok(!memcmp(valW, prodcodeW, 3 * sizeof(WCHAR)),
"Expected first 3 chars of %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW));
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
/* pcchValueBuf does not leave room for NULL terminator */
size = lstrlenA(prodcode);
@@ -8172,7 +8172,7 @@ static void test_MsiGetProductProperty(void)
ok(!strncmp(val, prodcode, lstrlenA(prodcode) - 1),
"Expected first 37 chars of \"%s\", got \"%s\"\n", prodcode, val);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
size = lstrlenW(prodcodeW);
lstrcpyW(valW, L"apple");
@@ -8181,7 +8181,7 @@ static void test_MsiGetProductProperty(void)
ok(!memcmp(valW, prodcodeW, lstrlenW(prodcodeW) - 1),
"Expected first 37 chars of %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW));
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
/* pcchValueBuf has enough room for NULL terminator */
size = lstrlenA(prodcode) + 1;
@@ -8191,7 +8191,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpA(val, prodcode),
"Expected \"%s\", got \"%s\"\n", prodcode, val);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
size = lstrlenW(prodcodeW) + 1;
lstrcpyW(valW, L"apple");
@@ -8200,7 +8200,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpW(valW, prodcodeW),
"Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW));
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
/* nonexistent property */
size = MAX_PATH;
@@ -8208,14 +8208,14 @@ static void test_MsiGetProductProperty(void)
r = MsiGetProductPropertyA(hprod, "IDontExist", val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
r = MsiGetProductPropertyW(hprod, L"IDontExist", valW, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpW(valW, L""), "Expected \"\", got %s\n", wine_dbgstr_w(valW));
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
r = MsiSetPropertyA(hprod, "NewProperty", "value");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -8226,14 +8226,14 @@ static void test_MsiGetProductProperty(void)
r = MsiGetProductPropertyA(hprod, "NewProperty", val, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
r = MsiGetProductPropertyW(hprod, L"NewProperty", valW, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpW(valW, L""), "Expected \"\", got %s\n", wine_dbgstr_w(valW));
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
r = MsiSetPropertyA(hprod, "ProductCode", "value");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -8246,7 +8246,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpA(val, prodcode),
"Expected \"%s\", got \"%s\"\n", prodcode, val);
ok(size == lstrlenA(prodcode),
- "Expected %d, got %d\n", lstrlenA(prodcode), size);
+ "Expected %d, got %lu\n", lstrlenA(prodcode), size);
size = MAX_PATH;
lstrcpyW(valW, L"apple");
@@ -8255,7 +8255,7 @@ static void test_MsiGetProductProperty(void)
ok(!lstrcmpW(valW, prodcodeW),
"Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW));
ok(size == lstrlenW(prodcodeW),
- "Expected %d, got %d\n", lstrlenW(prodcodeW), size);
+ "Expected %d, got %lu\n", lstrlenW(prodcodeW), size);
MsiCloseHandle(hprod);
@@ -8324,7 +8324,7 @@ static void test_MsiSetProperty(void)
r = MsiGetPropertyA(hpkg, "Prop", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "Val"), "Expected \"Val\", got \"%s\"\n", buf);
- ok(size == 3, "Expected 3, got %d\n", size);
+ ok(size == 3, "Expected 3, got %lu\n", size);
/* update the property */
r = MsiSetPropertyA(hpkg, "Prop", "Nuvo");
@@ -8335,7 +8335,7 @@ static void test_MsiSetProperty(void)
r = MsiGetPropertyA(hpkg, "Prop", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "Nuvo"), "Expected \"Nuvo\", got \"%s\"\n", buf);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
hdb = MsiGetActiveDatabase(hpkg);
ok(hdb != 0, "Expected a valid database handle\n");
@@ -8363,7 +8363,7 @@ static void test_MsiSetProperty(void)
r = MsiGetPropertyA(hpkg, "Prop", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
/* reset the property */
r = MsiSetPropertyA(hpkg, "Prop", "BlueTap");
@@ -8378,7 +8378,7 @@ static void test_MsiSetProperty(void)
r = MsiGetPropertyA(hpkg, "Prop", buf, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
MsiCloseHandle(hpkg);
DeleteFileA(msifile);
@@ -8482,7 +8482,7 @@ static void test_costs(void)
r = MsiDatabaseCommit( hdb );
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r );
- sprintf( package, "#%u", hdb );
+ sprintf( package, "#%lu", hdb );
r = MsiOpenPackageA( package, &hpkg );
if (r == ERROR_INSTALL_PACKAGE_REJECTED)
{
@@ -8558,17 +8558,17 @@ static void test_costs(void)
len = 0;
r = MsiEnumComponentCostsA( hpkg, "one", 0, INSTALLSTATE_LOCAL, drive, &len, &cost, &temp );
ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %u\n", r );
- ok( len == 2, "expected len == 2, got %u\n", len );
+ ok( len == 2, "expected len == 2, got %lu\n", len );
len = 2;
r = MsiEnumComponentCostsA( hpkg, "one", 0, INSTALLSTATE_LOCAL, drive, &len, &cost, &temp );
ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %u\n", r );
- ok( len == 2, "expected len == 2, got %u\n", len );
+ ok( len == 2, "expected len == 2, got %lu\n", len );
len = 2;
r = MsiEnumComponentCostsA( hpkg, "one", 0, INSTALLSTATE_UNKNOWN, drive, &len, &cost, &temp );
ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %u\n", r );
- ok( len == 2, "expected len == 2, got %u\n", len );
+ ok( len == 2, "expected len == 2, got %lu\n", len );
/* install state doesn't seem to matter */
len = sizeof(drive);
@@ -8588,7 +8588,7 @@ static void test_costs(void)
cost = temp = 0xdead;
r = MsiEnumComponentCostsA( hpkg, "one", 0, INSTALLSTATE_LOCAL, drive, &len, &cost, &temp );
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r );
- ok( len == 2, "expected len == 2, got %u\n", len );
+ ok( len == 2, "expected len == 2, got %lu\n", len );
ok( drive[0], "expected a drive\n" );
ok( cost && cost != 0xdead, "expected cost > 0, got %d\n", cost );
ok( !temp, "expected temp == 0, got %d\n", temp );
@@ -8598,7 +8598,7 @@ static void test_costs(void)
cost = temp = 0xdead;
r = MsiEnumComponentCostsA( hpkg, "two", 0, INSTALLSTATE_LOCAL, drive, &len, &cost, &temp );
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r );
- ok( len == 2, "expected len == 2, got %u\n", len );
+ ok( len == 2, "expected len == 2, got %lu\n", len );
ok( drive[0], "expected a drive\n" );
ok( !cost, "expected cost == 0, got %d\n", cost );
ok( !temp, "expected temp == 0, got %d\n", temp );
@@ -8608,7 +8608,7 @@ static void test_costs(void)
cost = temp = 0xdead;
r = MsiEnumComponentCostsA( hpkg, "", 0, INSTALLSTATE_UNKNOWN, drive, &len, &cost, &temp );
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r );
- ok( len == 2, "expected len == 2, got %u\n", len );
+ ok( len == 2, "expected len == 2, got %lu\n", len );
ok( drive[0], "expected a drive\n" );
ok( !cost, "expected cost == 0, got %d\n", cost );
ok( temp && temp != 0xdead, "expected temp > 0, got %d\n", temp );
@@ -8654,7 +8654,7 @@ static void test_MsiDatabaseCommit(void)
create_property_table( hdb );
- sprintf( package, "#%u", hdb );
+ sprintf( package, "#%lu", hdb );
r = MsiOpenPackageA( package, &hpkg );
if (r == ERROR_INSTALL_PACKAGE_REJECTED)
{
diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c
index 8e8bd356e71..9d46f493e08 100644
--- a/dlls/msi/tests/patch.c
+++ b/dlls/msi/tests/patch.c
@@ -681,7 +681,7 @@ static void write_tables( IStorage *stg, const struct table_data *tables, UINT n
r = IStorage_CreateStream( stg, tables[i].name, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm );
if (FAILED( r ))
{
- ok( 0, "failed to create stream 0x%08x\n", r );
+ ok( 0, "failed to create stream %#lx\n", r );
continue;
}
@@ -709,29 +709,29 @@ static void create_patch( const char *filename )
r = StgCreateDocfile( filenameW, mode, 0, &stg );
free( filenameW );
- ok( r == S_OK, "failed to create storage 0x%08x\n", r );
+ ok( r == S_OK, "failed to create storage %#lx\n", r );
if (!stg)
return;
r = IStorage_SetClass( stg, &CLSID_MsiPatch );
- ok( r == S_OK, "failed to set storage type 0x%08x\n", r );
+ ok( r == S_OK, "failed to set storage type %#lx\n", r );
write_tables( stg, table_patch_data, ARRAY_SIZE( table_patch_data ));
r = IStorage_CreateStorage( stg, p_name7, mode, 0, 0, &stg1 );
- ok( r == S_OK, "failed to create substorage 0x%08x\n", r );
+ ok( r == S_OK, "failed to create substorage %#lx\n", r );
r = IStorage_SetClass( stg1, &CLSID_MsiTransform );
- ok( r == S_OK, "failed to set storage type 0x%08x\n", r );
+ ok( r == S_OK, "failed to set storage type %#lx\n", r );
write_tables( stg1, table_transform1_data, ARRAY_SIZE( table_transform1_data ));
IStorage_Release( stg1 );
r = IStorage_CreateStorage( stg, p_name8, mode, 0, 0, &stg2 );
- ok( r == S_OK, "failed to create substorage 0x%08x\n", r );
+ ok( r == S_OK, "failed to create substorage %#lx\n", r );
r = IStorage_SetClass( stg2, &CLSID_MsiTransform );
- ok( r == S_OK, "failed to set storage type 0x%08x\n", r );
+ ok( r == S_OK, "failed to set storage type %#lx\n", r );
write_tables( stg2, table_transform2_data, ARRAY_SIZE( table_transform2_data ));
IStorage_Release( stg2 );
@@ -774,7 +774,7 @@ static void test_simple_patch( void )
}
size = get_pf_file_size( "msitest\\patch.txt" );
- ok( size == 1000, "expected 1000, got %u\n", size );
+ ok( size == 1000, "expected 1000, got %lu\n", size );
size = sizeof(install_source);
r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}",
@@ -840,9 +840,9 @@ static void test_simple_patch( void )
}
size = get_pf_file_size( "msitest\\patch.txt" );
- ok( size == 1002, "expected 1002, got %u\n", size );
+ ok( size == 1002, "expected 1002, got %lu\n", size );
size = get_pf_file_size( "msitest\\file.txt" );
- ok( size == 1000, "expected 1000, got %u\n", size );
+ ok( size == 1000, "expected 1000, got %lu\n", size );
/* show that MsiOpenPackage applies registered patches */
r = MsiOpenPackageA( path, &hpackage );
@@ -1064,7 +1064,7 @@ static char *get_string( MSIHANDLE hdb, UINT field, const char *query)
ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );
if (r == ERROR_SUCCESS)
{
- UINT size = MAX_PATH;
+ DWORD size = MAX_PATH;
r = MsiRecordGetStringA( hrec, field, ret, &size );
ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
MsiCloseHandle( hrec );
@@ -1272,7 +1272,8 @@ cleanup:
static void test_patch_registration( void )
{
- UINT r, size;
+ UINT r;
+ DWORD size;
char buffer[MAX_PATH], patch_code[39];
if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA || !pMsiEnumPatchesExA)
diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c
index 407d756caae..fb778104ee1 100644
--- a/dlls/msi/tests/record.c
+++ b/dlls/msi/tests/record.c
@@ -410,21 +410,21 @@ static void test_MsiRecordGetString(void)
sz = MAX_PATH;
r = MsiRecordGetStringA(rec, 1, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r);
- ok(sz == 0, "Expected 0, got %d\n",sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiRecordGetStringA(rec, 10, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
MsiCloseHandle(rec);
@@ -437,14 +437,14 @@ static void test_MsiRecordGetString(void)
sz = MAX_PATH;
r = MsiRecordGetStringA(rec, 1, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r);
- ok(sz == 1, "Expected 1, got %d\n",sz);
+ ok(sz == 1, "Expected 1, got %lu\n",sz);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
- ok(sz == 1, "Expected 1, got %d\n", sz);
+ ok(sz == 1, "Expected 1, got %lu\n", sz);
r = MsiRecordSetInteger(rec, 1, -5);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -454,7 +454,7 @@ static void test_MsiRecordGetString(void)
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ ok(sz == 2, "Expected 2, got %lu\n", sz);
MsiCloseHandle(rec);
}
@@ -508,7 +508,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == TRUE, "Expected TRUE, got %d\n", r);
@@ -527,7 +527,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == TRUE, "Expected TRUE, got %d\n", r);
@@ -546,7 +546,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ ok(sz == 0, "Expected 0, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == TRUE, "Expected TRUE, got %d\n", r);
@@ -556,7 +556,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf);
- ok(sz == 7, "Expected 7, got %d\n", sz);
+ ok(sz == 7, "Expected 7, got %lu\n", sz);
MsiCloseHandle(rec);
@@ -597,7 +597,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf);
- ok(sz == 5, "Expected 5, got %d\n", sz);
+ ok(sz == 5, "Expected 5, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == FALSE, "Expected FALSE, got %d\n", r);
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index d141307e0ba..1e794caaf5a 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -124,10 +124,10 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed)
int size;
hr = CoCreateGuid(&guid);
- ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
+ ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr);
size = StringFromGUID2(&guid, guidW, MAX_PATH);
- ok(size == 39, "Expected 39, got %d\n", hr);
+ ok(size == 39, "Expected 39, got %#lx\n", hr);
WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL);
squash_guid(guidW, squashedW);
@@ -297,7 +297,7 @@ static void test_MsiSourceListGetInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
size = MAX_PATH;
@@ -308,7 +308,7 @@ static void test_MsiSourceListGetInfo(void)
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
res = RegCreateKeyA(userkey, "SourceList", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
size = MAX_PATH;
@@ -316,12 +316,12 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
data = "msitest.msi";
res = RegSetValueExA(hkey, "PackageName", 0, REG_SZ, (const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* PackageName value exists */
size = 0xdeadbeef;
@@ -329,7 +329,7 @@ static void test_MsiSourceListGetInfo(void)
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, NULL, &size);
ok(r == ERROR_SUCCESS || r == ERROR_INVALID_PARAMETER,
"Expected ERROR_SUCCESS or ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(size == 11 || r != ERROR_SUCCESS, "Expected 11, got %d\n", size);
+ ok(size == 11 || r != ERROR_SUCCESS, "Expected 11, got %lu\n", size);
/* read the value, don't change size */
size = 11;
@@ -338,7 +338,7 @@ static void test_MsiSourceListGetInfo(void)
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected 'aaa', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
/* read the value, fix size */
size++;
@@ -346,7 +346,7 @@ static void test_MsiSourceListGetInfo(void)
MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "msitest.msi"), "Expected 'msitest.msi', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
/* empty property now that product key exists */
size = MAX_PATH;
@@ -354,7 +354,7 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, "", value, &size);
ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "Expected %d, got %lu\n", MAX_PATH, size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
/* nonexistent property now that product key exists */
@@ -363,12 +363,12 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, "nonexistent", value, &size);
ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "Expected %d, got %lu\n", MAX_PATH, size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
data = "tester";
res = RegSetValueExA(hkey, "nonexistent", 0, REG_SZ, (const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* nonexistent property now that nonexistent value exists */
size = MAX_PATH;
@@ -376,7 +376,7 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, "nonexistent", value, &size);
ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "Expected %d, got %lu\n", MAX_PATH, size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
/* invalid option now that product key exists */
@@ -384,7 +384,7 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
4, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
/* INSTALLPROPERTY_MEDIAPACKAGEPATH, media key does not exist */
size = MAX_PATH;
@@ -394,15 +394,15 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
res = RegCreateKeyA(hkey, "Media", &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
data = "path";
res = RegSetValueExA(media, "MediaPackage", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_MEDIAPACKAGEPATH */
size = MAX_PATH;
@@ -411,13 +411,13 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "path"), "Expected \"path\", got \"%s\"\n", value);
- ok(size == 4, "Expected 4, got %d\n", size);
+ ok(size == 4, "Expected 4, got %lu\n", size);
/* INSTALLPROPERTY_DISKPROMPT */
data = "prompt";
res = RegSetValueExA(media, "DiskPrompt", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
@@ -425,7 +425,7 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "prompt"), "Expected \"prompt\", got \"%s\"\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
/* LastUsedSource value doesn't exist */
RegDeleteValueA(hkey, "LastUsedSource");
@@ -434,9 +434,9 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA,
value, &size);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
size = MAX_PATH;
usersidW = strdupAW(usersid);
@@ -445,16 +445,16 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoW(prodcodeW, usersidW, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW,
valueW, &size);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!valueW[0], "Expected \"\"");
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
free(usersidW);
free(prodcodeW);
data = "";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDSOURCE, source is empty */
size = MAX_PATH;
@@ -463,12 +463,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
data = "source";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDSOURCE */
size = MAX_PATH;
@@ -477,7 +477,7 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "source"), "Expected \"source\", got \"%s\"\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
/* INSTALLPROPERTY_LASTUSEDSOURCE, size is too short */
size = 4;
@@ -487,7 +487,7 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got \"%s\"\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
/* INSTALLPROPERTY_LASTUSEDSOURCE, size is exactly 6 */
size = 6;
@@ -497,12 +497,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got \"%s\"\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
data = "a;source";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDSOURCE, one semi-colon */
size = MAX_PATH;
@@ -511,12 +511,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "source"), "Expected \"source\", got \"%s\"\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
data = "a:source";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDSOURCE, one colon */
size = MAX_PATH;
@@ -525,7 +525,7 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "a:source"), "Expected \"a:source\", got \"%s\"\n", value);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
/* INSTALLPROPERTY_LASTUSEDTYPE, invalid source format */
size = MAX_PATH;
@@ -534,12 +534,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
data = "x;y;z";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDTYPE, invalid source format */
size = MAX_PATH;
@@ -548,12 +548,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
data = "n;y;z";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDTYPE */
size = MAX_PATH;
@@ -562,12 +562,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
data = "negatory";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDTYPE */
size = MAX_PATH;
@@ -576,12 +576,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
data = "megatron";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDTYPE */
size = MAX_PATH;
@@ -590,12 +590,12 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "m"), "Expected \"m\", got \"%s\"\n", value);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
data = "useless";
res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ,
(const BYTE *)data, lstrlenA(data) + 1);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* INSTALLPROPERTY_LASTUSEDTYPE */
size = MAX_PATH;
@@ -604,7 +604,7 @@ static void test_MsiSourceListGetInfo(void)
value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "u"), "Expected \"u\", got \"%s\"\n", value);
- ok(size == 1, "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %lu\n", size);
RegDeleteValueA(media, "MediaPackage");
RegDeleteValueA(media, "DiskPrompt");
@@ -623,14 +623,14 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PATCH, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "Expected %d, got %lu\n", MAX_PATH, size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Patches\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* patch key exists
* NOTE: using prodcode guid, but it really doesn't matter
@@ -640,11 +640,11 @@ static void test_MsiSourceListGetInfo(void)
r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PATCH, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
- ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);
+ ok(size == MAX_PATH, "Expected %d, got %lu\n", MAX_PATH, size);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value);
res = RegCreateKeyA(userkey, "SourceList", &hkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
size = MAX_PATH;
@@ -653,7 +653,7 @@ static void test_MsiSourceListGetInfo(void)
MSICODE_PATCH, INSTALLPROPERTY_PACKAGENAMEA, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value);
- ok(size == 0, "Expected 0, got %d\n", size);
+ ok(size == 0, "Expected 0, got %lu\n", size);
RegDeleteKeyA(hkey, "");
RegDeleteKeyA(userkey, "");
@@ -743,7 +743,7 @@ static void test_MsiSourceListAddSourceEx(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -752,7 +752,7 @@ static void test_MsiSourceListAddSourceEx(void)
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(url);
/* SourceList key exists */
@@ -762,13 +762,13 @@ static void test_MsiSourceListAddSourceEx(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
res = RegOpenKeyA(userkey, "SourceList\\URL", &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
/* add another source, index 0 */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -778,15 +778,15 @@ static void test_MsiSourceListAddSourceEx(void)
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "2", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "another/"), "Expected 'another/', got %s\n", value);
- ok(size == 9, "Expected 9, got %d\n", size);
+ ok(size == 9, "Expected 9, got %lu\n", size);
/* add another source, index 1 */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -796,21 +796,21 @@ static void test_MsiSourceListAddSourceEx(void)
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "third/"), "Expected 'third/', got %s\n", value);
- ok(size == 7, "Expected 7, got %d\n", size);
+ ok(size == 7, "Expected 7, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "2", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "3", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "another/"), "Expected 'another/', got %s\n", value);
- ok(size == 9, "Expected 9, got %d\n", size);
+ ok(size == 9, "Expected 9, got %lu\n", size);
/* add another source, index > N */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -820,27 +820,27 @@ static void test_MsiSourceListAddSourceEx(void)
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "third/"), "Expected 'third/', got %s\n", value);
- ok(size == 7, "Expected 7, got %d\n", size);
+ ok(size == 7, "Expected 7, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "2", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "3", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "another/"), "Expected 'another/', got %s\n", value);
- ok(size == 9, "Expected 9, got %d\n", size);
+ ok(size == 9, "Expected 9, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "4", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "last/"), "Expected 'last/', got %s\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
/* just MSISOURCETYPE_NETWORK */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -849,13 +849,13 @@ static void test_MsiSourceListAddSourceEx(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
res = RegOpenKeyA(userkey, "SourceList\\Net", &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(net, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "source\\"), "Expected 'source\\', got %s\n", value);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
/* just MSISOURCETYPE_URL */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -865,33 +865,33 @@ static void test_MsiSourceListAddSourceEx(void)
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "third/"), "Expected 'third/', got %s\n", value);
- ok(size == 7, "Expected 7, got %d\n", size);
+ ok(size == 7, "Expected 7, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "2", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "3", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "another/"), "Expected 'another/', got %s\n", value);
- ok(size == 9, "Expected 9, got %d\n", size);
+ ok(size == 9, "Expected 9, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "4", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "last/"), "Expected 'last/', got %s\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "5", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "source/"), "Expected 'source/', got %s\n", value);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
/* NULL szUserSid */
r = pMsiSourceListAddSourceExA(prodcode, NULL,
@@ -901,15 +901,15 @@ static void test_MsiSourceListAddSourceEx(void)
size = MAX_PATH;
res = RegQueryValueExA(net, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "source\\"), "Expected 'source\\', got %s\n", value);
- ok(size == 8, "Expected 8, got %d\n", size);
+ ok(size == 8, "Expected 8, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(net, "2", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "nousersid\\"), "Expected 'nousersid\\', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
/* invalid options, must have source type */
r = pMsiSourceListAddSourceExA(prodcode, usersid,
@@ -949,7 +949,7 @@ static void test_MsiSourceListAddSourceEx(void)
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto machine_tests;
}
@@ -960,7 +960,7 @@ static void test_MsiSourceListAddSourceEx(void)
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &hkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(hkey);
/* SourceList exists */
@@ -970,13 +970,13 @@ static void test_MsiSourceListAddSourceEx(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
RegCloseKey(url);
@@ -988,19 +988,19 @@ static void test_MsiSourceListAddSourceEx(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
size = MAX_PATH;
res = RegQueryValueExA(url, "2", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "another/"), "Expected 'another/', got %s\n", value);
- ok(size == 9, "Expected 9, got %d\n", size);
+ ok(size == 9, "Expected 9, got %lu\n", size);
RegCloseKey(url);
RegCloseKey(prodkey);
@@ -1025,7 +1025,7 @@ machine_tests:
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
LocalFree(usersid);
return;
}
@@ -1037,7 +1037,7 @@ machine_tests:
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &hkey, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
RegCloseKey(hkey);
/* SourceList exists */
@@ -1051,13 +1051,13 @@ machine_tests:
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
size = MAX_PATH;
res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value);
- ok(size == 11, "Expected 11, got %d\n", size);
+ ok(size == 11, "Expected 11, got %lu\n", size);
RegCloseKey(url);
RegCloseKey(prodkey);
@@ -1102,21 +1102,21 @@ static void test_MsiSourceListEnumSources(void)
r = pMsiSourceListEnumSourcesA(NULL, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size);
+ ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", size);
/* empty szProductCodeOrPatchCode */
size = 0xdeadbeef;
r = pMsiSourceListEnumSourcesA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size);
+ ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", size);
/* garbage szProductCodeOrPatchCode */
size = 0xdeadbeef;
r = pMsiSourceListEnumSourcesA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size);
+ ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", size);
/* guid without brackets */
size = 0xdeadbeef;
@@ -1124,7 +1124,7 @@ static void test_MsiSourceListEnumSources(void)
usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size);
+ ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", size);
/* guid with brackets */
size = 0xdeadbeef;
@@ -1132,7 +1132,7 @@ static void test_MsiSourceListEnumSources(void)
usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
- ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size);
+ ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", size);
/* MSIINSTALLCONTEXT_USERUNMANAGED */
@@ -1143,13 +1143,13 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
size = MAX_PATH;
@@ -1159,10 +1159,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyA(userkey, "SourceList", &source);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
size = MAX_PATH;
@@ -1172,10 +1172,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyA(source, "URL", &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URL key exists */
size = MAX_PATH;
@@ -1185,16 +1185,16 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegSetValueExA(url, "1", 0, REG_SZ, (LPBYTE)"first", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(url, "2", 0, REG_SZ, (LPBYTE)"second", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
res = RegSetValueExA(url, "4", 0, REG_SZ, (LPBYTE)"fourth", 7);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* sources exist */
size = MAX_PATH;
@@ -1204,7 +1204,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* try index 0 again */
size = MAX_PATH;
@@ -1214,7 +1214,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* both szSource and pcchSource are NULL, index 0 */
r = pMsiSourceListEnumSourcesA(prodcode, usersid,
@@ -1236,7 +1236,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* szSource is non-NULL while pcchSource is NULL */
lstrcpyA(value, "aaa");
@@ -1255,7 +1255,7 @@ static void test_MsiSourceListEnumSources(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* reset the enumeration */
size = MAX_PATH;
@@ -1265,7 +1265,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* try index 1 */
size = MAX_PATH;
@@ -1275,7 +1275,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 1, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "second"), "Expected \"second\", got %s\n", value);
- ok(size == 6, "Expected 6, got %d\n", size);
+ ok(size == 6, "Expected 6, got %lu\n", size);
/* try index 1 again */
size = MAX_PATH;
@@ -1286,7 +1286,7 @@ static void test_MsiSourceListEnumSources(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* try index 2 */
size = MAX_PATH;
@@ -1296,7 +1296,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 2, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* try index < 0 */
size = MAX_PATH;
@@ -1307,7 +1307,7 @@ static void test_MsiSourceListEnumSources(void)
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* NULL szUserSid */
size = MAX_PATH;
@@ -1317,7 +1317,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* invalid dwOptions, must be one of MSICODE_ and MSISOURCETYPE_ */
size = MAX_PATH;
@@ -1327,7 +1327,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* invalid dwOptions, must be one of MSICODE_ and MSISOURCETYPE_ */
size = MAX_PATH;
@@ -1337,7 +1337,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PATCH, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* invalid dwOptions, must be one of MSICODE_ and MSISOURCETYPE_ */
size = MAX_PATH;
@@ -1348,7 +1348,7 @@ static void test_MsiSourceListEnumSources(void)
0, value, &size);
ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* invalid dwOptions, must be one of MSICODE_ and MSISOURCETYPE_ */
size = MAX_PATH;
@@ -1359,7 +1359,7 @@ static void test_MsiSourceListEnumSources(void)
0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
RegDeleteValueA(url, "1");
RegDeleteValueA(url, "2");
@@ -1375,10 +1375,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyA(source, "Net", &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Net key exists */
size = MAX_PATH;
@@ -1388,10 +1388,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegSetValueExA(net, "1", 0, REG_SZ, (LPBYTE)"first", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* sources exist */
size = MAX_PATH;
@@ -1401,7 +1401,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
RegDeleteValueA(net, "1");
RegDeleteKeyA(net, "");
@@ -1420,7 +1420,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
lstrcatA(keypath, usersid);
@@ -1430,7 +1430,7 @@ static void test_MsiSourceListEnumSources(void)
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto machine_tests;
}
@@ -1442,10 +1442,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(userkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
size = MAX_PATH;
@@ -1455,10 +1455,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(source, "URL", 0, NULL, 0, access, NULL, &url, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URL key exists */
size = MAX_PATH;
@@ -1468,10 +1468,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegSetValueExA(url, "1", 0, REG_SZ, (LPBYTE)"first", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* sources exist */
size = MAX_PATH;
@@ -1481,7 +1481,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* NULL szUserSid */
size = MAX_PATH;
@@ -1491,7 +1491,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
RegDeleteValueA(url, "1");
delete_key(url, "", access);
@@ -1505,10 +1505,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(source, "Net", 0, NULL, 0, access, NULL, &net, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Net key exists */
size = MAX_PATH;
@@ -1518,10 +1518,10 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegSetValueExA(net, "1", 0, REG_SZ, (LPBYTE)"first", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* sources exist */
size = MAX_PATH;
@@ -1531,7 +1531,7 @@ static void test_MsiSourceListEnumSources(void)
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
RegDeleteValueA(net, "1");
delete_key(net, "", access);
@@ -1552,7 +1552,7 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
/* szUserSid is NULL */
size = MAX_PATH;
@@ -1562,7 +1562,7 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
@@ -1570,7 +1570,7 @@ machine_tests:
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
LocalFree(usersid);
return;
}
@@ -1583,10 +1583,10 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
size = MAX_PATH;
@@ -1596,10 +1596,10 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(source, "URL", 0, NULL, 0, access, NULL, &url, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* URL key exists */
size = MAX_PATH;
@@ -1609,10 +1609,10 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegSetValueExA(url, "1", 0, REG_SZ, (LPBYTE)"first", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* sources exist */
size = MAX_PATH;
@@ -1622,7 +1622,7 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
/* NULL szUserSid */
size = MAX_PATH;
@@ -1632,7 +1632,7 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
RegDeleteValueA(url, "1");
delete_key(url, "", access);
@@ -1646,10 +1646,10 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegCreateKeyExA(source, "Net", 0, NULL, 0, access, NULL, &net, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Net key exists */
size = MAX_PATH;
@@ -1659,10 +1659,10 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
- ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
+ ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size);
res = RegSetValueExA(net, "1", 0, REG_SZ, (LPBYTE)"first", 6);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* sources exist */
size = MAX_PATH;
@@ -1672,7 +1672,7 @@ machine_tests:
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(value, "first"), "Expected \"first\", got %s\n", value);
- ok(size == 5, "Expected 5, got %d\n", size);
+ ok(size == 5, "Expected 5, got %lu\n", size);
RegDeleteValueA(net, "1");
delete_key(net, "", access);
@@ -1808,7 +1808,7 @@ static void test_MsiSourceListSetInfo(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
r = pMsiSourceListSetInfoA(prodcode, NULL,
@@ -1818,7 +1818,7 @@ static void test_MsiSourceListSetInfo(void)
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &source);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists, no source type */
r = pMsiSourceListSetInfoA(prodcode, NULL,
@@ -1828,7 +1828,7 @@ static void test_MsiSourceListSetInfo(void)
/* Media key is created by MsiSourceListSetInfo */
res = RegOpenKeyA(source, "Media", &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(media, "MediaPackage", "path");
/* set the info again */
@@ -1921,7 +1921,7 @@ static void test_MsiSourceListSetInfo(void)
/* Net key is created by MsiSourceListSetInfo */
res = RegOpenKeyA(source, "Net", &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(net, "1", "source\\")
CHECK_REG_STR(source, "LastUsedSource", "n;1;source");
@@ -1944,7 +1944,7 @@ static void test_MsiSourceListSetInfo(void)
/* URL key is created by MsiSourceListSetInfo */
res = RegOpenKeyA(source, "URL", &url);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(url, "1", "source/");
CHECK_REG_STR(source, "LastUsedSource", "u;1;source");
@@ -2029,7 +2029,7 @@ static void test_MsiSourceListSetInfo(void)
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto machine_tests;
}
@@ -2041,7 +2041,7 @@ static void test_MsiSourceListSetInfo(void)
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(userkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists, no source type */
r = pMsiSourceListSetInfoA(prodcode, NULL,
@@ -2051,7 +2051,7 @@ static void test_MsiSourceListSetInfo(void)
/* Media key is created by MsiSourceListSetInfo */
res = RegOpenKeyExA(source, "Media", 0, access, &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(media, "MediaPackage", "path");
RegDeleteValueA(media, "MediaPackage");
@@ -2071,7 +2071,7 @@ machine_tests:
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
LocalFree(usersid);
return;
}
@@ -2084,7 +2084,7 @@ machine_tests:
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists, no source type */
r = pMsiSourceListSetInfoA(prodcode, NULL,
@@ -2099,7 +2099,7 @@ machine_tests:
/* Media key is created by MsiSourceListSetInfo */
res = RegOpenKeyExA(source, "Media", 0, access, &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(media, "MediaPackage", "path");
/* szUserSid is non-NULL */
@@ -2217,7 +2217,7 @@ static void test_MsiSourceListAddMediaDisk(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
r = pMsiSourceListAddMediaDiskA(prodcode, usersid,
@@ -2227,7 +2227,7 @@ static void test_MsiSourceListAddMediaDisk(void)
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &source);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
r = pMsiSourceListAddMediaDiskA(prodcode, usersid,
@@ -2237,7 +2237,7 @@ static void test_MsiSourceListAddMediaDisk(void)
/* Media subkey is created by MsiSourceListAddMediaDisk */
res = RegOpenKeyA(source, "Media", &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(media, "1", "label;prompt");
@@ -2350,7 +2350,7 @@ static void test_MsiSourceListAddMediaDisk(void)
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto machine_tests;
}
@@ -2362,7 +2362,7 @@ static void test_MsiSourceListAddMediaDisk(void)
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(userkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
r = pMsiSourceListAddMediaDiskA(prodcode, usersid,
@@ -2372,7 +2372,7 @@ static void test_MsiSourceListAddMediaDisk(void)
/* Media subkey is created by MsiSourceListAddMediaDisk */
res = RegOpenKeyExA(source, "Media", 0, access, &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(media, "1", "label;prompt");
@@ -2393,7 +2393,7 @@ machine_tests:
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
LocalFree(usersid);
return;
}
@@ -2406,7 +2406,7 @@ machine_tests:
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
r = pMsiSourceListAddMediaDiskA(prodcode, NULL,
@@ -2421,7 +2421,7 @@ machine_tests:
/* Media subkey is created by MsiSourceListAddMediaDisk */
res = RegOpenKeyExA(source, "Media", 0, access, &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(media, "1", "label;prompt");
@@ -2557,7 +2557,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
lstrcatA(keypath, prod_squashed);
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* user product key exists */
labelsz = sizeof(label);
@@ -2569,7 +2569,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &source);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
id = 0xbeef;
@@ -2582,14 +2582,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", labelsz);
+ ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", promptsz);
+ ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", promptsz);
res = RegCreateKeyA(source, "Media", &media);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Media key exists */
id = 0xbeef;
@@ -2602,14 +2602,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", labelsz);
+ ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", promptsz);
+ ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", promptsz);
res = RegSetValueExA(media, "1", 0, REG_SZ, (LPBYTE)"label;prompt", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* disk exists */
id = 0;
@@ -2621,14 +2621,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
res = RegSetValueExA(media, "2", 0, REG_SZ, (LPBYTE)"one;two", 8);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* now disk 2 exists, get the sizes */
id = 0;
@@ -2641,9 +2641,9 @@ static void test_MsiSourceListEnumMediaDisks(void)
"Expected ERROR_SUCCESS or ERROR_INVALID_PARAMETER, got %d\n", r);
if (r == ERROR_SUCCESS)
{
- ok(id == 2, "Expected 2, got %d\n", id);
- ok(labelsz == 3, "Expected 3, got %d\n", labelsz);
- ok(promptsz == 3, "Expected 3, got %d\n", promptsz);
+ ok(id == 2, "Expected 2, got %lu\n", id);
+ ok(labelsz == 3, "Expected 3, got %lu\n", labelsz);
+ ok(promptsz == 3, "Expected 3, got %lu\n", promptsz);
}
/* now fill in the values */
@@ -2659,23 +2659,23 @@ static void test_MsiSourceListEnumMediaDisks(void)
"Expected ERROR_SUCCESS or ERROR_INVALID_PARAMETER, got %d\n", r);
if (r == ERROR_SUCCESS)
{
- ok(id == 2, "Expected 2, got %d\n", id);
+ ok(id == 2, "Expected 2, got %lu\n", id);
ok(!lstrcmpA(label, "one"), "Expected \"one\", got \"%s\"\n", label);
- ok(labelsz == 3, "Expected 3, got %d\n", labelsz);
+ ok(labelsz == 3, "Expected 3, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "two"), "Expected \"two\", got \"%s\"\n", prompt);
- ok(promptsz == 3, "Expected 3, got %d\n", promptsz);
+ ok(promptsz == 3, "Expected 3, got %lu\n", promptsz);
}
else if (r == ERROR_INVALID_PARAMETER)
{
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
+ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %d\n", promptsz);
+ ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", promptsz);
}
res = RegSetValueExA(media, "4", 0, REG_SZ, (LPBYTE)"three;four", 11);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* disks 1, 2, 4 exist, reset the enumeration */
id = 0;
@@ -2687,11 +2687,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* disks 1, 2, 4 exist, index 1 */
id = 0;
@@ -2703,11 +2703,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 1, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 2, "Expected 2, got %d\n", id);
+ ok(id == 2, "Expected 2, got %lu\n", id);
ok(!lstrcmpA(label, "one"), "Expected \"one\", got \"%s\"\n", label);
- ok(labelsz == 3, "Expected 3, got %d\n", labelsz);
+ ok(labelsz == 3, "Expected 3, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "two"), "Expected \"two\", got \"%s\"\n", prompt);
- ok(promptsz == 3, "Expected 3, got %d\n", promptsz);
+ ok(promptsz == 3, "Expected 3, got %lu\n", promptsz);
/* disks 1, 2, 4 exist, index 2 */
id = 0;
@@ -2719,11 +2719,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 2, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 4, "Expected 4, got %d\n", id);
+ ok(id == 4, "Expected 4, got %lu\n", id);
ok(!lstrcmpA(label, "three"), "Expected \"three\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "four"), "Expected \"four\", got \"%s\"\n", prompt);
- ok(promptsz == 4, "Expected 4, got %d\n", promptsz);
+ ok(promptsz == 4, "Expected 4, got %lu\n", promptsz);
/* disks 1, 2, 4 exist, index 3, invalid */
id = 0xbeef;
@@ -2736,11 +2736,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
+ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %d\n", promptsz);
+ ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", promptsz);
/* disks 1, 2, 4 exist, reset the enumeration */
id = 0;
@@ -2752,11 +2752,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* try index 0 again */
id = 0;
@@ -2768,11 +2768,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* jump to index 2 */
id = 0xbeef;
@@ -2784,11 +2784,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 2, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
+ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %d\n", promptsz);
+ ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", promptsz);
/* after error, try index 1 */
id = 0xbeef;
@@ -2800,11 +2800,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 1, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 2, "Expected 2, got %d\n", id);
+ ok(id == 2, "Expected 2, got %lu\n", id);
ok(!lstrcmpA(label, "one"), "Expected \"one\", got \"%s\"\n", label);
- ok(labelsz == 3, "Expected 3, got %d\n", labelsz);
+ ok(labelsz == 3, "Expected 3, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "two"), "Expected \"two\", got \"%s\"\n", prompt);
- ok(promptsz == 3, "Expected 3, got %d\n", promptsz);
+ ok(promptsz == 3, "Expected 3, got %lu\n", promptsz);
/* try index 1 again */
id = 0xbeef;
@@ -2816,11 +2816,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 1, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
+ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %d\n", promptsz);
+ ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", promptsz);
/* NULL pdwDiskId */
lstrcpyA(label, "aaa");
@@ -2832,9 +2832,9 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* szVolumeLabel is NULL */
id = 0;
@@ -2848,10 +2848,10 @@ static void test_MsiSourceListEnumMediaDisks(void)
"Expected ERROR_SUCCESS or ERROR_INVALID_PARAMETER, got %d\n", r);
if (r == ERROR_SUCCESS)
{
- ok(id == 1, "Expected 1, got %d\n", id);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(id == 1, "Expected 1, got %lu\n", id);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
}
/* szVolumeLabel and pcchVolumeLabel are NULL */
@@ -2862,9 +2862,9 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, NULL, NULL,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* szVolumeLabel is non-NULL while pcchVolumeLabel is NULL */
id = 0xbeef;
@@ -2878,10 +2878,10 @@ static void test_MsiSourceListEnumMediaDisks(void)
"Expected ERROR_SUCCESS or ERROR_INVALID_PARAMETER, got %d\n", r);
if (r == ERROR_SUCCESS)
{
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
}
/* szDiskPrompt is NULL */
@@ -2895,10 +2895,10 @@ static void test_MsiSourceListEnumMediaDisks(void)
ok(r == ERROR_SUCCESS || r == ERROR_INVALID_PARAMETER, "Expected ERROR_SUCCESS, got %d\n", r);
if (r == ERROR_SUCCESS)
{
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
}
/* szDiskPrompt and pcchDiskPrompt are NULL */
@@ -2909,9 +2909,9 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
/* szDiskPrompt is non-NULL while pcchDiskPrompt is NULL */
id = 0xbeef;
@@ -2923,9 +2923,9 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, NULL);
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
+ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
/* pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */
@@ -2936,7 +2936,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
/* szVolumeLabel, pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */
id = 0;
@@ -2944,7 +2944,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, NULL, NULL,
NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
/* pcchVolumeLabel is exactly 5 */
lstrcpyA(label, "aaa");
@@ -2956,9 +2956,9 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* pcchDiskPrompt is exactly 6 */
lstrcpyA(label, "aaa");
@@ -2970,12 +2970,12 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
res = RegSetValueExA(media, "1", 0, REG_SZ, (LPBYTE)"label", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* no semicolon */
id = 0;
@@ -2987,14 +2987,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "label"), "Expected \"label\", got \"%s\"\n", prompt);
- ok(promptsz == 5, "Expected 5, got %d\n", promptsz);
+ ok(promptsz == 5, "Expected 5, got %lu\n", promptsz);
res = RegSetValueExA(media, "1", 0, REG_SZ, (LPBYTE)"label;", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* semicolon, no disk prompt */
id = 0;
@@ -3006,14 +3006,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, ""), "Expected \"\", got \"%s\"\n", prompt);
- ok(promptsz == 0, "Expected 0, got %d\n", promptsz);
+ ok(promptsz == 0, "Expected 0, got %lu\n", promptsz);
res = RegSetValueExA(media, "1", 0, REG_SZ, (LPBYTE)";prompt", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* semicolon, label doesn't exist */
id = 0;
@@ -3025,14 +3025,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, ""), "Expected \"\", got \"%s\"\n", label);
- ok(labelsz == 0, "Expected 0, got %d\n", labelsz);
+ ok(labelsz == 0, "Expected 0, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
res = RegSetValueExA(media, "1", 0, REG_SZ, (LPBYTE)";", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* semicolon, neither label nor disk prompt exist */
id = 0;
@@ -3044,15 +3044,15 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, ""), "Expected \"\", got \"%s\"\n", label);
- ok(labelsz == 0, "Expected 0, got %d\n", labelsz);
+ ok(labelsz == 0, "Expected 0, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, ""), "Expected \"\", got \"%s\"\n", prompt);
- ok(promptsz == 0, "Expected 0, got %d\n", promptsz);
+ ok(promptsz == 0, "Expected 0, got %lu\n", promptsz);
val = 42;
res = RegSetValueExA(media, "1", 0, REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* type is REG_DWORD */
id = 0;
@@ -3064,11 +3064,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 1, "Expected 1, got %d\n", id);
+ ok(id == 1, "Expected 1, got %lu\n", id);
ok(!lstrcmpA(label, "#42"), "Expected \"#42\", got \"%s\"\n", label);
- ok(labelsz == 3, "Expected 3, got %d\n", labelsz);
+ ok(labelsz == 3, "Expected 3, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "#42"), "Expected \"#42\", got \"%s\"\n", prompt);
- ok(promptsz == 3, "Expected 3, got %d\n", promptsz);
+ ok(promptsz == 3, "Expected 3, got %lu\n", promptsz);
RegDeleteValueA(media, "1");
RegDeleteValueA(media, "2");
@@ -3090,7 +3090,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto machine_tests;
}
@@ -3102,7 +3102,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(userkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
id = 0xbeef;
@@ -3115,14 +3115,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", labelsz);
+ ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", promptsz);
+ ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", promptsz);
res = RegCreateKeyExA(source, "Media", 0, NULL, 0, access, NULL, &media, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Media key exists */
id = 0xbeef;
@@ -3135,14 +3135,14 @@ static void test_MsiSourceListEnumMediaDisks(void)
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", labelsz);
+ ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", promptsz);
+ ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", promptsz);
res = RegSetValueExA(media, "2", 0, REG_SZ, (LPBYTE)"label;prompt", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* disk exists, but no id 1 */
id = 0;
@@ -3154,11 +3154,11 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 2, "Expected 2, got %d\n", id);
+ ok(id == 2, "Expected 2, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
RegDeleteValueA(media, "2");
delete_key(media, "", access);
@@ -3177,7 +3177,7 @@ machine_tests:
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
LocalFree(usersid);
return;
}
@@ -3190,7 +3190,7 @@ machine_tests:
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
id = 0xbeef;
@@ -3203,14 +3203,14 @@ machine_tests:
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", labelsz);
+ ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", promptsz);
+ ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", promptsz);
res = RegCreateKeyExA(source, "Media", 0, NULL, 0, access, NULL, &media, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* Media key exists */
id = 0xbeef;
@@ -3223,14 +3223,14 @@ machine_tests:
prompt, &promptsz);
ok(r == ERROR_NO_MORE_ITEMS,
"Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", labelsz);
+ ok(labelsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", promptsz);
+ ok(promptsz == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", promptsz);
res = RegSetValueExA(media, "2", 0, REG_SZ, (LPBYTE)"label;prompt", 13);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* disk exists, but no id 1 */
id = 0;
@@ -3242,11 +3242,11 @@ machine_tests:
MSICODE_PRODUCT, 0, &id, label, &labelsz,
prompt, &promptsz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(id == 2, "Expected 2, got %d\n", id);
+ ok(id == 2, "Expected 2, got %lu\n", id);
ok(!lstrcmpA(label, "label"), "Expected \"label\", got \"%s\"\n", label);
- ok(labelsz == 5, "Expected 5, got %d\n", labelsz);
+ ok(labelsz == 5, "Expected 5, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "prompt"), "Expected \"prompt\", got \"%s\"\n", prompt);
- ok(promptsz == 6, "Expected 6, got %d\n", promptsz);
+ ok(promptsz == 6, "Expected 6, got %lu\n", promptsz);
/* szUserSid is non-NULL */
id = 0xbeef;
@@ -3259,11 +3259,11 @@ machine_tests:
prompt, &promptsz);
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(id == 0xbeef, "Expected 0xbeef, got %d\n", id);
+ ok(id == 0xbeef, "Expected 0xbeef, got %lu\n", id);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
- ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
+ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", labelsz);
ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
- ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %d\n", promptsz);
+ ok(promptsz == MAX_PATH, "Expected MAX_PATH, got %lu\n", promptsz);
RegDeleteValueA(media, "2");
delete_key(media, "", access);
@@ -3361,7 +3361,7 @@ static void test_MsiSourceListAddSource(void)
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto userunmanaged_tests;
}
@@ -3370,7 +3370,7 @@ static void test_MsiSourceListAddSource(void)
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(userkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
r = pMsiSourceListAddSourceA(prodcode, username, 0, "source");
@@ -3378,11 +3378,11 @@ static void test_MsiSourceListAddSource(void)
/* Net key is created */
res = RegOpenKeyExA(source, "Net", 0, access, &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LastUsedSource does not exist and it is not created */
res = RegQueryValueExA(source, "LastUsedSource", 0, NULL, NULL, NULL);
- ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+ ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res);
CHECK_REG_STR(net, "1", "source\\");
@@ -3391,7 +3391,7 @@ static void test_MsiSourceListAddSource(void)
RegCloseKey(net);
res = RegSetValueExA(source, "LastUsedSource", 0, REG_SZ, (LPBYTE)"blah", 5);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LastUsedSource value exists */
r = pMsiSourceListAddSourceA(prodcode, username, 0, "source");
@@ -3399,7 +3399,7 @@ static void test_MsiSourceListAddSource(void)
/* Net key is created */
res = RegOpenKeyExA(source, "Net", 0, access, &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(source, "LastUsedSource", "blah");
CHECK_REG_STR(net, "1", "source\\");
@@ -3409,7 +3409,7 @@ static void test_MsiSourceListAddSource(void)
RegCloseKey(net);
res = RegSetValueExA(source, "LastUsedSource", 0, REG_SZ, (LPBYTE)"5", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LastUsedSource is an integer */
r = pMsiSourceListAddSourceA(prodcode, username, 0, "source");
@@ -3417,7 +3417,7 @@ static void test_MsiSourceListAddSource(void)
/* Net key is created */
res = RegOpenKeyExA(source, "Net", 0, access, &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(source, "LastUsedSource", "5");
CHECK_REG_STR(net, "1", "source\\");
@@ -3431,7 +3431,7 @@ static void test_MsiSourceListAddSource(void)
CHECK_REG_STR(net, "2", "another\\");
res = RegSetValueExA(source, "LastUsedSource", 0, REG_SZ, (LPBYTE)"2", 2);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* LastUsedSource is in the source list */
r = pMsiSourceListAddSourceA(prodcode, username, 0, "third/");
@@ -3464,7 +3464,7 @@ userunmanaged_tests:
res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
goto machine_tests;
}
@@ -3473,7 +3473,7 @@ userunmanaged_tests:
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &source);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
r = pMsiSourceListAddSourceA(prodcode, username, 0, "source");
@@ -3481,7 +3481,7 @@ userunmanaged_tests:
/* Net key is created */
res = RegOpenKeyA(source, "Net", &net);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(net, "1", "source\\");
@@ -3505,7 +3505,7 @@ machine_tests:
res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
if (res != ERROR_SUCCESS)
{
- skip("Product key creation failed with error code %u\n", res);
+ skip("Product key creation failed with error code %ld\n", res);
LocalFree(usersid);
return;
}
@@ -3515,7 +3515,7 @@ machine_tests:
ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyExA(prodkey, "SourceList", 0, NULL, 0, access, NULL, &source, NULL);
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
/* SourceList key exists */
r = pMsiSourceListAddSourceA(prodcode, NULL, 0, "source");
@@ -3528,7 +3528,7 @@ machine_tests:
skip("MsiSourceListAddSource (insufficient privileges)\n");
goto done;
}
- ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);
CHECK_REG_STR(net, "1", "source\\");
diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c
index 1ef18310206..6053248a7c4 100644
--- a/dlls/msi/tests/suminfo.c
+++ b/dlls/msi/tests/suminfo.c
@@ -431,7 +431,7 @@ static void test_summary_binary(void)
"Expected empty string or \"7\", got \"%s\"\n", sval);
todo_wine {
ok(type == VT_LPSTR, "Expected VT_LPSTR, got %d\n", type);
- ok(sz == 0 || sz == 1, "Expected 0 or 1, got %d\n", sz);
+ ok(sz == 0 || sz == 1, "Expected 0 or 1, got %lu\n", sz);
}
ival = -1;
--
2.30.2
2
1
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/msi/Makefile.in | 1 -
dlls/msi/action.c | 88 ++++++------
dlls/msi/appsearch.c | 4 +-
dlls/msi/assembly.c | 22 +--
dlls/msi/automation.c | 45 +++---
dlls/msi/classes.c | 16 +--
dlls/msi/custom.c | 42 +++---
dlls/msi/database.c | 51 +++----
dlls/msi/dialog.c | 41 +++---
dlls/msi/files.c | 22 +--
dlls/msi/format.c | 7 +-
dlls/msi/handle.c | 8 +-
dlls/msi/insert.c | 2 +-
dlls/msi/install.c | 64 ++++-----
dlls/msi/media.c | 13 +-
dlls/msi/msi.c | 323 +++++++++++++++++++-----------------------
dlls/msi/msiquery.c | 89 ++++++------
dlls/msi/package.c | 29 ++--
dlls/msi/record.c | 54 ++++---
dlls/msi/registry.c | 219 +++++++++++++---------------
dlls/msi/script.c | 6 +-
dlls/msi/source.c | 140 ++++++++----------
dlls/msi/streams.c | 12 +-
dlls/msi/string.c | 6 +-
dlls/msi/suminfo.c | 72 +++++-----
dlls/msi/table.c | 17 ++-
dlls/msi/upgrade.c | 2 +-
27 files changed, 641 insertions(+), 754 deletions(-)
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 3a1b1827456..7140e5a3308 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msi.dll
IMPORTLIB = msi
IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index a1b4eba0b8a..06cd582a389 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2076,7 +2076,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package )
continue;
}
file_size = msi_get_disk_file_size( package, file->TargetPath );
- TRACE("%s (size %u)\n", debugstr_w(file->TargetPath), file_size);
+ TRACE("%s (size %lu)\n", debugstr_w(file->TargetPath), file_size);
if (file->Version)
{
@@ -2370,7 +2370,7 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DW
}
msi_free(deformated);
- TRACE("Data %i bytes(%i)\n",*size,count);
+ TRACE( "data %lu bytes(%u)\n", *size, count );
}
else
{
@@ -2395,8 +2395,8 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DW
}
if (deformated[0] == '-')
d = -d;
- *(LPDWORD)data = d;
- TRACE("DWORD %i\n",*(LPDWORD)data);
+ *(DWORD *)data = d;
+ TRACE( "DWORD %lu\n", *(DWORD *)data);
msi_free(deformated);
}
@@ -2489,7 +2489,7 @@ static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BO
res = RegOpenKeyExW( root, subkey, 0, access, &hkey );
if (res)
{
- TRACE("failed to open key %s (%d)\n", debugstr_w(subkey), res);
+ TRACE( "failed to open key %s (%ld)\n", debugstr_w(subkey), res );
msi_free( subkey );
return NULL;
}
@@ -2753,14 +2753,14 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param)
}
if (!check_first)
{
- TRACE("setting value %s of %s type %u\n", debugstr_w(deformated), debugstr_w(uikey), type);
+ TRACE( "setting value %s of %s type %lu\n", debugstr_w(deformated), debugstr_w(uikey), type );
RegSetValueExW( hkey, deformated, 0, type, new_value, new_size );
}
else if (!old_value)
{
if (deformated || new_size)
{
- TRACE("setting value %s of %s type %u\n", debugstr_w(deformated), debugstr_w(uikey), type);
+ TRACE( "setting value %s of %s type %lu\n", debugstr_w(deformated), debugstr_w(uikey), type );
RegSetValueExW( hkey, deformated, 0, type, new_value, new_size );
}
}
@@ -2844,7 +2844,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
res = RegDeleteKeyExW( root, subkey, access, 0 );
if (res)
{
- TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res);
+ TRACE( "failed to delete key %s (%ld)\n", debugstr_w(subkey), res );
break;
}
} while (p);
@@ -2859,7 +2859,7 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path
if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE )))
{
if ((res = RegDeleteValueW( hkey, value )))
- TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res);
+ TRACE( "failed to delete value %s (%ld)\n", debugstr_w(value), res );
RegCloseKey( hkey );
if (is_key_empty(comp, root, path))
@@ -2877,7 +2877,7 @@ static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path
if (!(hkey = open_key( comp, root, path, FALSE, KEY_ALL_ACCESS ))) return;
res = RegDeleteTreeW( hkey, NULL );
- if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res);
+ if (res) TRACE( "failed to delete subtree of %s (%ld)\n", debugstr_w(path), res );
delete_key( comp, root, path );
RegCloseKey( hkey );
}
@@ -3405,7 +3405,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
}
res = RegDeleteValueW( hkey, squashed_pc );
RegCloseKey(hkey);
- if (res) WARN( "failed to delete component value %d\n", res );
+ if (res) WARN( "failed to delete component value %ld\n", res );
}
}
@@ -3566,7 +3566,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param)
hr = msi_load_typelib( package, file->TargetPath, REGKIND_REGISTER, &tlib );
if (FAILED(hr))
{
- ERR("Failed to load type library: %08x\n", hr);
+ ERR( "failed to load type library: %#lx\n", hr );
return ERROR_INSTALL_FAILURE;
}
@@ -3631,7 +3631,7 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param )
hr = UnRegisterTypeLib( &libid, (version >> 8) & 0xffff, version & 0xff, language, syskind );
if (FAILED(hr))
{
- WARN("Failed to unregister typelib: %08x\n", hr);
+ WARN( "failed to unregister typelib: %#lx\n", hr );
}
return ERROR_SUCCESS;
@@ -3865,7 +3865,7 @@ static UINT ITERATE_RemoveShortcuts( MSIRECORD *row, LPVOID param )
link_file = get_link_file( package, row );
TRACE("Removing shortcut file %s\n", debugstr_w( link_file ));
- if (!msi_delete_file( package, link_file )) WARN("Failed to remove shortcut file %u\n", GetLastError());
+ if (!msi_delete_file( package, link_file )) WARN( "failed to remove shortcut file %lu\n", GetLastError() );
msi_free( link_file );
return ERROR_SUCCESS;
@@ -4170,7 +4170,7 @@ static UINT msi_publish_patches( MSIPACKAGE *package )
if (patch->filename && !CopyFileW( patch->filename, patch->localfile, FALSE ))
{
res = GetLastError();
- ERR("Unable to copy patch package %d\n", res);
+ ERR( "unable to copy patch package %lu\n", res );
goto done;
}
res = RegCreateKeyExW( product_patches_key, patch_squashed, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &patch_key, NULL );
@@ -4467,7 +4467,7 @@ static UINT ITERATE_RemoveIniValuesOnUninstall( MSIRECORD *row, LPVOID param )
if (!WritePrivateProfileStringW( deformated_section, deformated_key, NULL, filename ))
{
- WARN("Unable to remove key %u\n", GetLastError());
+ WARN( "unable to remove key %lu\n", GetLastError() );
}
msi_free( filename );
}
@@ -4529,7 +4529,7 @@ static UINT ITERATE_RemoveIniValuesOnInstall( MSIRECORD *row, LPVOID param )
if (!WritePrivateProfileStringW( deformated_section, deformated_key, NULL, filename ))
{
- WARN("Unable to remove key %u\n", GetLastError());
+ WARN( "unable to remove key %lu\n", GetLastError() );
}
msi_free( filename );
}
@@ -5620,7 +5620,7 @@ static UINT ITERATE_UnpublishComponent( MSIRECORD *rec, LPVOID param )
res = RegDeleteKeyW( HKEY_CURRENT_USER, keypath );
if (res != ERROR_SUCCESS)
{
- WARN("Unable to delete component key %d\n", res);
+ WARN( "unable to delete component key %ld\n", res );
}
uirow = MSI_CreateRecord( 2 );
@@ -5748,7 +5748,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param)
{
if (GetLastError() != ERROR_SERVICE_EXISTS)
{
- WARN("Failed to create service %s: %d\n", debugstr_w(name), GetLastError());
+ WARN( "failed to create service %s (%lu)\n", debugstr_w(name), GetLastError() );
if (is_vital)
ret = ERROR_INSTALL_FAILURE;
@@ -5757,7 +5757,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param)
else if (sd.lpDescription)
{
if (!ChangeServiceConfig2W(service, SERVICE_CONFIG_DESCRIPTION, &sd))
- WARN("failed to set service description %u\n", GetLastError());
+ WARN( "failed to set service description %lu\n", GetLastError() );
}
if (image_path != file->TargetPath) msi_free(image_path);
@@ -5886,7 +5886,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
service = OpenServiceW(scm, name, SERVICE_START|SERVICE_QUERY_STATUS);
if (!service)
{
- ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError());
+ ERR( "failed to open service %s (%lu)\n", debugstr_w(name), GetLastError() );
goto done;
}
@@ -5895,7 +5895,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
if (!StartServiceW(service, numargs, vector) &&
GetLastError() != ERROR_SERVICE_ALREADY_RUNNING)
{
- ERR("Failed to start service %s (%u)\n", debugstr_w(name), GetLastError());
+ ERR( "failed to start service %s (%lu)\n", debugstr_w(name), GetLastError() );
goto done;
}
@@ -5906,7 +5906,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO,
(BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy))
{
- TRACE("failed to query service status (%u)\n", GetLastError());
+ TRACE( "failed to query service status (%lu)\n", GetLastError() );
goto done;
}
start_time = GetTickCount64();
@@ -5917,13 +5917,13 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO,
(BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy))
{
- TRACE("failed to query service status (%u)\n", GetLastError());
+ TRACE( "failed to query service status (%lu)\n", GetLastError() );
goto done;
}
}
if (status.dwCurrentState != SERVICE_RUNNING)
{
- WARN("service failed to start %u\n", status.dwCurrentState);
+ WARN( "service failed to start %lu\n", status.dwCurrentState );
r = ERROR_FUNCTION_FAILED;
}
}
@@ -6015,24 +6015,20 @@ static UINT stop_service( LPCWSTR name )
scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if (!scm)
{
- WARN("Failed to open the SCM: %d\n", GetLastError());
+ WARN( "failed to open the SCM (%lu)\n", GetLastError() );
goto done;
}
- service = OpenServiceW(scm, name,
- SERVICE_STOP |
- SERVICE_QUERY_STATUS |
- SERVICE_ENUMERATE_DEPENDENTS);
+ service = OpenServiceW(scm, name, SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS);
if (!service)
{
- WARN("Failed to open service (%s): %d\n", debugstr_w(name), GetLastError());
+ WARN( "failed to open service %s (%lu)\n", debugstr_w(name), GetLastError() );
goto done;
}
- if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp,
- sizeof(SERVICE_STATUS_PROCESS), &needed))
+ if (!QueryServiceStatusEx( service, SC_STATUS_PROCESS_INFO, (BYTE *)&ssp, sizeof(ssp), &needed) )
{
- WARN("Failed to query service status (%s): %d\n", debugstr_w(name), GetLastError());
+ WARN( "failed to query service status %s (%lu)\n", debugstr_w(name), GetLastError() );
goto done;
}
@@ -6042,7 +6038,7 @@ static UINT stop_service( LPCWSTR name )
stop_service_dependents(scm, service);
if (!ControlService(service, SERVICE_CONTROL_STOP, &status))
- WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError());
+ WARN( "failed to stop service %s (%lu)\n", debugstr_w(name), GetLastError() );
done:
if (service) CloseServiceHandle(service);
@@ -6154,7 +6150,7 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param )
scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS );
if (!scm)
{
- WARN("Failed to open the SCM: %d\n", GetLastError());
+ WARN( "failed to open the SCM (%lu)\n", GetLastError() );
goto done;
}
@@ -6169,12 +6165,12 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param )
service = OpenServiceW( scm, name, DELETE );
if (!service)
{
- WARN("Failed to open service (%s): %u\n", debugstr_w(name), GetLastError());
+ WARN( "failed to open service %s (%lu)\n", debugstr_w(name), GetLastError() );
goto done;
}
if (!DeleteService( service ))
- WARN("Failed to delete service (%s): %u\n", debugstr_w(name), GetLastError());
+ WARN( "failed to delete service %s (%lu)\n", debugstr_w(name), GetLastError() );
done:
uirow = MSI_CreateRecord( 2 );
@@ -6721,7 +6717,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags )
check_flag_combo(*flags, ENV_ACT_REMOVEMATCH | ENV_ACT_SETALWAYS) ||
check_flag_combo(*flags, ENV_ACT_SETABSENT | ENV_MOD_MASK))
{
- ERR("Invalid flags: %08x\n", *flags);
+ ERR( "invalid flags: %#lx\n", *flags );
return ERROR_FUNCTION_FAILED;
}
@@ -6751,7 +6747,7 @@ static UINT open_env_key( DWORD flags, HKEY *key )
res = RegOpenKeyExW( root, env, 0, KEY_ALL_ACCESS, key );
if (res != ERROR_SUCCESS)
{
- WARN("Failed to open key %s (%d)\n", debugstr_w(env), res);
+ WARN( "failed to open key %s (%ld)\n", debugstr_w(env), res );
return ERROR_FUNCTION_FAILED;
}
@@ -7079,7 +7075,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param )
TRACE("removing %s\n", debugstr_w(name));
res = RegDeleteValueW( env, name );
if (res != ERROR_SUCCESS)
- WARN("failed to delete value %s (%d)\n", debugstr_w(name), res);
+ WARN( "failed to delete value %s (%ld)\n", debugstr_w(name), res );
}
else
{
@@ -7087,7 +7083,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param )
size = (lstrlenW( new_value ) + 1) * sizeof(WCHAR);
res = RegSetValueExW( env, name, 0, type, (BYTE *)new_value, size );
if (res != ERROR_SUCCESS)
- WARN("failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(new_value), res);
+ WARN( "failed to set %s to %s (%ld)\n", debugstr_w(name), debugstr_w(new_value), res );
}
done:
@@ -7199,7 +7195,7 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package )
msiobj_release( &view->hdr );
if (r != ERROR_SUCCESS)
return r;
- if (count) FIXME("ignored %u rows in ODBCDriver table\n", count);
+ if (count) FIXME( "ignored %lu rows in ODBCDriver table\n", count );
}
r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `ODBCTranslator`", &view );
if (r == ERROR_SUCCESS)
@@ -7209,7 +7205,7 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package )
msiobj_release( &view->hdr );
if (r != ERROR_SUCCESS)
return r;
- if (count) FIXME("ignored %u rows in ODBCTranslator table\n", count);
+ if (count) FIXME( "ignored %lu rows in ODBCTranslator table\n", count );
}
return ERROR_SUCCESS;
}
@@ -7347,7 +7343,7 @@ static void bind_image( MSIPACKAGE *package, const char *filename, const char *p
{
if (!msi_bind_image( package, filename, path ))
{
- WARN("failed to bind image %u\n", GetLastError());
+ WARN( "failed to bind image %lu\n", GetLastError() );
}
}
@@ -7417,7 +7413,7 @@ static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, L
if (r != ERROR_SUCCESS)
return r;
}
- if (count) FIXME("%s: ignored %u rows from %s\n", action, count, debugstr_w(table));
+ if (count) FIXME( "%s: ignored %lu rows from %s\n", action, count, debugstr_w(table) );
return ERROR_SUCCESS;
}
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index d3a8ccc03f3..77b12156ca8 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -139,7 +139,7 @@ static UINT get_signature( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHAR *
TRACE("MaxVersion is %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS),
LOWORD(sig->MaxVersionMS), HIWORD(sig->MaxVersionLS),
LOWORD(sig->MaxVersionLS));
- TRACE("MinSize is %d, MaxSize is %d;\n", sig->MinSize, sig->MaxSize);
+ TRACE("MinSize is %lu, MaxSize is %lu\n", sig->MinSize, sig->MaxSize);
TRACE("Languages is %s\n", debugstr_w(sig->Languages));
msiobj_release( &row->hdr );
@@ -336,7 +336,7 @@ static void convert_reg_value( DWORD regType, const BYTE *value, DWORD sz, WCHAR
swprintf(ptr, 3, L"%02X", value[i]);
break;
default:
- WARN("unimplemented for values of type %d\n", regType);
+ WARN( "unimplemented for values of type %lu\n", regType );
*appValue = NULL;
}
}
diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c
index 9cddfd2e68d..9f75a9c0281 100644
--- a/dlls/msi/assembly.c
+++ b/dlls/msi/assembly.c
@@ -233,7 +233,7 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n
{
return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED);
}
- TRACE("QueryAssemblyInfo returned 0x%08x\n", hr);
+ TRACE( "QueryAssemblyInfo returned %#lx\n", hr );
return FALSE;
}
@@ -337,7 +337,7 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp )
TRACE("application %s\n", debugstr_w(a->application));
a->attributes = MSI_RecordGetInteger( rec, 5 );
- TRACE("attributes %u\n", a->attributes);
+ TRACE( "attributes %lu\n", a->attributes );
if (!(a->display_name = get_assembly_display_name( package->db, comp->Component, a )))
{
@@ -445,7 +445,7 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp )
hr = IAssemblyCache_InstallAssembly( cache, 0, manifest, NULL );
if (hr != S_OK)
{
- ERR("Failed to install assembly %s (0x%08x)\n", debugstr_w(manifest), hr);
+ ERR( "failed to install assembly %s (%#lx)\n", debugstr_w(manifest), hr );
return ERROR_FUNCTION_FAILED;
}
if (feature) feature->Action = INSTALLSTATE_LOCAL;
@@ -474,7 +474,7 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp )
{
cache = package->cache_sxs;
hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL );
- if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr);
+ if (FAILED( hr )) WARN( "failed to uninstall assembly %#lx\n", hr );
}
else
{
@@ -486,7 +486,7 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp )
if (cache)
{
hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL );
- if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr);
+ if (FAILED( hr )) WARN( "failed to uninstall assembly %#lx\n", hr );
}
}
}
@@ -638,7 +638,7 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package )
}
if ((res = open_local_assembly_key( package->Context, win32, file->TargetPath, &hkey )))
{
- WARN("failed to open local assembly key %d\n", res);
+ WARN( "failed to open local assembly key %ld\n", res );
return ERROR_FUNCTION_FAILED;
}
}
@@ -646,14 +646,14 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package )
{
if ((res = open_global_assembly_key( package->Context, win32, &hkey )))
{
- WARN("failed to open global assembly key %d\n", res);
+ WARN( "failed to open global assembly key %ld\n", res );
return ERROR_FUNCTION_FAILED;
}
}
size = sizeof(buffer);
if ((res = RegSetValueExW( hkey, assembly->display_name, 0, REG_MULTI_SZ, (const BYTE *)buffer, size )))
{
- WARN("failed to set assembly value %d\n", res);
+ WARN( "failed to set assembly value %ld\n", res );
}
RegCloseKey( hkey );
@@ -699,17 +699,17 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package )
continue;
}
if ((res = delete_local_assembly_key( package->Context, win32, file->TargetPath )))
- WARN("failed to delete local assembly key %d\n", res);
+ WARN( "failed to delete local assembly key %ld\n", res );
}
else
{
HKEY hkey;
if ((res = open_global_assembly_key( package->Context, win32, &hkey )))
- WARN("failed to delete global assembly key %d\n", res);
+ WARN( "failed to delete global assembly key %ld\n", res );
else
{
if ((res = RegDeleteValueW( hkey, assembly->display_name )))
- WARN("failed to delete global assembly value %d\n", res);
+ WARN( "failed to delete global assembly value %ld\n", res );
RegCloseKey( hkey );
}
}
diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c
index 80d6b8a66ba..f8fd8cc1449 100644
--- a/dlls/msi/automation.c
+++ b/dlls/msi/automation.c
@@ -265,7 +265,7 @@ static HRESULT WINAPI AutomationObject_GetTypeInfo(
AutomationObject *This = impl_from_IDispatch(iface);
HRESULT hr;
- TRACE("(%p/%p)->(%d,%d,%p)\n", iface, This, iTInfo, lcid, ppTInfo);
+ TRACE( "(%p/%p)->(%u, %ld, %p)\n", iface, This, iTInfo, lcid, ppTInfo );
hr = get_typeinfo(This->tid, ppTInfo);
if (FAILED(hr))
@@ -287,7 +287,7 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames(
ITypeInfo *ti;
HRESULT hr;
- TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", iface, This,
+ TRACE("(%p/%p)->(%s, %p, %u, %ld, %p)\n", iface, This,
debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if (!IsEqualGUID(riid, &IID_NULL)) return E_INVALIDARG;
@@ -331,7 +331,7 @@ static HRESULT WINAPI AutomationObject_Invoke(
BSTR bstrName = NULL;
ITypeInfo *ti;
- TRACE("(%p/%p)->(%d, %s, %d, %d, %p, %p, %p, %p)\n", iface, This,
+ TRACE("(%p/%p)->(%ld, %s, %ld, %d, %p, %p, %p, %p)\n", iface, This,
dispIdMember, debugstr_guid(riid), lcid, wFlags,
pDispParams, pVarResult, pExcepInfo, puArgErr);
@@ -362,14 +362,14 @@ static HRESULT WINAPI AutomationObject_Invoke(
if (TRACE_ON(msi))
{
ITypeInfo_GetDocumentation(ti, dispIdMember, &bstrName, NULL, NULL, NULL);
- TRACE("Method %d, %s\n", dispIdMember, debugstr_w(bstrName));
+ TRACE("method %ld, %s\n", dispIdMember, debugstr_w(bstrName));
}
hr = tid_ids[This->tid].fn_invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr);
if (hr == DISP_E_MEMBERNOTFOUND) {
if (bstrName == NULL) ITypeInfo_GetDocumentation(ti, dispIdMember, &bstrName, NULL, NULL, NULL);
- FIXME("Method %d, %s wflags %d not implemented, clsid %s\n", dispIdMember, debugstr_w(bstrName), wFlags,
+ FIXME("method %ld, %s wflags %d not implemented, clsid %s\n", dispIdMember, debugstr_w(bstrName), wFlags,
debugstr_guid(get_riid_from_tid(This->tid)));
}
else if (pExcepInfo &&
@@ -383,7 +383,7 @@ static HRESULT WINAPI AutomationObject_Invoke(
if (FAILED(ITypeInfo_GetNames(ti, dispIdMember, bstrParamNames,
MAX_FUNC_PARAMS, &namesNo)))
{
- TRACE("Failed to retrieve names for dispIdMember %d\n", dispIdMember);
+ TRACE("failed to retrieve names for dispIdMember %ld\n", dispIdMember);
}
else
{
@@ -412,7 +412,7 @@ static HRESULT WINAPI AutomationObject_Invoke(
/* Free function name if we retrieved it */
SysFreeString(bstrName);
- TRACE("Returning 0x%08x, %s\n", hr, SUCCEEDED(hr) ? "ok" : "not ok");
+ TRACE("returning %#lx, %s\n", hr, SUCCEEDED(hr) ? "ok" : "not ok");
return hr;
}
@@ -470,7 +470,7 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetClassInfo(IProvideMultipleClas
static HRESULT WINAPI ProvideMultipleClassInfo_GetGUID(IProvideMultipleClassInfo* iface, DWORD dwGuidKind, GUID* pGUID)
{
AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface);
- TRACE("(%p/%p)->(%d,%s)\n", iface, This, dwGuidKind, debugstr_guid(pGUID));
+ TRACE("(%p/%p)->(%lu, %s)\n", iface, This, dwGuidKind, debugstr_guid(pGUID));
if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID)
return E_INVALIDARG;
@@ -500,7 +500,8 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetInfoOfIndex(IProvideMultipleCl
{
AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface);
- TRACE("(%p/%p)->(%d,%d,%p,%p,%p,%p,%p)\n", iface, This, iti, dwFlags, ti, pdwTIFlags, pcdispidReserved, piidPrimary, piidSource);
+ TRACE("(%p/%p)->(%lu, %#lx, %p, %p, %p, %p, %p)\n", iface, This, iti, dwFlags, ti, pdwTIFlags, pcdispidReserved,
+ piidPrimary, piidSource);
if (iti != 0)
return E_INVALIDARG;
@@ -542,7 +543,7 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl =
static void init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid)
{
- TRACE("(%p, %d, %s)\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid)));
+ TRACE("%p, %lu, %s\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid)));
This->IDispatch_iface.lpVtbl = &AutomationObjectVtbl;
This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl;
@@ -618,7 +619,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA
ListEnumerator *This = impl_from_IEnumVARIANT(iface);
ULONG i, local;
- TRACE("(%p, %uld, %p, %p)\n", iface, celt, rgVar, fetched);
+ TRACE("%p, %lu, %p, %p\n", iface, celt, rgVar, fetched);
if (fetched) *fetched = 0;
@@ -641,7 +642,7 @@ static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt)
{
ListEnumerator *This = impl_from_IEnumVARIANT(iface);
- TRACE("(%p,%uld)\n", iface, celt);
+ TRACE("%p, %lu\n", iface, celt);
This->pos += celt;
if (This->pos >= This->list->count)
@@ -1030,7 +1031,7 @@ static HRESULT list_invoke(
if (SUCCEEDED(hr = create_list_enumerator(list, (LPVOID *)&pUnk)))
V_UNKNOWN(pVarResult) = pUnk;
else
- ERR("Failed to create IEnumVARIANT object, hresult 0x%08x\n", hr);
+ ERR("failed to create IEnumVARIANT object, hresult %#lx\n", hr);
}
else return DISP_E_MEMBERNOTFOUND;
break;
@@ -1189,7 +1190,7 @@ static HRESULT view_invoke(
if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS)
{
if (FAILED(hr = create_record(msiHandle, &V_DISPATCH(pVarResult))))
- ERR("Failed to create Record object, hresult 0x%08x\n", hr);
+ ERR("failed to create Record object, hresult %#lx\n", hr);
}
else if (ret == ERROR_NO_MORE_ITEMS)
V_DISPATCH(pVarResult) = NULL;
@@ -1289,7 +1290,7 @@ HRESULT database_invoke(
if (SUCCEEDED(hr))
V_DISPATCH(pVarResult) = dispatch;
else
- ERR("Failed to create SummaryInfo object: 0x%08x\n", hr);
+ ERR("failed to create SummaryInfo object: %#lx\n", hr);
}
else
{
@@ -1311,7 +1312,7 @@ HRESULT database_invoke(
if (SUCCEEDED(hr = create_view(msiHandle, &dispatch)))
V_DISPATCH(pVarResult) = dispatch;
else
- ERR("Failed to create View object, hresult 0x%08x\n", hr);
+ ERR("failed to create View object, hresult %#lx\n", hr);
}
else
{
@@ -1447,7 +1448,7 @@ static HRESULT session_invoke(
if (SUCCEEDED(hr = create_database(msiHandle, &dispatch)))
V_DISPATCH(pVarResult) = dispatch;
else
- ERR("Failed to create Database object, hresult 0x%08x\n", hr);
+ ERR("failed to create Database object, hresult %#lx\n", hr);
}
else
{
@@ -1617,11 +1618,11 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT
case REG_EXPAND_SZ:
if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize)))
- ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError());
+ ERR("ExpandEnvironmentStrings returned error %lu\n", GetLastError());
else if (!(szNewString = msi_alloc(dwNewSize * sizeof(WCHAR))))
ERR("Out of memory\n");
else if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize)))
- ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError());
+ ERR("ExpandEnvironmentStrings returned error %lu\n", GetLastError());
else
{
V_VT(pVarResult) = VT_BSTR;
@@ -1650,7 +1651,7 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT
break;
default:
- FIXME("Unhandled registry value type %d\n", dwType);
+ FIXME("Unhandled registry value type %lu\n", dwType);
}
}
@@ -2455,7 +2456,7 @@ static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch)
{
AutomationObject *database;
- TRACE("(%d %p)\n", msiHandle, dispatch);
+ TRACE("%lu %p\n", msiHandle, dispatch);
database = msi_alloc(sizeof(AutomationObject));
if (!database) return E_OUTOFMEMORY;
@@ -2471,7 +2472,7 @@ static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch)
{
AutomationObject *view;
- TRACE("(%d %p)\n", msiHandle, dispatch);
+ TRACE("%lu %p\n", msiHandle, dispatch);
view = msi_alloc(sizeof(AutomationObject));
if (!view) return E_OUTOFMEMORY;
diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c
index 52a91b306f1..b2c94fa0ff5 100644
--- a/dlls/msi/classes.c
+++ b/dlls/msi/classes.c
@@ -911,7 +911,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package )
res = RegDeleteTreeW( hkey, cls->clsid );
if (res != ERROR_SUCCESS)
- WARN("Failed to delete class key %d\n", res);
+ WARN("failed to delete class key %ld\n", res);
if (cls->AppID)
{
@@ -920,7 +920,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package )
{
res = RegDeleteKeyW( hkey2, cls->AppID->AppID );
if (res != ERROR_SUCCESS)
- WARN("Failed to delete appid key %d\n", res);
+ WARN("failed to delete appid key %ld\n", res);
RegCloseKey( hkey2 );
}
}
@@ -935,7 +935,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package )
msi_free( filetype );
if (res != ERROR_SUCCESS)
- WARN("Failed to delete file type %d\n", res);
+ WARN("failed to delete file type %ld\n", res);
}
}
@@ -1111,7 +1111,7 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package )
res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid->ProgID );
if (res != ERROR_SUCCESS)
- TRACE("Failed to delete progid key %d\n", res);
+ TRACE("failed to delete progid key %ld\n", res);
uirow = MSI_CreateRecord( 1 );
MSI_RecordSetStringW( uirow, 1, progid->ProgID );
@@ -1256,7 +1256,7 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package)
res = RegCreateKeyW( HKEY_CLASSES_ROOT, extension, &hkey );
msi_free( extension );
if (res != ERROR_SUCCESS)
- WARN("Failed to create extension key %d\n", res);
+ WARN("failed to create extension key %ld\n", res);
}
if (ext->Mime)
@@ -1355,7 +1355,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package )
res = RegDeleteTreeW( HKEY_CLASSES_ROOT, extension );
msi_free( extension );
if (res != ERROR_SUCCESS)
- WARN("Failed to delete extension key %d\n", res);
+ WARN("failed to delete extension key %ld\n", res);
}
if (ext->ProgID || ext->ProgIDText)
@@ -1376,7 +1376,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package )
res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid_shell );
msi_free( progid_shell );
if (res != ERROR_SUCCESS)
- WARN("Failed to delete shell key %d\n", res);
+ WARN("failed to delete shell key %ld\n", res);
RegDeleteKeyW( HKEY_CLASSES_ROOT, progid );
}
}
@@ -1482,7 +1482,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package )
lstrcatW( mime_key, mime->ContentType );
res = RegDeleteKeyW( HKEY_CLASSES_ROOT, mime_key );
if (res != ERROR_SUCCESS)
- WARN("Failed to delete MIME key %d\n", res);
+ WARN("failed to delete MIME key %ld\n", res);
msi_free( mime_key );
}
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 2f2eedebc31..8ff3d90fa58 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -314,7 +314,7 @@ static UINT custom_get_process_return( HANDLE process )
DWORD rc = 0;
GetExitCodeProcess( process, &rc );
- TRACE("exit code is %u\n", rc);
+ TRACE( "exit code is %lu\n", rc );
if (rc != 0)
return ERROR_FUNCTION_FAILED;
return ERROR_SUCCESS;
@@ -339,7 +339,7 @@ static UINT custom_get_thread_return( MSIPACKAGE *package, HANDLE thread )
ACTION_ForceReboot( package );
return ERROR_SUCCESS;
default:
- ERR("Invalid Return Code %d\n",rc);
+ ERR( "invalid Return Code %lu\n", rc );
return ERROR_INSTALL_FAILURE;
}
}
@@ -506,13 +506,13 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid)
status = RpcStringBindingComposeW(NULL, (WCHAR *)L"ncalrpc", NULL, endpoint, NULL, &binding_str);
if (status != RPC_S_OK)
{
- ERR("RpcStringBindingCompose failed: %#x\n", status);
+ ERR("RpcStringBindingCompose failed: %#lx\n", status);
return status;
}
status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
if (status != RPC_S_OK)
{
- ERR("RpcBindingFromStringBinding failed: %#x\n", status);
+ ERR("RpcBindingFromStringBinding failed: %#lx\n", status);
return status;
}
RpcStringFreeW(&binding_str);
@@ -525,7 +525,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid)
hPackage = alloc_msi_remote_handle( remote_package );
if (!hPackage)
{
- ERR( "failed to create handle for %x\n", remote_package );
+ ERR( "failed to create handle for %#lx\n", remote_package );
midl_user_free( action );
midl_user_free( dll );
midl_user_free( proc );
@@ -535,7 +535,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid)
hModule = LoadLibraryW( dll );
if (!hModule)
{
- ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() );
+ ERR( "failed to load dll %s (%lu)\n", debugstr_w( dll ), GetLastError() );
midl_user_free( action );
midl_user_free( dll );
midl_user_free( proc );
@@ -555,7 +555,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid)
}
__EXCEPT_PAGE_FAULT
{
- ERR( "Custom action (%s:%s) caused a page fault: %08x\n",
+ ERR( "Custom action (%s:%s) caused a page fault: %#lx\n",
debugstr_w(dll), debugstr_a(proc), GetExceptionCode() );
r = ERROR_SUCCESS;
}
@@ -590,7 +590,7 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch)
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());
+ ERR("failed to create custom action client pipe: %lu\n", GetLastError());
if ((sizeof(void *) == 8 || is_wow64) && arch == SCS_32BIT_BINARY)
GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\\msiexec.exe"));
@@ -623,7 +623,7 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch)
if (!ConnectNamedPipe(pipe, NULL))
{
- ERR("Failed to connect to custom action server: %u\n", GetLastError());
+ ERR("failed to connect to custom action server: %lu\n", GetLastError());
return GetLastError();
}
@@ -668,13 +668,13 @@ static DWORD WINAPI custom_client_thread(void *arg)
if (!WriteFile(pipe, &info->guid, sizeof(info->guid), &size, NULL) ||
size != sizeof(info->guid))
{
- ERR("Failed to write to custom action client pipe: %u\n", GetLastError());
+ ERR("failed to write to custom action client pipe: %lu\n", GetLastError());
LeaveCriticalSection(&msi_custom_action_cs);
return GetLastError();
}
if (!ReadFile(pipe, &thread64, sizeof(thread64), &size, NULL) || size != sizeof(thread64))
{
- ERR("Failed to read from custom action client pipe: %u\n", GetLastError());
+ ERR("failed to read from custom action client pipe: %lu\n", GetLastError());
LeaveCriticalSection(&msi_custom_action_cs);
return GetLastError();
}
@@ -772,7 +772,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
endpoint, NULL);
if (status != RPC_S_OK)
{
- ERR("RpcServerUseProtseqEp failed: %#x\n", status);
+ ERR("RpcServerUseProtseqEp failed: %#lx\n", status);
return NULL;
}
@@ -780,7 +780,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL);
if (status != RPC_S_OK)
{
- ERR("RpcServerRegisterIfEx failed: %#x\n", status);
+ ERR("RpcServerRegisterIfEx failed: %#lx\n", status);
return NULL;
}
@@ -848,7 +848,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir )
}
if (!len_exe)
{
- ERR("can't find executable %u\n", GetLastError());
+ ERR("can't find executable %lu\n", GetLastError());
msi_free( exe );
return INVALID_HANDLE_VALUE;
}
@@ -886,7 +886,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir )
msi_free( exe );
if (!ret)
{
- ERR("unable to execute command %u\n", GetLastError());
+ ERR("unable to execute command %lu\n", GetLastError());
return INVALID_HANDLE_VALUE;
}
CloseHandle( info.hThread );
@@ -1041,27 +1041,27 @@ static UINT write_substorage_to_file( MSIPACKAGE *package, const WCHAR *source,
hr = StgCreateDocfile( filename, STGM_CREATE|STGM_TRANSACTED|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, &dst );
if (FAILED( hr ))
{
- WARN( "can't open destination storage %s (%08x)\n", debugstr_w(filename), hr );
+ WARN( "can't open destination storage %s (%#lx)\n", debugstr_w(filename), hr );
goto done;
}
hr = IStorage_OpenStorage( package->db->storage, source, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &src );
if (FAILED( hr ))
{
- WARN( "can't open source storage %s (%08x)\n", debugstr_w(source), hr );
+ WARN( "can't open source storage %s (%#lx)\n", debugstr_w(source), hr );
goto done;
}
hr = IStorage_CopyTo( src, 0, NULL, NULL, dst );
if (FAILED( hr ))
{
- ERR( "failed to copy storage %s (%08x)\n", debugstr_w(source), hr );
+ ERR( "failed to copy storage %s (%#lx)\n", debugstr_w(source), hr );
goto done;
}
hr = IStorage_Commit( dst, 0 );
if (FAILED( hr ))
- ERR( "failed to commit storage (%08x)\n", hr );
+ ERR( "failed to commit storage (%#lx)\n", hr );
else
r = ERROR_SUCCESS;
@@ -1179,11 +1179,11 @@ static DWORD WINAPI ScriptThread( LPVOID arg )
LPGUID guid = arg;
DWORD rc;
- TRACE("custom action (%x) started\n", GetCurrentThreadId() );
+ TRACE("custom action (%#lx) started\n", GetCurrentThreadId() );
rc = ACTION_CallScript( guid );
- TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc );
+ TRACE("custom action (%#lx) returned %lu\n", GetCurrentThreadId(), rc );
MsiCloseAllHandles();
return rc;
diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index dd5a6977460..f7305e661ef 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -108,7 +108,7 @@ static HRESULT db_initialize( IStorage *stg, const GUID *clsid )
hr = IStorage_SetClass( stg, clsid );
if (FAILED( hr ))
{
- WARN("failed to set class id 0x%08x\n", hr);
+ WARN("failed to set class id %#lx\n", hr);
return hr;
}
@@ -116,21 +116,21 @@ static HRESULT db_initialize( IStorage *stg, const GUID *clsid )
hr = write_stream_data( stg, L"_Tables", NULL, 0, TRUE );
if (FAILED( hr ))
{
- WARN("failed to create _Tables stream 0x%08x\n", hr);
+ WARN("failed to create _Tables stream %#lx\n", hr);
return hr;
}
hr = msi_init_string_table( stg );
if (FAILED( hr ))
{
- WARN("failed to initialize string table 0x%08x\n", hr);
+ WARN("failed to initialize string table %#lx\n", hr);
return hr;
}
hr = IStorage_Commit( stg, 0 );
if (FAILED( hr ))
{
- WARN("failed to commit changes 0x%08x\n", hr);
+ WARN("failed to commit changes %#lx\n", hr);
return hr;
}
@@ -217,7 +217,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb)
if( FAILED( r ) || !stg )
{
- WARN("open failed r = %08x for %s\n", r, debugstr_w(szDBPath));
+ WARN("open failed r = %#lx for %s\n", r, debugstr_w(szDBPath));
return ERROR_FUNCTION_FAILED;
}
@@ -513,7 +513,7 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D
type = L"LONG";
else
{
- WARN("invalid int width %u\n", len);
+ WARN("invalid int width %lu\n", len);
msi_free(columns);
return NULL;
}
@@ -835,12 +835,12 @@ done:
return r;
}
-UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFilename)
+UINT WINAPI MsiDatabaseImportW( MSIHANDLE handle, const WCHAR *szFolder, const WCHAR *szFilename )
{
MSIDATABASE *db;
UINT r;
- TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename));
+ TRACE( "%lu %s %s\n", handle, debugstr_w(szFolder), debugstr_w(szFilename) );
if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE)))
return ERROR_INVALID_HANDLE;
@@ -850,13 +850,12 @@ UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFil
return r;
}
-UINT WINAPI MsiDatabaseImportA( MSIHANDLE handle,
- LPCSTR szFolder, LPCSTR szFilename )
+UINT WINAPI MsiDatabaseImportA( MSIHANDLE handle, const char *szFolder, const char *szFilename )
{
- LPWSTR path = NULL, file = NULL;
+ WCHAR *path = NULL, *file = NULL;
UINT r = ERROR_OUTOFMEMORY;
- TRACE("%x %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename));
+ TRACE( "%lu %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename) );
if( szFolder )
{
@@ -1141,14 +1140,12 @@ done:
*
* row4 : data <tab> data <tab> data <tab> ... data <cr> <lf>
*/
-UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable,
- LPCWSTR szFolder, LPCWSTR szFilename )
+UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, const WCHAR *szTable, const WCHAR *szFolder, const WCHAR *szFilename )
{
MSIDATABASE *db;
UINT r;
- TRACE("%x %s %s %s\n", handle, debugstr_w(szTable),
- debugstr_w(szFolder), debugstr_w(szFilename));
+ TRACE( "%lu %s %s %s\n", handle, debugstr_w(szTable), debugstr_w(szFolder), debugstr_w(szFilename) );
if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE)))
return ERROR_INVALID_HANDLE;
@@ -1158,14 +1155,12 @@ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable,
return r;
}
-UINT WINAPI MsiDatabaseExportA( MSIHANDLE handle, LPCSTR szTable,
- LPCSTR szFolder, LPCSTR szFilename )
+UINT WINAPI MsiDatabaseExportA( MSIHANDLE handle, const char *szTable, const char *szFolder, const char *szFilename )
{
- LPWSTR path = NULL, file = NULL, table = NULL;
+ WCHAR *path = NULL, *file = NULL, *table = NULL;
UINT r = ERROR_OUTOFMEMORY;
- TRACE("%x %s %s %s\n", handle, debugstr_a(szTable),
- debugstr_a(szFolder), debugstr_a(szFilename));
+ TRACE( "%lu %s %s %s\n", handle, debugstr_a(szTable), debugstr_a(szFolder), debugstr_a(szFilename) );
if( szTable )
{
@@ -1198,14 +1193,12 @@ end:
return r;
}
-UINT WINAPI MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge,
- LPCSTR szTableName)
+UINT WINAPI MsiDatabaseMergeA( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, const char *szTableName )
{
UINT r;
- LPWSTR table;
+ WCHAR *table;
- TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge,
- debugstr_a(szTableName));
+ TRACE("%lu, %lu, %s\n", hDatabase, hDatabaseMerge, debugstr_a(szTableName) );
table = strdupAtoW(szTableName);
r = MsiDatabaseMergeW(hDatabase, hDatabaseMerge, table);
@@ -1839,7 +1832,7 @@ static UINT update_merge_errors(MSIDATABASE *db, LPCWSTR error,
return r;
}
-UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPCWSTR szTableName)
+UINT WINAPI MsiDatabaseMergeW( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, const WCHAR *szTableName )
{
struct list tabledata = LIST_INIT(tabledata);
struct list *item, *cursor;
@@ -1848,7 +1841,7 @@ UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPC
BOOL conflicts;
UINT r;
- TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge, debugstr_w(szTableName));
+ TRACE( "%lu, %lu, %s\n", hDatabase, hDatabaseMerge, debugstr_w(szTableName) );
if (szTableName && !*szTableName)
return ERROR_INVALID_TABLE;
@@ -1906,7 +1899,7 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle )
MSIDBSTATE ret = MSIDBSTATE_READ;
MSIDATABASE *db;
- TRACE("%d\n", handle);
+ TRACE( "%lu\n", handle );
if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE )))
return MSIDBSTATE_ERROR;
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 6463c3062ac..9d82be8c2bd 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -590,7 +590,7 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control,
val1 = MSI_RecordGetInteger( rec, 2 );
val2 = MSI_RecordGetInteger( rec, 3 );
- TRACE("progress: func %u val1 %u val2 %u\n", func, val1, val2);
+ TRACE( "progress: func %lu val1 %lu val2 %lu\n", func, val1, val2 );
units = val1 / 512;
switch (func)
@@ -633,7 +633,7 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control,
ctrl->progress_max += units;
break;
default:
- FIXME("Unknown progress message %u\n", func);
+ FIXME( "unknown progress message %lu\n", func );
break;
}
}
@@ -730,8 +730,7 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog,
attributes = MSI_RecordGetInteger( rec, 8 );
if (wcscmp( control_type, L"ScrollableText" )) text = MSI_RecordGetString( rec, 10 );
- TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name),
- attributes, debugstr_w(text), style);
+ TRACE( "%s, %s, %#lx, %s, %#lx\n", debugstr_w(szCls), debugstr_w(name), attributes, debugstr_w(text), style );
if( attributes & msidbControlAttributesVisible )
style |= WS_VISIBLE;
@@ -773,7 +772,7 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
struct msi_text_info *info;
LRESULT r = 0;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE( "%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam );
info = GetPropW(hWnd, L"MSIDATA");
@@ -1247,7 +1246,7 @@ MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
struct msi_scrolltext_info *info;
HRESULT r;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE( "%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam );
info = GetPropW( hWnd, L"MSIDATA" );
@@ -1287,7 +1286,7 @@ msi_richedit_stream_in( DWORD_PTR arg, LPBYTE buffer, LONG count, LONG *pcb )
*pcb = count;
info->offset += count;
- TRACE("%d/%d\n", info->offset, info->length);
+ TRACE( "%lu/%lu\n", info->offset, info->length );
return 0;
}
@@ -1428,7 +1427,7 @@ static LRESULT WINAPI MSIComboBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LP
LRESULT r;
DWORD j;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE( "%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam );
info = GetPropW( hWnd, L"MSIDATA" );
if (!info)
@@ -1828,7 +1827,7 @@ MSIMaskedEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
struct msi_maskedit_info *info;
HRESULT r;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam);
info = GetPropW(hWnd, L"MSIDATA");
@@ -2163,7 +2162,7 @@ static LRESULT WINAPI MSIPathEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LP
struct msi_pathedit_info *info = GetPropW(hWnd, L"MSIDATA");
LRESULT r = 0;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam);
if ( msg == WM_KILLFOCUS )
{
@@ -2262,7 +2261,7 @@ static LRESULT WINAPI MSIRadioGroup_WndProc( HWND hWnd, UINT msg, WPARAM wParam,
WNDPROC oldproc = (WNDPROC)GetPropW( hWnd, L"MSIDATA" );
LRESULT r;
- TRACE("hWnd %p msg %04x wParam 0x%08lx lParam 0x%08lx\n", hWnd, msg, wParam, lParam);
+ TRACE( "hWnd %p msg %04x wParam %#Ix lParam %#Ix\n", hWnd, msg, wParam, lParam );
if (msg == WM_COMMAND) /* Forward notifications to dialog */
SendMessageW( GetParent( hWnd ), msg, wParam, lParam );
@@ -2463,7 +2462,7 @@ MSISelectionTree_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
TVHITTESTINFO tvhti;
HRESULT r;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam);
info = GetPropW(hWnd, L"MSIDATA");
@@ -2714,7 +2713,7 @@ static LRESULT WINAPI MSIListBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
LRESULT r;
DWORD j;
- TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam);
info = GetPropW( hWnd, L"MSIDATA" );
if (!info)
@@ -3792,7 +3791,7 @@ static LRESULT msi_dialog_oncommand( msi_dialog *dialog, WPARAM param, HWND hwnd
{
msi_control *control = NULL;
- TRACE("%p %p %08lx\n", dialog, hwnd, param);
+ TRACE( "%p, %#Ix, %p\n", dialog, param, hwnd );
switch (param)
{
@@ -4214,7 +4213,7 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview )
MSIPREVIEW *preview;
UINT r = ERROR_FUNCTION_FAILED;
- TRACE("%d %p\n", hdb, phPreview);
+ TRACE( "%lu %p\n", hdb, phPreview );
if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE)))
return ERROR_INVALID_HANDLE;
@@ -4264,7 +4263,7 @@ UINT WINAPI MsiPreviewDialogW( MSIHANDLE hPreview, LPCWSTR szDialogName )
MSIPREVIEW *preview;
UINT r;
- TRACE("%d %s\n", hPreview, debugstr_w(szDialogName));
+ TRACE( "%lu %s\n", hPreview, debugstr_w(szDialogName) );
preview = msihandle2msiinfo( hPreview, MSIHANDLETYPE_PREVIEW );
if (!preview)
@@ -4280,7 +4279,7 @@ UINT WINAPI MsiPreviewDialogA( MSIHANDLE hPreview, LPCSTR szDialogName )
UINT r;
LPWSTR strW = NULL;
- TRACE("%d %s\n", hPreview, debugstr_a(szDialogName));
+ TRACE( "%lu %s\n", hPreview, debugstr_a(szDialogName) );
if (szDialogName)
{
@@ -4293,15 +4292,15 @@ UINT WINAPI MsiPreviewDialogA( MSIHANDLE hPreview, LPCSTR szDialogName )
return r;
}
-UINT WINAPI MsiPreviewBillboardW( MSIHANDLE hPreview, LPCWSTR szControlName, LPCWSTR szBillboard )
+UINT WINAPI MsiPreviewBillboardW( MSIHANDLE hPreview, const WCHAR *szControlName, const WCHAR *szBillboard )
{
- FIXME("%d %s %s\n", hPreview, debugstr_w(szControlName), debugstr_w(szBillboard));
+ FIXME( "%lu %s %s\n", hPreview, debugstr_w(szControlName), debugstr_w(szBillboard) );
return ERROR_CALL_NOT_IMPLEMENTED;
}
-UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, LPCSTR szControlName, LPCSTR szBillboard )
+UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, const char *szControlName, const char *szBillboard )
{
- FIXME("%d %s %s\n", hPreview, debugstr_a(szControlName), debugstr_a(szBillboard));
+ FIXME( "%lu %s %s\n", hPreview, debugstr_a(szControlName), debugstr_a(szBillboard) );
return ERROR_CALL_NOT_IMPLEMENTED;
}
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 8cb876b2468..1b8e4fd7d90 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -355,7 +355,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil
}
if ((size = msi_get_disk_file_size( package, file->TargetPath )) != file->FileSize)
{
- TRACE("overwriting %s (old size %u new size %u)\n", debugstr_w(file->File), size, file->FileSize);
+ TRACE("overwriting %s (old size %lu new size %d)\n", debugstr_w(file->File), size, file->FileSize);
return msifs_overwrite;
}
if (file->hash.dwFileHashInfoSize)
@@ -722,7 +722,7 @@ static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch )
}
else
{
- WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError());
+ WARN( "failed to patch %s: %#lx\n", debugstr_w(patch->File->TargetPath), GetLastError() );
r = ERROR_INSTALL_FAILURE;
}
DeleteFileW( patch->path );
@@ -761,8 +761,8 @@ static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEP
{
if (!msi_copy_file( package, path, patch->File->TargetPath, FALSE ))
{
- ERR("Failed to copy file %s -> %s (%u)\n", debugstr_w(path),
- debugstr_w(patch->File->TargetPath), GetLastError() );
+ ERR( "failed to copy file %s -> %s (%lu)\n", debugstr_w(path),
+ debugstr_w(patch->File->TargetPath), GetLastError() );
msi_free( path );
msi_free( displayname );
IAssemblyName_Release( name );
@@ -898,7 +898,7 @@ static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *de
ret = msi_move_file( package, source, dest, MOVEFILE_REPLACE_EXISTING );
if (!ret)
{
- WARN("msi_move_file failed: %u\n", GetLastError());
+ WARN( "msi_move_file failed: %lu\n", GetLastError() );
return FALSE;
}
}
@@ -908,7 +908,7 @@ static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *de
ret = msi_copy_file( package, source, dest, FALSE );
if (!ret)
{
- WARN("msi_copy_file failed: %u\n", GetLastError());
+ WARN( "msi_copy_file failed: %lu\n", GetLastError() );
return FALSE;
}
}
@@ -1176,7 +1176,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
{
if (!msi_create_full_path( package, destdir ))
{
- WARN("failed to create directory %u\n", GetLastError());
+ WARN( "failed to create directory %lu\n", GetLastError() );
goto done;
}
}
@@ -1317,8 +1317,8 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
TRACE("Duplicating file %s to %s\n", debugstr_w(file->TargetPath), debugstr_w(dest));
if (!msi_copy_file( package, file->TargetPath, dest, TRUE ))
{
- WARN("Failed to copy file %s -> %s (%u)\n",
- debugstr_w(file->TargetPath), debugstr_w(dest), GetLastError());
+ WARN( "failed to copy file %s -> %s (%lu)\n",
+ debugstr_w(file->TargetPath), debugstr_w(dest), GetLastError() );
}
FIXME("We should track these duplicate files as well\n");
@@ -1395,7 +1395,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param )
TRACE("Removing duplicate %s of %s\n", debugstr_w(dest), debugstr_w(file->TargetPath));
if (!msi_delete_file( package, dest ))
{
- WARN("Failed to delete duplicate file %s (%u)\n", debugstr_w(dest), GetLastError());
+ WARN( "failed to delete duplicate file %s (%lu)\n", debugstr_w(dest), GetLastError() );
}
uirow = MSI_CreateRecord( 9 );
@@ -1606,7 +1606,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
msi_set_file_attributes( package, file->TargetPath, FILE_ATTRIBUTE_NORMAL );
if (!msi_delete_file( package, file->TargetPath ))
{
- WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError());
+ WARN( "failed to delete %s (%lu)\n", debugstr_w(file->TargetPath), GetLastError() );
}
file->state = msifs_missing;
diff --git a/dlls/msi/format.c b/dlls/msi/format.c
index 9e97c23aaad..fdfffabc22f 100644
--- a/dlls/msi/format.c
+++ b/dlls/msi/format.c
@@ -897,14 +897,13 @@ end:
return rc;
}
-UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord,
- LPWSTR szResult, LPDWORD sz )
+UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, WCHAR *szResult, DWORD *sz )
{
UINT r = ERROR_INVALID_HANDLE;
MSIPACKAGE *package;
MSIRECORD *record;
- TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz);
+ TRACE( "%lu, %lu, %p, %p\n", hInstall, hRecord, szResult, sz );
record = msihandle2msiinfo(hRecord, MSIHANDLETYPE_RECORD);
if (!record)
@@ -961,7 +960,7 @@ UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD *
DWORD len;
UINT r;
- TRACE("%d %d %p %p\n", hinst, hrec, buf, sz);
+ TRACE( "%lu, %lu, %p, %p\n", hinst, hrec, buf, sz );
rec = msihandle2msiinfo(hrec, MSIHANDLETYPE_RECORD);
if (!rec)
diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c
index 26d8e7d7f85..7be64da9bfe 100644
--- a/dlls/msi/handle.c
+++ b/dlls/msi/handle.c
@@ -127,7 +127,7 @@ MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj )
LeaveCriticalSection( &MSI_handle_cs );
- TRACE("%p -> %d\n", obj, ret );
+ TRACE( "%p -> %lu\n", obj, ret );
return ret;
}
@@ -150,7 +150,7 @@ MSIHANDLE alloc_msi_remote_handle(MSIHANDLE remote)
LeaveCriticalSection( &MSI_handle_cs );
- TRACE("%d -> %d\n", remote, ret);
+ TRACE( "%lu -> %lu\n", remote, ret );
return ret;
}
@@ -271,7 +271,7 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle)
MSIOBJECTHDR *info = NULL;
UINT ret = ERROR_INVALID_HANDLE;
- TRACE("%x\n",handle);
+ TRACE( "%lu\n", handle );
if (!handle)
return ERROR_SUCCESS;
@@ -305,7 +305,7 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle)
ret = ERROR_SUCCESS;
- TRACE("handle %x destroyed\n", handle+1);
+ TRACE( "handle %lu destroyed\n", handle + 1 );
out:
LeaveCriticalSection( &MSI_handle_cs );
if( info )
diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c
index 098287d6039..3021fc88de8 100644
--- a/dlls/msi/insert.c
+++ b/dlls/msi/insert.c
@@ -79,7 +79,7 @@ MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD
switch( vl->val->type )
{
case EXPR_SVAL:
- TRACE("field %d -> %s\n", i, debugstr_w(vl->val->u.sval));
+ TRACE( "field %lu -> %s\n", i, debugstr_w(vl->val->u.sval) );
MSI_RecordSetStringW( merged, i, vl->val->u.sval );
break;
case EXPR_IVAL:
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 4d909b67682..bf60406f8ef 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -672,7 +672,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
MSIPACKAGE *package;
BOOL r = FALSE;
- TRACE("%d %d\n", hInstall, iRunMode);
+ TRACE( "%lu, %d\n", hInstall, iRunMode );
package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
if (!package)
@@ -765,7 +765,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState)
MSIPACKAGE *package;
UINT r;
- TRACE("%d %d %d\n", hInstall, iRunMode, fState);
+ TRACE( "%lu, %d, %d\n", hInstall, iRunMode, fState );
package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE );
if (!package)
@@ -990,7 +990,7 @@ UINT WINAPI MsiSetFeatureAttributesA( MSIHANDLE handle, LPCSTR feature, DWORD at
UINT r;
WCHAR *featureW = NULL;
- TRACE("%u, %s, 0x%08x\n", handle, debugstr_a(feature), attrs);
+ TRACE( "%lu, %s, %#lx\n", handle, debugstr_a(feature), attrs );
if (feature && !(featureW = strdupAtoW( feature ))) return ERROR_OUTOFMEMORY;
@@ -1021,7 +1021,7 @@ UINT WINAPI MsiSetFeatureAttributesW( MSIHANDLE handle, LPCWSTR name, DWORD attr
MSIFEATURE *feature;
WCHAR *costing;
- TRACE("%u, %s, 0x%08x\n", handle, debugstr_w(name), attrs);
+ TRACE( "%lu, %s, %#lx\n", handle, debugstr_w(name), attrs );
if (!name || !name[0]) return ERROR_UNKNOWN_FEATURE;
@@ -1085,13 +1085,13 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature,
/***********************************************************************
* MsiGetFeatureStateW (MSI.@)
*/
-UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
- INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
+UINT WINAPI MsiGetFeatureStateW( MSIHANDLE hInstall, const WCHAR *szFeature, INSTALLSTATE *piInstalled,
+ INSTALLSTATE *piAction )
{
MSIPACKAGE* package;
UINT ret;
- TRACE("%d %s %p %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction);
+ TRACE( "%lu, %s, %p, %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction );
if (!szFeature)
return ERROR_UNKNOWN_FEATURE;
@@ -1204,15 +1204,14 @@ UINT MSI_GetFeatureCost( MSIPACKAGE *package, MSIFEATURE *feature, MSICOSTTREE t
/***********************************************************************
* MsiGetFeatureCostW (MSI.@)
*/
-UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature,
- MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost)
+UINT WINAPI MsiGetFeatureCostW( MSIHANDLE hInstall, const WCHAR *szFeature, MSICOSTTREE iCostTree,
+ INSTALLSTATE iState, INT *piCost )
{
MSIPACKAGE *package;
MSIFEATURE *feature;
UINT ret;
- TRACE("(%d %s %i %i %p)\n", hInstall, debugstr_w(szFeature),
- iCostTree, iState, piCost);
+ TRACE( "%lu, %s, %d, %d, %p\n", hInstall, debugstr_w(szFeature), iCostTree, iState, piCost );
if (!szFeature)
return ERROR_INVALID_PARAMETER;
@@ -1258,14 +1257,14 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature,
/***********************************************************************
* MsiGetFeatureInfoA (MSI.@)
*/
-UINT WINAPI MsiGetFeatureInfoA( MSIHANDLE handle, LPCSTR feature, LPDWORD attrs,
- LPSTR title, LPDWORD title_len, LPSTR help, LPDWORD help_len )
+UINT WINAPI MsiGetFeatureInfoA( MSIHANDLE handle, const char *feature, DWORD *attrs,
+ char *title, DWORD *title_len, char *help, DWORD *help_len )
{
UINT r;
WCHAR *titleW = NULL, *helpW = NULL, *featureW = NULL;
- TRACE("%u, %s, %p, %p, %p, %p, %p\n", handle, debugstr_a(feature), attrs, title,
- title_len, help, help_len);
+ TRACE( "%lu, %s, %p, %p, %p, %p, %p\n", handle, debugstr_a(feature), attrs, title,
+ title_len, help, help_len );
if (feature && !(featureW = strdupAtoW( feature ))) return ERROR_OUTOFMEMORY;
@@ -1352,14 +1351,14 @@ static UINT MSI_GetFeatureInfo( MSIPACKAGE *package, LPCWSTR name, LPDWORD attrs
/***********************************************************************
* MsiGetFeatureInfoW (MSI.@)
*/
-UINT WINAPI MsiGetFeatureInfoW( MSIHANDLE handle, LPCWSTR feature, LPDWORD attrs,
- LPWSTR title, LPDWORD title_len, LPWSTR help, LPDWORD help_len )
+UINT WINAPI MsiGetFeatureInfoW( MSIHANDLE handle, const WCHAR *feature, DWORD *attrs,
+ WCHAR *title, DWORD *title_len, WCHAR *help, DWORD *help_len )
{
UINT r;
MSIPACKAGE *package;
- TRACE("%u, %s, %p, %p, %p, %p, %p\n", handle, debugstr_w(feature), attrs, title,
- title_len, help, help_len);
+ TRACE( "%lu, %s, %p, %p, %p, %p, %p\n", handle, debugstr_w(feature), attrs, title,
+ title_len, help, help_len );
if (!feature) return ERROR_INVALID_PARAMETER;
@@ -1499,14 +1498,13 @@ UINT WINAPI MsiSetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
/***********************************************************************
* MsiGetComponentStateW (MSI.@)
*/
-UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
- INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
+UINT WINAPI MsiGetComponentStateW( MSIHANDLE hInstall, const WCHAR *szComponent, INSTALLSTATE *piInstalled,
+ INSTALLSTATE *piAction )
{
MSIPACKAGE* package;
UINT ret;
- TRACE("%d %s %p %p\n", hInstall, debugstr_w(szComponent),
- piInstalled, piAction);
+ TRACE( "%lu, %s, %p, %p\n", hInstall, debugstr_w(szComponent), piInstalled, piAction );
if (!szComponent)
return ERROR_UNKNOWN_COMPONENT;
@@ -1601,7 +1599,7 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel)
MSIPACKAGE* package;
UINT r;
- TRACE("%d %i\n", hInstall, iInstallLevel);
+ TRACE( "%lu %d\n", hInstall, iInstallLevel );
package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
if (!package)
@@ -1634,28 +1632,22 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel)
/***********************************************************************
* MsiGetFeatureValidStatesW (MSI.@)
*/
-UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature,
- LPDWORD pInstallState)
+UINT WINAPI MsiGetFeatureValidStatesW( MSIHANDLE hInstall, const WCHAR *szFeature, DWORD *pInstallState )
{
- if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL;
- FIXME("%d %s %p stub returning %d\n",
- hInstall, debugstr_w(szFeature), pInstallState, pInstallState ? *pInstallState : 0);
-
+ if (pInstallState) *pInstallState = 1 << INSTALLSTATE_LOCAL;
+ FIXME( "%lu, %s, %p stub returning %lu\n", hInstall, debugstr_w(szFeature), pInstallState,
+ pInstallState ? *pInstallState : 0 );
return ERROR_SUCCESS;
}
/***********************************************************************
* MsiGetFeatureValidStatesA (MSI.@)
*/
-UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE hInstall, LPCSTR szFeature,
- LPDWORD pInstallState)
+UINT WINAPI MsiGetFeatureValidStatesA( MSIHANDLE hInstall, const char *szFeature, DWORD *pInstallState )
{
UINT ret;
- LPWSTR szwFeature = strdupAtoW(szFeature);
-
+ WCHAR *szwFeature = strdupAtoW(szFeature);
ret = MsiGetFeatureValidStatesW(hInstall, szwFeature, pInstallState);
-
msi_free(szwFeature);
-
return ret;
}
diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index af6e83b893e..6aeb948de51 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -64,7 +64,7 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root)
if (!GetVolumeInformationW(root, volume_name, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0))
{
- WARN("failed to get volume information for %s (%u)\n", debugstr_w(root), GetLastError());
+ WARN( "failed to get volume information for %s (%lu)\n", debugstr_w(root), GetLastError() );
return FALSE;
}
@@ -227,7 +227,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode )
msi_free( encoded );
if (FAILED(hr))
{
- WARN("failed to open stream 0x%08x\n", hr);
+ WARN( "failed to open stream %#lx\n", hr );
return -1;
}
}
@@ -349,7 +349,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint,
length = strlen(pfdin->psz3) + 1 + strlen(next_cab) + 1;
if (length > 256)
{
- WARN("Cannot update next cabinet filename with a string size %u > 256\n", length);
+ WARN( "cannot update next cabinet filename with a string size %lu > 256\n", length );
msi_free(next_cab);
goto done;
}
@@ -441,7 +441,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
if (attrs2 == INVALID_FILE_ATTRIBUTES)
{
- ERR("failed to create %s (error %d)\n", debugstr_w(path), err);
+ ERR( "failed to create %s (error %lu)\n", debugstr_w(path), err );
goto done;
}
else if (err == ERROR_ACCESS_DENIED && (attrs2 & FILE_ATTRIBUTE_READONLY))
@@ -481,13 +481,12 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
}
else
{
- WARN("failed to schedule rename operation %s (error %d)\n", debugstr_w(path), GetLastError());
+ WARN( "failed to schedule rename operation %s (error %lu)\n", debugstr_w(path), GetLastError() );
DeleteFileW( tmpfileW );
}
msi_free(tmpfileW);
}
- else
- WARN("failed to create %s (error %d)\n", debugstr_w(path), err);
+ else WARN( "failed to create %s (error %lu)\n", debugstr_w(path), err );
}
done:
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index e91959e69f7..872c6cb66e2 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -181,21 +181,19 @@ UINT WINAPI MsiAdvertiseProductW(LPCWSTR szPackagePath, LPCWSTR szScriptfilePath
return ERROR_CALL_NOT_IMPLEMENTED;
}
-UINT WINAPI MsiAdvertiseProductExA(LPCSTR szPackagePath, LPCSTR szScriptfilePath,
- LPCSTR szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions)
+UINT WINAPI MsiAdvertiseProductExA( const char *szPackagePath, const char *szScriptfilePath,
+ const char *szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions )
{
- FIXME("%s %s %s %08x %08x %08x\n", debugstr_a(szPackagePath),
- debugstr_a(szScriptfilePath), debugstr_a(szTransforms),
- lgidLanguage, dwPlatform, dwOptions);
+ FIXME( "%s, %s, %s, %#x, %#lx, %#lx\n", debugstr_a(szPackagePath), debugstr_a(szScriptfilePath),
+ debugstr_a(szTransforms), lgidLanguage, dwPlatform, dwOptions );
return ERROR_CALL_NOT_IMPLEMENTED;
}
-UINT WINAPI MsiAdvertiseProductExW( LPCWSTR szPackagePath, LPCWSTR szScriptfilePath,
- LPCWSTR szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions)
+UINT WINAPI MsiAdvertiseProductExW( const WCHAR *szPackagePath, const WCHAR *szScriptfilePath,
+ const WCHAR *szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions )
{
- FIXME("%s %s %s %08x %08x %08x\n", debugstr_w(szPackagePath),
- debugstr_w(szScriptfilePath), debugstr_w(szTransforms),
- lgidLanguage, dwPlatform, dwOptions);
+ FIXME( "%s, %s, %s, %#x %#lx %#lx\n", debugstr_w(szPackagePath), debugstr_w(szScriptfilePath),
+ debugstr_w(szTransforms), lgidLanguage, dwPlatform, dwOptions );
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -267,24 +265,22 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine)
return r;
}
-UINT WINAPI MsiReinstallProductA(LPCSTR szProduct, DWORD dwReinstallMode)
+UINT WINAPI MsiReinstallProductA( const char *szProduct, DWORD dwReinstallMode )
{
- LPWSTR wszProduct;
+ WCHAR *wszProduct;
UINT rc;
- TRACE("%s %08x\n", debugstr_a(szProduct), dwReinstallMode);
+ TRACE( "%s, %#lx\n", debugstr_a(szProduct), dwReinstallMode );
wszProduct = strdupAtoW(szProduct);
-
rc = MsiReinstallProductW(wszProduct, dwReinstallMode);
-
msi_free(wszProduct);
return rc;
}
-UINT WINAPI MsiReinstallProductW(LPCWSTR szProduct, DWORD dwReinstallMode)
+UINT WINAPI MsiReinstallProductW( const WCHAR *szProduct, DWORD dwReinstallMode )
{
- TRACE("%s %08x\n", debugstr_w(szProduct), dwReinstallMode);
+ TRACE( "%s, %#lx\n", debugstr_w(szProduct), dwReinstallMode );
return MsiReinstallFeatureW(szProduct, L"ALL", dwReinstallMode);
}
@@ -531,14 +527,14 @@ static MSIPATCHSEQUENCEINFOW *patchinfoAtoW( DWORD count, const MSIPATCHSEQUENCE
return ret;
}
-UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath,
- DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo)
+UINT WINAPI MsiDetermineApplicablePatchesA( const char *szProductPackagePath, DWORD cPatchInfo,
+ MSIPATCHSEQUENCEINFOA *pPatchInfo )
{
UINT i, r;
WCHAR *package_path = NULL;
MSIPATCHSEQUENCEINFOW *psi;
- TRACE("%s, %u, %p\n", debugstr_a(szProductPackagePath), cPatchInfo, pPatchInfo);
+ TRACE( "%s, %lu, %p\n", debugstr_a(szProductPackagePath), cPatchInfo, pPatchInfo );
if (szProductPackagePath && !(package_path = strdupAtoW( szProductPackagePath )))
return ERROR_OUTOFMEMORY;
@@ -673,7 +669,7 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH
&IID_IXMLDOMDocument, (void**)&desc );
if (hr != S_OK)
{
- ERR("failed to create DOMDocument30 instance, 0x%08x\n", hr);
+ ERR( "failed to create DOMDocument30 instance, %#lx\n", hr );
return ERROR_FUNCTION_FAILED;
}
}
@@ -720,7 +716,7 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH
TRACE("szPatchData: %s\n", debugstr_w(info[i].szPatchData));
TRACE("ePatchDataType: %u\n", info[i].ePatchDataType);
- TRACE("dwOrder: %u\n", info[i].dwOrder);
+ TRACE("dwOrder: %lu\n", info[i].dwOrder);
TRACE("uStatus: %u\n", info[i].uStatus);
}
@@ -729,13 +725,13 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH
return ERROR_SUCCESS;
}
-UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath,
- DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo)
+UINT WINAPI MsiDetermineApplicablePatchesW( const WCHAR *szProductPackagePath, DWORD cPatchInfo,
+ MSIPATCHSEQUENCEINFOW *pPatchInfo )
{
UINT r;
MSIPACKAGE *package;
- TRACE("%s, %u, %p\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo);
+ TRACE( "%s, %lu, %p\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo );
r = MSI_OpenPackageW( szProductPackagePath, 0, &package );
if (r != ERROR_SUCCESS)
@@ -748,15 +744,14 @@ UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath,
return r;
}
-UINT WINAPI MsiDeterminePatchSequenceA( LPCSTR product, LPCSTR usersid,
- MSIINSTALLCONTEXT context, DWORD count, PMSIPATCHSEQUENCEINFOA patchinfo )
+UINT WINAPI MsiDeterminePatchSequenceA( const char *product, const char *usersid, MSIINSTALLCONTEXT context,
+ DWORD count, MSIPATCHSEQUENCEINFOA *patchinfo )
{
UINT i, r;
WCHAR *productW, *usersidW = NULL;
MSIPATCHSEQUENCEINFOW *patchinfoW;
- TRACE("%s, %s, %d, %d, %p\n", debugstr_a(product), debugstr_a(usersid),
- context, count, patchinfo);
+ TRACE( "%s, %s, %d, %lu, %p\n", debugstr_a(product), debugstr_a(usersid), context, count, patchinfo );
if (!product) return ERROR_INVALID_PARAMETER;
if (!(productW = strdupAtoW( product ))) return ERROR_OUTOFMEMORY;
@@ -818,14 +813,13 @@ static UINT open_package( const WCHAR *product, const WCHAR *usersid,
return MSI_OpenPackageW( sourcepath, 0, package );
}
-UINT WINAPI MsiDeterminePatchSequenceW( LPCWSTR product, LPCWSTR usersid,
- MSIINSTALLCONTEXT context, DWORD count, PMSIPATCHSEQUENCEINFOW patchinfo )
+UINT WINAPI MsiDeterminePatchSequenceW( const WCHAR *product, const WCHAR *usersid, MSIINSTALLCONTEXT context,
+ DWORD count, MSIPATCHSEQUENCEINFOW *patchinfo )
{
UINT r;
MSIPACKAGE *package;
- TRACE("%s, %s, %d, %d, %p\n", debugstr_w(product), debugstr_w(usersid),
- context, count, patchinfo);
+ TRACE( "%s, %s, %d, %lu, %p\n", debugstr_w(product), debugstr_w(usersid), context, count, patchinfo );
if (!product) return ERROR_INVALID_PARAMETER;
r = open_package( product, usersid, context, &package );
@@ -1089,7 +1083,7 @@ static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type )
return strdupW( temp );
}
- ERR( "unhandled value type %u\n", *type );
+ ERR( "unhandled value type %lu\n", *type );
return NULL;
}
@@ -1887,12 +1881,12 @@ UINT WINAPI MsiGetPatchInfoW( LPCWSTR patch, LPCWSTR attr, LPWSTR buffer, LPDWOR
return ERROR_UNKNOWN_PRODUCT;
}
-UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes)
+UINT WINAPI MsiEnableLogA( DWORD dwLogMode, const char *szLogFile, DWORD attributes )
{
LPWSTR szwLogFile = NULL;
UINT r;
- TRACE("%08x %s %08x\n", dwLogMode, debugstr_a(szLogFile), attributes);
+ TRACE( "%#lx, %s, %#lx\n", dwLogMode, debugstr_a(szLogFile), attributes );
if( szLogFile )
{
@@ -1905,9 +1899,9 @@ UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes)
return r;
}
-UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes)
+UINT WINAPI MsiEnableLogW( DWORD dwLogMode, const WCHAR *szLogFile, DWORD attributes )
{
- TRACE("%08x %s %08x\n", dwLogMode, debugstr_w(szLogFile), attributes);
+ TRACE( "%#lx, %s, %#lx\n", dwLogMode, debugstr_w(szLogFile), attributes );
msi_free(gszLogFile);
gszLogFile = NULL;
@@ -1924,23 +1918,21 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes)
gszLogFile = strdupW(szLogFile);
CloseHandle(file);
}
- else
- ERR("Unable to enable log %s (%u)\n", debugstr_w(szLogFile), GetLastError());
+ else ERR( "unable to enable log %s (%lu)\n", debugstr_w(szLogFile), GetLastError() );
}
return ERROR_SUCCESS;
}
-UINT WINAPI MsiEnumComponentCostsA( MSIHANDLE handle, LPCSTR component, DWORD index,
- INSTALLSTATE state, LPSTR drive, DWORD *buflen,
- int *cost, int *temp )
+UINT WINAPI MsiEnumComponentCostsA( MSIHANDLE handle, const char *component, DWORD index, INSTALLSTATE state,
+ char *drive, DWORD *buflen, int *cost, int *temp )
{
UINT r;
DWORD len;
WCHAR *driveW, *componentW = NULL;
- TRACE("%d, %s, %u, %d, %p, %p, %p %p\n", handle, debugstr_a(component), index,
- state, drive, buflen, cost, temp);
+ TRACE( "%lu, %s, %lu, %d, %p, %p, %p, %p\n", handle, debugstr_a(component), index, state, drive, buflen, cost,
+ temp );
if (!drive || !buflen) return ERROR_INVALID_PARAMETER;
if (component && !(componentW = strdupAtoW( component ))) return ERROR_OUTOFMEMORY;
@@ -1969,9 +1961,8 @@ static UINT set_drive( WCHAR *buffer, WCHAR letter )
return 2;
}
-UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD index,
- INSTALLSTATE state, LPWSTR drive, DWORD *buflen,
- int *cost, int *temp )
+UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DWORD index, INSTALLSTATE state,
+ WCHAR *drive, DWORD *buflen, int *cost, int *temp )
{
UINT r = ERROR_NO_MORE_ITEMS;
MSICOMPONENT *comp = NULL;
@@ -1980,8 +1971,8 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i
STATSTG stat = {0};
WCHAR path[MAX_PATH];
- TRACE("%d, %s, %u, %d, %p, %p, %p %p\n", handle, debugstr_w(component), index,
- state, drive, buflen, cost, temp);
+ TRACE( "%lu, %s, %lu, %d, %p, %p, %p, %p\n", handle, debugstr_w(component), index, state, drive, buflen, cost,
+ temp );
if (!drive || !buflen || !cost || !temp) return ERROR_INVALID_PARAMETER;
if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE )))
@@ -2315,12 +2306,11 @@ INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL dwUILevel, HWND *phWnd)
return old;
}
-INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler,
- DWORD dwMessageFilter, LPVOID pvContext)
+INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA( INSTALLUI_HANDLERA puiHandler, DWORD dwMessageFilter, void *pvContext )
{
INSTALLUI_HANDLERA prev = gUIHandlerA;
- TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext);
+ TRACE( "%p, %#lx, %p\n", puiHandler, dwMessageFilter, pvContext );
gUIHandlerA = puiHandler;
gUIHandlerW = NULL;
@@ -2330,12 +2320,11 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler,
return prev;
}
-INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler,
- DWORD dwMessageFilter, LPVOID pvContext)
+INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW( INSTALLUI_HANDLERW puiHandler, DWORD dwMessageFilter, void *pvContext )
{
INSTALLUI_HANDLERW prev = gUIHandlerW;
- TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext);
+ TRACE( "%p, %#lx, %p\n", puiHandler, dwMessageFilter, pvContext );
gUIHandlerA = NULL;
gUIHandlerW = puiHandler;
@@ -2370,24 +2359,22 @@ INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler,
* for starters, as -1 is an invalid MSI handle, but not an invalid module
* handle. Maybe strings can be stored in an MSI database somehow.
*/
-LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, LPWSTR lpBuffer,
- int nBufferMax, LANGID lang )
+LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, WCHAR *lpBuffer, int nBufferMax, LANGID lang )
{
HRSRC hres;
HGLOBAL hResData;
LPWSTR p;
DWORD i, len;
- TRACE("%d %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang);
+ TRACE( "%lu, %u, %p, %d, %#x\n", handle, id, lpBuffer, nBufferMax, lang );
if( handle != -1 )
- FIXME("don't know how to deal with handle = %08x\n", handle);
+ FIXME( "don't know how to deal with handle = %lu\n", handle );
if( !lang )
lang = GetUserDefaultLangID();
- hres = FindResourceExW( msi_hInstance, (LPCWSTR) RT_STRING,
- (LPWSTR)1, lang );
+ hres = FindResourceExW( msi_hInstance, (const WCHAR *)RT_STRING, (WCHAR *)1, lang );
if( !hres )
return 0;
hResData = LoadResource( msi_hInstance, hres );
@@ -2464,55 +2451,49 @@ INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR szComponent, LPWSTR lpPathBuf,
return MsiGetComponentPathW( szProduct, szComponent, lpPathBuf, pcchBuf );
}
-UINT WINAPI MsiMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,
- WORD wLanguageId, DWORD f)
+UINT WINAPI MsiMessageBoxA( HWND hWnd, const char *lpText, const char *lpCaption, UINT uType, WORD wLanguageId,
+ DWORD f )
{
- FIXME("%p %s %s %u %08x %08x\n", hWnd, debugstr_a(lpText), debugstr_a(lpCaption),
- uType, wLanguageId, f);
- return MessageBoxExA(hWnd,lpText,lpCaption,uType,wLanguageId);
+ FIXME( "%p, %s, %s, %u, %#x, %#lx\n", hWnd, debugstr_a(lpText), debugstr_a(lpCaption), uType, wLanguageId, f );
+ return MessageBoxExA( hWnd, lpText, lpCaption, uType, wLanguageId );
}
-UINT WINAPI MsiMessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType,
- WORD wLanguageId, DWORD f)
+UINT WINAPI MsiMessageBoxW( HWND hWnd, const WCHAR *lpText, const WCHAR *lpCaption, UINT uType, WORD wLanguageId,
+ DWORD f )
{
- FIXME("%p %s %s %u %08x %08x\n", hWnd, debugstr_w(lpText), debugstr_w(lpCaption),
- uType, wLanguageId, f);
- return MessageBoxExW(hWnd,lpText,lpCaption,uType,wLanguageId);
+ FIXME( "%p, %s, %s, %u, %#x %#lx\n", hWnd, debugstr_w(lpText), debugstr_w(lpCaption), uType, wLanguageId, f );
+ return MessageBoxExW( hWnd, lpText, lpCaption, uType, wLanguageId );
}
-UINT WINAPI MsiMessageBoxExA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,
- DWORD unknown, WORD wLanguageId, DWORD f)
+UINT WINAPI MsiMessageBoxExA( HWND hWnd, const char *lpText, const char *lpCaption, UINT uType, DWORD unknown,
+ WORD wLanguageId, DWORD f )
{
- FIXME("(%p, %s, %s, %u, 0x%08x, 0x%08x, 0x%08x): semi-stub\n", hWnd, debugstr_a(lpText),
- debugstr_a(lpCaption), uType, unknown, wLanguageId, f);
- return MessageBoxExA(hWnd, lpText, lpCaption, uType, wLanguageId);
+ FIXME( "%p, %s, %s, %u, %#lx, %#x, %#lx): semi-stub\n", hWnd, debugstr_a(lpText), debugstr_a(lpCaption), uType,
+ unknown, wLanguageId, f );
+ return MessageBoxExA( hWnd, lpText, lpCaption, uType, wLanguageId );
}
-UINT WINAPI MsiMessageBoxExW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType,
- DWORD unknown, WORD wLanguageId, DWORD f)
+UINT WINAPI MsiMessageBoxExW( HWND hWnd, const WCHAR *lpText, const WCHAR *lpCaption, UINT uType, DWORD unknown,
+ WORD wLanguageId, DWORD f )
{
- FIXME("(%p, %s, %s, %u, 0x%08x, 0x%08x, 0x%08x): semi-stub\n", hWnd, debugstr_w(lpText),
- debugstr_w(lpCaption), uType, unknown, wLanguageId, f);
- return MessageBoxExW(hWnd, lpText, lpCaption, uType, wLanguageId);
+ FIXME( "%p, %s, %s, %u, %#lx, %#x, %#lx): semi-stub\n", hWnd, debugstr_w(lpText), debugstr_w(lpCaption), uType,
+ unknown, wLanguageId, f );
+ return MessageBoxExW( hWnd, lpText, lpCaption, uType, wLanguageId );
}
-UINT WINAPI MsiProvideAssemblyA( LPCSTR szAssemblyName, LPCSTR szAppContext,
- DWORD dwInstallMode, DWORD dwAssemblyInfo, LPSTR lpPathBuf,
- LPDWORD pcchPathBuf )
+UINT WINAPI MsiProvideAssemblyA( const char *szAssemblyName, const char *szAppContext, DWORD dwInstallMode,
+ DWORD dwAssemblyInfo, char *lpPathBuf, DWORD *pcchPathBuf )
{
- FIXME("%s %s %08x %08x %p %p\n", debugstr_a(szAssemblyName),
- debugstr_a(szAppContext), dwInstallMode, dwAssemblyInfo, lpPathBuf,
- pcchPathBuf);
+ FIXME( "%s, %s, %#lx, %#lx, %p, %p\n", debugstr_a(szAssemblyName), debugstr_a(szAppContext), dwInstallMode,
+ dwAssemblyInfo, lpPathBuf, pcchPathBuf );
return ERROR_CALL_NOT_IMPLEMENTED;
}
-UINT WINAPI MsiProvideAssemblyW( LPCWSTR szAssemblyName, LPCWSTR szAppContext,
- DWORD dwInstallMode, DWORD dwAssemblyInfo, LPWSTR lpPathBuf,
- LPDWORD pcchPathBuf )
+UINT WINAPI MsiProvideAssemblyW( const WCHAR *szAssemblyName, const WCHAR *szAppContext, DWORD dwInstallMode,
+ DWORD dwAssemblyInfo, WCHAR *lpPathBuf, DWORD *pcchPathBuf )
{
- FIXME("%s %s %08x %08x %p %p\n", debugstr_w(szAssemblyName),
- debugstr_w(szAppContext), dwInstallMode, dwAssemblyInfo, lpPathBuf,
- pcchPathBuf);
+ FIXME( "%s, %s, %#lx, %#lx, %p, %p\n", debugstr_w(szAssemblyName), debugstr_w(szAppContext), dwInstallMode,
+ dwAssemblyInfo, lpPathBuf, pcchPathBuf );
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -2530,13 +2511,13 @@ UINT WINAPI MsiProvideComponentFromDescriptorW( LPCWSTR szDescriptor,
return ERROR_CALL_NOT_IMPLEMENTED;
}
-HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT_CONTEXT *cert,
- LPBYTE hash, LPDWORD hashlen )
+HRESULT WINAPI MsiGetFileSignatureInformationA( const char *path, DWORD flags, PCCERT_CONTEXT *cert, BYTE *hash,
+ DWORD *hashlen )
{
UINT r;
WCHAR *pathW = NULL;
- TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen);
+ TRACE( "%s, %#lx, %p, %p, %p\n", debugstr_a(path), flags, cert, hash, hashlen );
if (path && !(pathW = strdupAtoW( path ))) return E_OUTOFMEMORY;
r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen );
@@ -2544,8 +2525,8 @@ HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT
return r;
}
-HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCERT_CONTEXT *cert,
- LPBYTE hash, LPDWORD hashlen )
+HRESULT WINAPI MsiGetFileSignatureInformationW( const WCHAR *path, DWORD flags, PCCERT_CONTEXT *cert, BYTE *hash,
+ DWORD *hashlen )
{
static GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2;
HRESULT hr;
@@ -2554,7 +2535,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCER
CRYPT_PROVIDER_SGNR *signer;
CRYPT_PROVIDER_CERT *provider;
- TRACE("%s %08x %p %p %p\n", debugstr_w(path), flags, cert, hash, hashlen);
+ TRACE( "%s, %#lx, %p, %p, %p\n", debugstr_w(path), flags, cert, hash, hashlen );
if (!path || !cert) return E_INVALIDARG;
@@ -2612,15 +2593,13 @@ done:
/******************************************************************
* MsiGetProductPropertyA [MSI.@]
*/
-UINT WINAPI MsiGetProductPropertyA(MSIHANDLE hProduct, LPCSTR szProperty,
- LPSTR szValue, LPDWORD pccbValue)
+UINT WINAPI MsiGetProductPropertyA( MSIHANDLE hProduct, const char *szProperty, char *szValue, DWORD *pccbValue )
{
LPWSTR prop = NULL, val = NULL;
DWORD len;
UINT r;
- TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_a(szProperty),
- szValue, pccbValue);
+ TRACE( "%lu, %s, %p, %p\n", hProduct, debugstr_a(szProperty), szValue, pccbValue );
if (szValue && !pccbValue)
return ERROR_INVALID_PARAMETER;
@@ -2674,8 +2653,7 @@ done:
/******************************************************************
* MsiGetProductPropertyW [MSI.@]
*/
-UINT WINAPI MsiGetProductPropertyW(MSIHANDLE hProduct, LPCWSTR szProperty,
- LPWSTR szValue, LPDWORD pccbValue)
+UINT WINAPI MsiGetProductPropertyW( MSIHANDLE hProduct, const WCHAR *szProperty, WCHAR *szValue, DWORD *pccbValue )
{
MSIPACKAGE *package;
MSIQUERY *view = NULL;
@@ -2683,8 +2661,7 @@ UINT WINAPI MsiGetProductPropertyW(MSIHANDLE hProduct, LPCWSTR szProperty,
LPCWSTR val;
UINT r;
- TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_w(szProperty),
- szValue, pccbValue);
+ TRACE( "%lu, %s, %p, %p)\n", hProduct, debugstr_w(szProperty), szValue, pccbValue );
if (!szProperty)
return ERROR_INVALID_PARAMETER;
@@ -3234,13 +3211,11 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen,
/******************************************************************
* MsiGetFileVersionW [MSI.@]
*/
-UINT WINAPI MsiGetFileVersionW( LPCWSTR path, LPWSTR verbuf, LPDWORD verlen,
- LPWSTR langbuf, LPDWORD langlen )
+UINT WINAPI MsiGetFileVersionW( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, WCHAR *langbuf, DWORD *langlen )
{
UINT ret;
- TRACE("%s %p %u %p %u\n", debugstr_w(path), verbuf, verlen ? *verlen : 0,
- langbuf, langlen ? *langlen : 0);
+ TRACE( "%s, %p(%lu), %p(%lu)\n", debugstr_w(path), verbuf, verlen ? *verlen : 0, langbuf, langlen ? *langlen : 0 );
if ((verbuf && !verlen) || (langbuf && !langlen))
return ERROR_INVALID_PARAMETER;
@@ -3307,13 +3282,12 @@ end:
/***********************************************************************
* MsiUseFeatureExW [MSI.@]
*/
-INSTALLSTATE WINAPI MsiUseFeatureExW( LPCWSTR szProduct, LPCWSTR szFeature,
- DWORD dwInstallMode, DWORD dwReserved )
+INSTALLSTATE WINAPI MsiUseFeatureExW( const WCHAR *szProduct, const WCHAR *szFeature, DWORD dwInstallMode,
+ DWORD dwReserved )
{
INSTALLSTATE state;
- TRACE("%s %s %i %i\n", debugstr_w(szProduct), debugstr_w(szFeature),
- dwInstallMode, dwReserved);
+ TRACE( "%s, %s, %lu %#lx\n", debugstr_w(szProduct), debugstr_w(szFeature), dwInstallMode, dwReserved );
state = MsiQueryFeatureStateW( szProduct, szFeature );
@@ -3332,14 +3306,13 @@ INSTALLSTATE WINAPI MsiUseFeatureExW( LPCWSTR szProduct, LPCWSTR szFeature,
/***********************************************************************
* MsiUseFeatureExA [MSI.@]
*/
-INSTALLSTATE WINAPI MsiUseFeatureExA( LPCSTR szProduct, LPCSTR szFeature,
- DWORD dwInstallMode, DWORD dwReserved )
+INSTALLSTATE WINAPI MsiUseFeatureExA( const char *szProduct, const char *szFeature, DWORD dwInstallMode,
+ DWORD dwReserved )
{
INSTALLSTATE ret = INSTALLSTATE_UNKNOWN;
- LPWSTR prod = NULL, feat = NULL;
+ WCHAR *prod = NULL, *feat = NULL;
- TRACE("%s %s %i %i\n", debugstr_a(szProduct), debugstr_a(szFeature),
- dwInstallMode, dwReserved);
+ TRACE( "%s, %s, %lu, %#lx\n", debugstr_a(szProduct), debugstr_a(szFeature), dwInstallMode, dwReserved );
prod = strdupAtoW( szProduct );
if (szProduct && !prod)
@@ -3456,39 +3429,35 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent,
/***********************************************************************
* MsiProvideQualifiedComponentExW [MSI.@]
*/
-UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent,
- LPCWSTR szQualifier, DWORD dwInstallMode, LPCWSTR szProduct,
- DWORD Unused1, DWORD Unused2, LPWSTR lpPathBuf,
- LPDWORD pcchPathBuf)
+UINT WINAPI MsiProvideQualifiedComponentExW( const WCHAR *szComponent, const WCHAR *szQualifier, DWORD dwInstallMode,
+ const WCHAR *szProduct, DWORD Unused1, DWORD Unused2, WCHAR *lpPathBuf,
+ DWORD *pcchPathBuf )
{
awstring path;
- TRACE("%s %s %u %s %u %u %p %p\n", debugstr_w(szComponent),
- debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct),
- Unused1, Unused2, lpPathBuf, pcchPathBuf);
+ TRACE( "%s, %s, %lu, %s, %#lx, %#lx, %p, %p\n", debugstr_w(szComponent), debugstr_w(szQualifier), dwInstallMode,
+ debugstr_w(szProduct), Unused1, Unused2, lpPathBuf, pcchPathBuf );
path.unicode = TRUE;
path.str.w = lpPathBuf;
- return MSI_ProvideQualifiedComponentEx(szComponent, szQualifier,
- dwInstallMode, szProduct, Unused1, Unused2, &path, pcchPathBuf);
+ return MSI_ProvideQualifiedComponentEx( szComponent, szQualifier, dwInstallMode, szProduct, Unused1, Unused2,
+ &path, pcchPathBuf );
}
/***********************************************************************
* MsiProvideQualifiedComponentExA [MSI.@]
*/
-UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR szComponent,
- LPCSTR szQualifier, DWORD dwInstallMode, LPCSTR szProduct,
- DWORD Unused1, DWORD Unused2, LPSTR lpPathBuf,
- LPDWORD pcchPathBuf)
+UINT WINAPI MsiProvideQualifiedComponentExA( const char *szComponent, const char *szQualifier, DWORD dwInstallMode,
+ const char *szProduct, DWORD Unused1, DWORD Unused2, char *lpPathBuf,
+ DWORD *pcchPathBuf )
{
- LPWSTR szwComponent, szwQualifier = NULL, szwProduct = NULL;
+ WCHAR *szwComponent, *szwQualifier = NULL, *szwProduct = NULL;
UINT r = ERROR_OUTOFMEMORY;
awstring path;
- TRACE("%s %s %u %s %u %u %p %p\n", debugstr_a(szComponent),
- debugstr_a(szQualifier), dwInstallMode, debugstr_a(szProduct),
- Unused1, Unused2, lpPathBuf, pcchPathBuf);
+ TRACE( "%s, %s, %lu, %s, %#lx, %#lx, %p, %p\n", debugstr_a(szComponent), debugstr_a(szQualifier), dwInstallMode,
+ debugstr_a(szProduct), Unused1, Unused2, lpPathBuf, pcchPathBuf );
szwComponent = strdupAtoW( szComponent );
if (szComponent && !szwComponent)
@@ -3848,11 +3817,11 @@ UINT WINAPI MsiCreateAndVerifyInstallerDirectory(DWORD dwReserved)
{
WCHAR path[MAX_PATH];
- TRACE("%d\n", dwReserved);
+ TRACE( "%#lx\n", dwReserved );
if (dwReserved)
{
- FIXME("dwReserved=%d\n", dwReserved);
+ FIXME( "dwReserved = %#lx\n", dwReserved );
return ERROR_INVALID_PARAMETER;
}
@@ -3952,7 +3921,7 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget,
return ERROR_FUNCTION_FAILED;
}
-UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode )
+UINT WINAPI MsiReinstallFeatureW( const WCHAR *szProduct, const WCHAR *szFeature, DWORD dwReinstallMode )
{
MSIPACKAGE *package;
MSIINSTALLCONTEXT context;
@@ -3961,7 +3930,7 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dw
WCHAR *ptr, *cmdline;
DWORD sz;
- TRACE("%s, %s, 0x%08x\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode);
+ TRACE( "%s, %s, %#lx\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode );
r = msi_locate_product( szProduct, &context );
if (r != ERROR_SUCCESS)
@@ -4023,15 +3992,12 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dw
return r;
}
-UINT WINAPI MsiReinstallFeatureA( LPCSTR szProduct, LPCSTR szFeature,
- DWORD dwReinstallMode )
+UINT WINAPI MsiReinstallFeatureA( const char *szProduct, const char *szFeature, DWORD dwReinstallMode )
{
- LPWSTR wszProduct;
- LPWSTR wszFeature;
+ WCHAR *wszProduct, *wszFeature;
UINT rc;
- TRACE("%s %s %i\n", debugstr_a(szProduct), debugstr_a(szFeature),
- dwReinstallMode);
+ TRACE( "%s, %s, %lu\n", debugstr_a(szProduct), debugstr_a(szFeature), dwReinstallMode );
wszProduct = strdupAtoW(szProduct);
wszFeature = strdupAtoW(szFeature);
@@ -4068,7 +4034,7 @@ UINT msi_get_filehash( MSIPACKAGE *package, const WCHAR *path, MSIFILEHASHINFO *
handle = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL );
if (handle == INVALID_HANDLE_VALUE)
{
- WARN("can't open file %u\n", GetLastError());
+ WARN( "can't open file %lu\n", GetLastError() );
return ERROR_FILE_NOT_FOUND;
}
if ((length = GetFileSize( handle, NULL )))
@@ -4104,10 +4070,9 @@ UINT msi_get_filehash( MSIPACKAGE *package, const WCHAR *path, MSIFILEHASHINFO *
/***********************************************************************
* MsiGetFileHashW [MSI.@]
*/
-UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions,
- PMSIFILEHASHINFO pHash )
+UINT WINAPI MsiGetFileHashW( const WCHAR *szFilePath, DWORD dwOptions, MSIFILEHASHINFO *pHash )
{
- TRACE("%s %08x %p\n", debugstr_w(szFilePath), dwOptions, pHash );
+ TRACE( "%s, %#lx, %p\n", debugstr_w(szFilePath), dwOptions, pHash );
if (!szFilePath)
return ERROR_INVALID_PARAMETER;
@@ -4128,13 +4093,12 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions,
/***********************************************************************
* MsiGetFileHashA [MSI.@]
*/
-UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions,
- PMSIFILEHASHINFO pHash )
+UINT WINAPI MsiGetFileHashA( const char *szFilePath, DWORD dwOptions, MSIFILEHASHINFO *pHash )
{
LPWSTR file;
UINT r;
- TRACE("%s %08x %p\n", debugstr_a(szFilePath), dwOptions, pHash );
+ TRACE( "%s, %#lx, %p\n", debugstr_a(szFilePath), dwOptions, pHash );
file = strdupAtoW( szFilePath );
if (szFilePath && !file)
@@ -4148,22 +4112,18 @@ UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions,
/***********************************************************************
* MsiAdvertiseScriptW [MSI.@]
*/
-UINT WINAPI MsiAdvertiseScriptW( LPCWSTR szScriptFile, DWORD dwFlags,
- PHKEY phRegData, BOOL fRemoveItems )
+UINT WINAPI MsiAdvertiseScriptW( const WCHAR *szScriptFile, DWORD dwFlags, HKEY *phRegData, BOOL fRemoveItems )
{
- FIXME("%s %08x %p %d\n",
- debugstr_w( szScriptFile ), dwFlags, phRegData, fRemoveItems );
+ FIXME( "%s, %#lx, %p, %d\n", debugstr_w(szScriptFile), dwFlags, phRegData, fRemoveItems );
return ERROR_CALL_NOT_IMPLEMENTED;
}
/***********************************************************************
* MsiAdvertiseScriptA [MSI.@]
*/
-UINT WINAPI MsiAdvertiseScriptA( LPCSTR szScriptFile, DWORD dwFlags,
- PHKEY phRegData, BOOL fRemoveItems )
+UINT WINAPI MsiAdvertiseScriptA( const char *szScriptFile, DWORD dwFlags, HKEY *phRegData, BOOL fRemoveItems )
{
- FIXME("%s %08x %p %d\n",
- debugstr_a( szScriptFile ), dwFlags, phRegData, fRemoveItems );
+ FIXME( "%s, %#lx, %p, %d\n", debugstr_a(szScriptFile), dwFlags, phRegData, fRemoveItems );
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -4192,11 +4152,10 @@ UINT WINAPI MsiIsProductElevatedA( LPCSTR szProduct, BOOL *pfElevated )
/***********************************************************************
* MsiSetExternalUIRecord [MSI.@]
*/
-UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler,
- DWORD filter, LPVOID context,
- PINSTALLUI_HANDLER_RECORD prev )
+UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, DWORD filter, void *context,
+ INSTALLUI_HANDLER_RECORD *prev )
{
- TRACE("%p %08x %p %p\n", handler, filter, context, prev);
+ TRACE( "%p, %#lx, %p, %p\n", handler, filter, context, prev );
if (prev)
*prev = gUIHandlerRecord;
@@ -4242,14 +4201,16 @@ UINT WINAPI MsiInstallMissingComponentW(LPCWSTR szProduct, LPCWSTR szComponent,
return ERROR_SUCCESS;
}
-UINT WINAPI MsiProvideComponentA( LPCSTR product, LPCSTR feature, LPCSTR component, DWORD mode, LPSTR buf, LPDWORD buflen )
+UINT WINAPI MsiProvideComponentA( const char *product, const char *feature, const char *component, DWORD mode,
+ char *buf, DWORD *buflen )
{
WCHAR *productW = NULL, *componentW = NULL, *featureW = NULL, *bufW = NULL;
UINT r = ERROR_OUTOFMEMORY;
DWORD lenW = 0;
int len;
- TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, buf, buflen);
+ TRACE( "%s, %s, %s, %#lx, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode,
+ buf, buflen );
if (product && !(productW = strdupAtoW( product ))) goto done;
if (feature && !(featureW = strdupAtoW( feature ))) goto done;
@@ -4288,11 +4249,13 @@ done:
return r;
}
-UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR component, DWORD mode, LPWSTR buf, LPDWORD buflen )
+UINT WINAPI MsiProvideComponentW( const WCHAR *product, const WCHAR *feature, const WCHAR *component, DWORD mode,
+ WCHAR *buf, DWORD *buflen )
{
INSTALLSTATE state;
- TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_w(product), debugstr_w(component), debugstr_w(feature), mode, buf, buflen);
+ TRACE( "%s, %s, %s, %#lx, %p, %p\n", debugstr_w(product), debugstr_w(component), debugstr_w(feature), mode,
+ buf, buflen);
state = MsiQueryFeatureStateW( product, feature );
TRACE("feature state: %d\n", state);
@@ -4302,7 +4265,7 @@ UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR comp
break;
default:
- FIXME("mode %x not implemented\n", mode);
+ FIXME( "mode %#lx not implemented\n", mode );
return ERROR_INSTALL_FAILURE;
}
@@ -4331,12 +4294,12 @@ UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR comp
/***********************************************************************
* MsiBeginTransactionA [MSI.@]
*/
-UINT WINAPI MsiBeginTransactionA( LPCSTR name, DWORD attrs, MSIHANDLE *id, HANDLE *event )
+UINT WINAPI MsiBeginTransactionA( const char *name, DWORD attrs, MSIHANDLE *id, HANDLE *event )
{
WCHAR *nameW;
UINT r;
- FIXME("%s %u %p %p\n", debugstr_a(name), attrs, id, event);
+ FIXME( "%s, %#lx, %p, %p\n", debugstr_a(name), attrs, id, event );
nameW = strdupAtoW( name );
if (name && !nameW)
@@ -4350,9 +4313,9 @@ UINT WINAPI MsiBeginTransactionA( LPCSTR name, DWORD attrs, MSIHANDLE *id, HANDL
/***********************************************************************
* MsiBeginTransactionW [MSI.@]
*/
-UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HANDLE *event )
+UINT WINAPI MsiBeginTransactionW( const WCHAR *name, DWORD attrs, MSIHANDLE *id, HANDLE *event )
{
- FIXME("%s %u %p %p\n", debugstr_w(name), attrs, id, event);
+ FIXME( "%s, %#lx, %p, %p\n", debugstr_w(name), attrs, id, event );
*id = (MSIHANDLE)0xdeadbeef;
*event = (HANDLE)0xdeadbeef;
@@ -4365,7 +4328,7 @@ UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HAND
*/
UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event )
{
- FIXME("%u %08x %p\n", handle, attrs, event);
+ FIXME( "%lu, %#lx, %p\n", handle, attrs, event );
*event = (HANDLE)0xdeadbeef;
return ERROR_SUCCESS;
@@ -4376,13 +4339,13 @@ UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event )
*/
UINT WINAPI MsiEndTransaction( DWORD state )
{
- FIXME("%u\n", state);
+ FIXME( "%#lx\n", state );
return ERROR_SUCCESS;
}
-UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d)
+UINT WINAPI Migrate10CachedPackagesW( void *a, void *b, void *c, DWORD d )
{
- FIXME("%p,%p,%p,%08x\n", a, b, c, d);
+ FIXME( "%p, %p, %p, %#lx\n", a, b, c, d );
return ERROR_SUCCESS;
}
diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c
index b3a499a0788..00135a0317a 100644
--- a/dlls/msi/msiquery.c
+++ b/dlls/msi/msiquery.c
@@ -85,13 +85,12 @@ UINT VIEW_find_column( MSIVIEW *table, LPCWSTR name, LPCWSTR table_name, UINT *n
return ERROR_INVALID_PARAMETER;
}
-UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE hdb,
- LPCSTR szQuery, MSIHANDLE *phView)
+UINT WINAPI MsiDatabaseOpenViewA( MSIHANDLE hdb, const char *szQuery, MSIHANDLE *phView )
{
UINT r;
- LPWSTR szwQuery;
+ WCHAR *szwQuery;
- TRACE("%d %s %p\n", hdb, debugstr_a(szQuery), phView);
+ TRACE( "%lu, %s, %p\n", hdb, debugstr_a(szQuery), phView );
if( szQuery )
{
@@ -108,13 +107,12 @@ UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE hdb,
return r;
}
-UINT MSI_DatabaseOpenViewW(MSIDATABASE *db,
- LPCWSTR szQuery, MSIQUERY **pView)
+UINT MSI_DatabaseOpenViewW( MSIDATABASE *db, const WCHAR *szQuery, MSIQUERY **pView )
{
MSIQUERY *query;
UINT r;
- TRACE("%s %p\n", debugstr_w(szQuery), pView);
+ TRACE( "%s, %p\n", debugstr_w(szQuery), pView );
/* pre allocate a handle to hold a pointer to the view */
query = alloc_msiobject( MSIHANDLETYPE_VIEW, sizeof (MSIQUERY),
@@ -403,13 +401,13 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec)
return r;
}
-UINT WINAPI MsiViewFetch(MSIHANDLE hView, MSIHANDLE *record)
+UINT WINAPI MsiViewFetch( MSIHANDLE hView, MSIHANDLE *record )
{
MSIQUERY *query;
MSIRECORD *rec = NULL;
UINT ret;
- TRACE("%d %p\n", hView, record);
+ TRACE( "%lu, %p\n", hView, record );
if( !record )
return ERROR_INVALID_PARAMETER;
@@ -468,12 +466,12 @@ UINT MSI_ViewClose(MSIQUERY *query)
return view->ops->close( view );
}
-UINT WINAPI MsiViewClose(MSIHANDLE hView)
+UINT WINAPI MsiViewClose( MSIHANDLE hView )
{
MSIQUERY *query;
UINT ret;
- TRACE("%d\n", hView );
+ TRACE( "%lu\n", hView );
query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW );
if (!query)
@@ -517,13 +515,13 @@ UINT MSI_ViewExecute(MSIQUERY *query, MSIRECORD *rec )
return view->ops->execute( view, rec );
}
-UINT WINAPI MsiViewExecute(MSIHANDLE hView, MSIHANDLE hRec)
+UINT WINAPI MsiViewExecute( MSIHANDLE hView, MSIHANDLE hRec )
{
MSIQUERY *query;
MSIRECORD *rec = NULL;
UINT ret;
- TRACE("%d %d\n", hView, hRec);
+ TRACE( "%lu, %lu\n", hView, hRec );
if( hRec )
{
@@ -641,13 +639,13 @@ UINT MSI_ViewGetColumnInfo( MSIQUERY *query, MSICOLINFO info, MSIRECORD **prec )
return ERROR_SUCCESS;
}
-UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hRec)
+UINT WINAPI MsiViewGetColumnInfo( MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hRec )
{
MSIQUERY *query = NULL;
MSIRECORD *rec = NULL;
UINT r;
- TRACE("%d %d %p\n", hView, info, hRec);
+ TRACE( "%lu, %d, %p\n", hView, info, hRec );
if( !hRec )
return ERROR_INVALID_PARAMETER;
@@ -719,14 +717,13 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec )
return r;
}
-UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode,
- MSIHANDLE hRecord)
+UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, MSIHANDLE hRecord )
{
MSIQUERY *query = NULL;
MSIRECORD *rec = NULL;
UINT r = ERROR_FUNCTION_FAILED;
- TRACE("%d %x %d\n", hView, eModifyMode, hRecord);
+ TRACE( "%lu, %#x, %lu\n", hView, eModifyMode, hRecord );
rec = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD );
@@ -770,13 +767,13 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode,
return r;
}
-MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buflen )
+MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, WCHAR *buffer, DWORD *buflen )
{
MSIQUERY *query;
const WCHAR *column;
MSIDBERROR r;
- TRACE("%u %p %p\n", handle, buffer, buflen);
+ TRACE( "%lu, %p, %p\n", handle, buffer, buflen );
if (!buflen)
return MSIDBERROR_INVALIDARG;
@@ -821,13 +818,13 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf
return r;
}
-MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD buflen )
+MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, char *buffer, DWORD *buflen )
{
MSIQUERY *query;
const WCHAR *column;
MSIDBERROR r;
- TRACE("%u %p %p\n", handle, buffer, buflen);
+ TRACE( "%lu, %p, %p\n", handle, buffer, buflen );
if (!buflen)
return MSIDBERROR_INVALIDARG;
@@ -892,7 +889,7 @@ UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int e
hr = IStorage_OpenStorage( db->storage, transform + 1, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &stg );
if (FAILED( hr ))
{
- WARN( "failed to open substorage transform 0x%08x\n", hr );
+ WARN( "failed to open substorage transform %#lx\n", hr );
return ERROR_FUNCTION_FAILED;
}
}
@@ -901,7 +898,7 @@ UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int e
hr = StgOpenStorage( transform, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg );
if (FAILED( hr ))
{
- WARN( "failed to open file transform 0x%08x\n", hr );
+ WARN( "failed to open file transform %#lx\n", hr );
return ERROR_FUNCTION_FAILED;
}
}
@@ -938,7 +935,7 @@ UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, in
WCHAR *wstr;
UINT ret;
- TRACE( "%d %s %08x\n", hdb, debugstr_a(transform), error_cond );
+ TRACE( "%lu, %s, %#x\n", hdb, debugstr_a(transform), error_cond );
wstr = strdupAtoW( transform );
if (transform && !wstr)
@@ -949,19 +946,17 @@ UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, in
return ret;
}
-UINT WINAPI MsiDatabaseGenerateTransformA( MSIHANDLE hdb, MSIHANDLE hdbref,
- LPCSTR szTransformFile, int iReserved1, int iReserved2 )
+UINT WINAPI MsiDatabaseGenerateTransformA( MSIHANDLE hdb, MSIHANDLE hdbref, const char *szTransformFile,
+ int iReserved1, int iReserved2 )
{
- FIXME("%d %d %s %d %d\n", hdb, hdbref,
- debugstr_a(szTransformFile), iReserved1, iReserved2);
+ FIXME( "%lu, %lu, %s, %d, %d\n", hdb, hdbref, debugstr_a(szTransformFile), iReserved1, iReserved2 );
return ERROR_CALL_NOT_IMPLEMENTED;
}
-UINT WINAPI MsiDatabaseGenerateTransformW( MSIHANDLE hdb, MSIHANDLE hdbref,
- LPCWSTR szTransformFile, int iReserved1, int iReserved2 )
+UINT WINAPI MsiDatabaseGenerateTransformW( MSIHANDLE hdb, MSIHANDLE hdbref, const WCHAR *szTransformFile,
+ int iReserved1, int iReserved2 )
{
- FIXME("%d %d %s %d %d\n", hdb, hdbref,
- debugstr_w(szTransformFile), iReserved1, iReserved2);
+ FIXME( "%lu, %lu, %s, %d, %d\n", hdb, hdbref, debugstr_w(szTransformFile), iReserved1, iReserved2 );
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -970,7 +965,7 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb )
MSIDATABASE *db;
UINT r;
- TRACE("%d\n", hdb);
+ TRACE( "%lu\n", hdb );
db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE );
if( !db )
@@ -1066,7 +1061,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
r = MSI_IterateRecords( query, 0, msi_primary_key_iterator, &info );
if( r == ERROR_SUCCESS )
{
- TRACE("Found %d primary keys\n", info.n );
+ TRACE( "found %lu primary keys\n", info.n );
/* allocate a record and fill in the names of the tables */
info.rec = MSI_CreateRecord( info.n );
@@ -1082,14 +1077,13 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
return r;
}
-UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb,
- LPCWSTR table, MSIHANDLE* phRec )
+UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, const WCHAR *table, MSIHANDLE *phRec )
{
MSIRECORD *rec = NULL;
MSIDATABASE *db;
UINT r;
- TRACE("%d %s %p\n", hdb, debugstr_w(table), phRec);
+ TRACE( "%lu, %s, %p\n", hdb, debugstr_w(table), phRec );
db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE );
if( !db )
@@ -1132,13 +1126,12 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb,
return r;
}
-UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE hdb,
- LPCSTR table, MSIHANDLE* phRec)
+UINT WINAPI MsiDatabaseGetPrimaryKeysA( MSIHANDLE hdb, const char *table, MSIHANDLE *phRec )
{
- LPWSTR szwTable = NULL;
+ WCHAR *szwTable = NULL;
UINT r;
- TRACE("%d %s %p\n", hdb, debugstr_a(table), phRec);
+ TRACE( "%lu, %s, %p\n", hdb, debugstr_a(table), phRec );
if( table )
{
@@ -1152,13 +1145,12 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE hdb,
return r;
}
-MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
- MSIHANDLE hDatabase, LPCSTR szTableName)
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( MSIHANDLE hDatabase, const char *szTableName )
{
- LPWSTR szwTableName = NULL;
+ WCHAR *szwTableName = NULL;
MSICONDITION r;
- TRACE("%x %s\n", hDatabase, debugstr_a(szTableName));
+ TRACE( "%lu, %s\n", hDatabase, debugstr_a(szTableName) );
if( szTableName )
{
@@ -1172,13 +1164,12 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
return r;
}
-MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
- MSIHANDLE hDatabase, LPCWSTR szTableName)
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( MSIHANDLE hDatabase, const WCHAR *szTableName )
{
MSIDATABASE *db;
MSICONDITION r;
- TRACE("%x %s\n", hDatabase, debugstr_w(szTableName));
+ TRACE( "%lu, %s\n", hDatabase, debugstr_w(szTableName) );
db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE );
if( !db )
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 93cc6210f6e..ccbcdea6717 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -291,7 +291,7 @@ static void free_package_structures( MSIPACKAGE *package )
list_remove( &binary->entry );
if (!DeleteFileW( binary->tmpfile ))
- ERR("failed to delete %s (%u)\n", debugstr_w(binary->tmpfile), GetLastError());
+ ERR( "failed to delete %s (%lu)\n", debugstr_w(binary->tmpfile), GetLastError() );
msi_free( binary->source );
msi_free( binary->tmpfile );
msi_free( binary );
@@ -314,7 +314,7 @@ static void free_package_structures( MSIPACKAGE *package )
list_remove( &patch->entry );
if (patch->delete_on_close && !DeleteFileW( patch->localfile ))
{
- ERR("failed to delete %s (%u)\n", debugstr_w(patch->localfile), GetLastError());
+ ERR( "failed to delete %s (%lu)\n", debugstr_w(patch->localfile), GetLastError() );
}
msi_free_patchinfo( patch );
}
@@ -1546,12 +1546,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage)
return ERROR_SUCCESS;
}
-UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phPackage)
+UINT WINAPI MsiOpenPackageExW( const WCHAR *szPackage, DWORD dwOptions, MSIHANDLE *phPackage )
{
MSIPACKAGE *package = NULL;
UINT ret;
- TRACE("%s %08x %p\n", debugstr_w(szPackage), dwOptions, phPackage );
+ TRACE( "%s, %#lx, %p\n", debugstr_w(szPackage), dwOptions, phPackage );
if( !szPackage || !phPackage )
return ERROR_INVALID_PARAMETER;
@@ -1563,7 +1563,7 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP
}
if( dwOptions )
- FIXME("dwOptions %08x not supported\n", dwOptions);
+ FIXME( "dwOptions %#lx not supported\n", dwOptions );
ret = MSI_OpenPackageW( szPackage, 0, &package );
if( ret == ERROR_SUCCESS )
@@ -1608,13 +1608,13 @@ UINT WINAPI MsiOpenPackageA(LPCSTR szPackage, MSIHANDLE *phPackage)
return MsiOpenPackageExA( szPackage, 0, phPackage );
}
-MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall)
+MSIHANDLE WINAPI MsiGetActiveDatabase( MSIHANDLE hInstall )
{
MSIPACKAGE *package;
MSIHANDLE handle = 0;
MSIHANDLE remote;
- TRACE("(%d)\n",hInstall);
+ TRACE( "%lu\n", hInstall );
package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE);
if( package)
@@ -1814,21 +1814,21 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
if (gUIHandlerRecord && (gUIFilterRecord & log_type))
{
MSIHANDLE rec = alloc_msihandle(&record->hdr);
- TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n",
- gUIHandlerRecord, gUIContextRecord, eMessageType, rec);
+ TRACE( "calling UI handler %p(pvContext = %p, iMessageType = %#x, hRecord = %lu)\n",
+ gUIHandlerRecord, gUIContextRecord, eMessageType, rec );
rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec );
MsiCloseHandle( rec );
}
if (!rc && gUIHandlerW && (gUIFilter & log_type))
{
- TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n",
- gUIHandlerW, gUIContext, eMessageType, debugstr_w(message));
+ TRACE( "calling UI handler %p(pvContext = %p, iMessageType = %#x, szMessage = %s)\n",
+ gUIHandlerW, gUIContext, eMessageType, debugstr_w(message) );
rc = gUIHandlerW( gUIContext, eMessageType, message );
}
else if (!rc && gUIHandlerA && (gUIFilter & log_type))
{
- TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n",
- gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg));
+ TRACE( "calling UI handler %p(pvContext = %p, iMessageType = %#x, szMessage = %s)\n",
+ gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg) );
rc = gUIHandlerA( gUIContext, eMessageType, msg );
}
@@ -2207,8 +2207,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName,
TRACE("returning %s for property %s\n", debugstr_wn(szValueBuf, *pchValueBuf),
debugstr_w(szName));
else if (rc == ERROR_MORE_DATA)
- TRACE("need %d sized buffer for %s\n", *pchValueBuf,
- debugstr_w(szName));
+ TRACE( "need %lu sized buffer for %s\n", *pchValueBuf, debugstr_w(szName) );
else
{
*pchValueBuf = 0;
diff --git a/dlls/msi/record.c b/dlls/msi/record.c
index 46c2d71f6f1..9e11752cc97 100644
--- a/dlls/msi/record.c
+++ b/dlls/msi/record.c
@@ -115,7 +115,7 @@ UINT WINAPI MsiRecordGetFieldCount( MSIHANDLE handle )
MSIRECORD *rec;
UINT ret;
- TRACE("%d\n", handle );
+ TRACE( "%lu\n", handle );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -239,7 +239,7 @@ int WINAPI MsiRecordGetInteger( MSIHANDLE handle, UINT iField)
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d\n", handle, iField );
+ TRACE( "%lu, %u\n", handle, iField );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -258,7 +258,7 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle )
MSIRECORD *rec;
UINT i;
- TRACE("%d\n", handle );
+ TRACE( "%lu\n", handle );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -305,7 +305,7 @@ UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, UINT iField, int iVal )
MSIRECORD *rec;
UINT ret;
- TRACE("%d %u %d\n", handle, iField, iVal);
+ TRACE( "%lu, %u, %d\n", handle, iField, iVal );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -335,7 +335,7 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField )
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d\n", handle, iField );
+ TRACE( "%lu, %u\n", handle, iField );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -400,13 +400,12 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField,
return ret;
}
-UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, UINT iField,
- LPSTR szValue, LPDWORD pcchValue)
+UINT WINAPI MsiRecordGetStringA( MSIHANDLE handle, UINT iField, char *szValue, DWORD *pcchValue )
{
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue);
+ TRACE( "%lu, %d, %p, %p\n", handle, iField, szValue, pcchValue );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -436,13 +435,12 @@ const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField )
return msi_record_get_string( rec, iField, NULL );
}
-UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField,
- LPWSTR szValue, LPDWORD pcchValue)
+UINT MSI_RecordGetStringW( MSIRECORD *rec, UINT iField, WCHAR *szValue, DWORD *pcchValue )
{
UINT len = 0, ret = ERROR_SUCCESS;
WCHAR buffer[16];
- TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue);
+ TRACE( "%p, %u, %p, %p\n", rec, iField, szValue, pcchValue );
if( iField > rec->count )
{
@@ -481,13 +479,12 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField,
return ret;
}
-UINT WINAPI MsiRecordGetStringW(MSIHANDLE handle, UINT iField,
- LPWSTR szValue, LPDWORD pcchValue)
+UINT WINAPI MsiRecordGetStringW( MSIHANDLE handle, UINT iField, WCHAR *szValue, DWORD *pcchValue )
{
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue);
+ TRACE( "%lu, %u, %p, %p\n", handle, iField, szValue, pcchValue );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -532,12 +529,12 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField)
return 0;
}
-UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField)
+UINT WINAPI MsiRecordDataSize( MSIHANDLE handle, UINT iField )
{
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d\n", handle, iField);
+ TRACE( "%lu, %u\n", handle, iField );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -549,13 +546,13 @@ UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField)
return ret;
}
-UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue )
+UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, const char *szValue )
{
WCHAR *valueW = NULL;
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d %s\n", handle, iField, debugstr_a(szValue));
+ TRACE( "%lu, %u %s\n", handle, iField, debugstr_a(szValue) );
if (szValue && !(valueW = strdupAtoW( szValue ))) return ERROR_OUTOFMEMORY;
@@ -604,12 +601,12 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue )
return msi_record_set_string( rec, iField, szValue, -1 );
}
-UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, LPCWSTR szValue )
+UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, const WCHAR *szValue )
{
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d %s\n", handle, iField, debugstr_w(szValue));
+ TRACE( "%lu, %u, %s\n", handle, iField, debugstr_w(szValue) );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -667,8 +664,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm)
ulSize.QuadPart = sz;
IStream_SetSize(*pstm, ulSize);
- TRACE("read %s, %d bytes into IStream %p\n", debugstr_w(szFile), sz, *pstm);
-
+ TRACE( "read %s, %lu bytes into IStream %p\n", debugstr_w(szFile), sz, *pstm );
return ERROR_SUCCESS;
}
@@ -725,12 +721,12 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilenam
return ERROR_SUCCESS;
}
-UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, UINT iField, LPCSTR szFilename)
+UINT WINAPI MsiRecordSetStreamA( MSIHANDLE hRecord, UINT iField, const char *szFilename )
{
- LPWSTR wstr = NULL;
+ WCHAR *wstr = NULL;
UINT ret;
- TRACE("%d %d %s\n", hRecord, iField, debugstr_a(szFilename));
+ TRACE( "%lu, %u, %s\n", hRecord, iField, debugstr_a(szFilename) );
if( szFilename )
{
@@ -744,12 +740,12 @@ UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, UINT iField, LPCSTR szFilenam
return ret;
}
-UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, UINT iField, LPCWSTR szFilename)
+UINT WINAPI MsiRecordSetStreamW( MSIHANDLE handle, UINT iField, const WCHAR *szFilename )
{
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d %s\n", handle, iField, debugstr_w(szFilename));
+ TRACE( "%lu, %u, %s\n", handle, iField, debugstr_w(szFilename) );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
@@ -820,12 +816,12 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz)
return ERROR_SUCCESS;
}
-UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, UINT iField, char *buf, LPDWORD sz)
+UINT WINAPI MsiRecordReadStream( MSIHANDLE handle, UINT iField, char *buf, DWORD *sz )
{
MSIRECORD *rec;
UINT ret;
- TRACE("%d %d %p %p\n", handle, iField, buf, sz);
+ TRACE( "%lu, %u, %p, %p\n", handle, iField, buf, sz );
rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
if( !rec )
diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c
index 5dc3c0a81c3..877b889ef42 100644
--- a/dlls/msi/registry.c
+++ b/dlls/msi/registry.c
@@ -1021,12 +1021,12 @@ UINT WINAPI MsiDecomposeDescriptorA( LPCSTR szDescriptor, LPSTR szProduct,
return r;
}
-UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid)
+UINT WINAPI MsiEnumProductsA( DWORD index, char *lpguid )
{
DWORD r;
WCHAR szwGuid[GUID_SIZE];
- TRACE("%d %p\n", index, lpguid);
+ TRACE( "%lu, %p\n", index, lpguid );
if (NULL == lpguid)
return ERROR_INVALID_PARAMETER;
@@ -1037,9 +1037,9 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid)
return r;
}
-UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid)
+UINT WINAPI MsiEnumProductsW( DWORD index, WCHAR *lpguid )
{
- TRACE("%d %p\n", index, lpguid);
+ TRACE("%lu, %p\n", index, lpguid );
if (NULL == lpguid)
return ERROR_INVALID_PARAMETER;
@@ -1048,13 +1048,13 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid)
NULL, NULL, NULL );
}
-UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, LPSTR szFeature, LPSTR szParent)
+UINT WINAPI MsiEnumFeaturesA( const char *szProduct, DWORD index, char *szFeature, char *szParent )
{
DWORD r;
WCHAR szwFeature[GUID_SIZE], szwParent[GUID_SIZE];
- LPWSTR szwProduct = NULL;
+ WCHAR *szwProduct = NULL;
- TRACE("%s %d %p %p\n", debugstr_a(szProduct), index, szFeature, szParent);
+ TRACE( "%s, %lu, %p, %p\n", debugstr_a(szProduct), index, szFeature, szParent );
if( szProduct )
{
@@ -1066,10 +1066,8 @@ UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, LPSTR szFeature, LPS
r = MsiEnumFeaturesW(szwProduct, index, szwFeature, szwParent);
if( r == ERROR_SUCCESS )
{
- WideCharToMultiByte(CP_ACP, 0, szwFeature, -1,
- szFeature, GUID_SIZE, NULL, NULL);
- WideCharToMultiByte(CP_ACP, 0, szwParent, -1,
- szParent, GUID_SIZE, NULL, NULL);
+ WideCharToMultiByte(CP_ACP, 0, szwFeature, -1, szFeature, GUID_SIZE, NULL, NULL);
+ WideCharToMultiByte(CP_ACP, 0, szwParent, -1, szParent, GUID_SIZE, NULL, NULL);
}
msi_free( szwProduct);
@@ -1077,12 +1075,12 @@ UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, LPSTR szFeature, LPS
return r;
}
-UINT WINAPI MsiEnumFeaturesW(LPCWSTR szProduct, DWORD index, LPWSTR szFeature, LPWSTR szParent)
+UINT WINAPI MsiEnumFeaturesW( const WCHAR *szProduct, DWORD index, WCHAR *szFeature, WCHAR *szParent )
{
HKEY hkeyProduct = 0;
DWORD r, sz;
- TRACE("%s %d %p %p\n", debugstr_w(szProduct), index, szFeature, szParent);
+ TRACE( "%s, %lu, %p, %p\n", debugstr_w(szProduct), index, szFeature, szParent );
if( !szProduct )
return ERROR_INVALID_PARAMETER;
@@ -1098,12 +1096,12 @@ UINT WINAPI MsiEnumFeaturesW(LPCWSTR szProduct, DWORD index, LPWSTR szFeature, L
return r;
}
-UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid)
+UINT WINAPI MsiEnumComponentsA( DWORD index, char *lpguid )
{
DWORD r;
WCHAR szwGuid[GUID_SIZE];
- TRACE("%u, %p\n", index, lpguid);
+ TRACE( "%lu, %p\n", index, lpguid );
if (!lpguid) return ERROR_INVALID_PARAMETER;
@@ -1114,23 +1112,23 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid)
return r;
}
-UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid)
+UINT WINAPI MsiEnumComponentsW( DWORD index, WCHAR *lpguid )
{
- TRACE("%u, %p\n", index, lpguid);
+ TRACE( "%lu, %p\n", index, lpguid );
if (!lpguid) return ERROR_INVALID_PARAMETER;
return MsiEnumComponentsExW( L"S-1-1-0", MSIINSTALLCONTEXT_ALL, index, lpguid, NULL, NULL, NULL );
}
-UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39],
- MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len )
+UINT WINAPI MsiEnumComponentsExA( const char *user_sid, DWORD ctx, DWORD index, CHAR guid[39],
+ MSIINSTALLCONTEXT *installed_ctx, char *sid, DWORD *sid_len )
{
UINT r;
WCHAR *user_sidW = NULL, *sidW = NULL, guidW[GUID_SIZE];
- TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_a(user_sid), ctx, index, guid, installed_ctx,
- sid, sid_len);
+ TRACE( "%s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_a(user_sid), ctx, index, guid, installed_ctx,
+ sid, sid_len );
if (sid && !sid_len) return ERROR_INVALID_PARAMETER;
if (user_sid && !(user_sidW = strdupAtoW( user_sid ))) return ERROR_OUTOFMEMORY;
@@ -1300,15 +1298,15 @@ done:
return r;
}
-UINT WINAPI MsiEnumComponentsExW( LPCWSTR user_sid, DWORD ctx, DWORD index, WCHAR guid[39],
- MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len )
+UINT WINAPI MsiEnumComponentsExW( const WCHAR *user_sid, DWORD ctx, DWORD index, WCHAR guid[39],
+ MSIINSTALLCONTEXT *installed_ctx, WCHAR *sid, DWORD *sid_len )
{
UINT r;
DWORD idx = 0;
static DWORD last_index;
- TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_w(user_sid), ctx, index, guid, installed_ctx,
- sid, sid_len);
+ TRACE( "%s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(user_sid), ctx, index, guid, installed_ctx,
+ sid, sid_len );
if ((sid && !sid_len) || !ctx || (user_sid && ctx == MSIINSTALLCONTEXT_MACHINE))
return ERROR_INVALID_PARAMETER;
@@ -1327,13 +1325,13 @@ UINT WINAPI MsiEnumComponentsExW( LPCWSTR user_sid, DWORD ctx, DWORD index, WCHA
return r;
}
-UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct)
+UINT WINAPI MsiEnumClientsA( const char *szComponent, DWORD index, char *szProduct )
{
DWORD r;
WCHAR szwProduct[GUID_SIZE];
- LPWSTR szwComponent = NULL;
+ WCHAR *szwComponent = NULL;
- TRACE("%s %d %p\n", debugstr_a(szComponent), index, szProduct);
+ TRACE( "%s, %lu, %p\n", debugstr_a(szComponent), index, szProduct );
if ( !szProduct )
return ERROR_INVALID_PARAMETER;
@@ -1347,23 +1345,20 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct)
r = MsiEnumClientsW(szComponent?szwComponent:NULL, index, szwProduct);
if( r == ERROR_SUCCESS )
- {
- WideCharToMultiByte(CP_ACP, 0, szwProduct, -1,
- szProduct, GUID_SIZE, NULL, NULL);
- }
+ WideCharToMultiByte(CP_ACP, 0, szwProduct, -1, szProduct, GUID_SIZE, NULL, NULL);
msi_free( szwComponent);
return r;
}
-UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
+UINT WINAPI MsiEnumClientsW( const WCHAR *szComponent, DWORD index, WCHAR *szProduct )
{
HKEY hkeyComp = 0;
DWORD r, sz;
WCHAR szValName[SQUASHED_GUID_SIZE];
- TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct);
+ TRACE( "%s, %lu, %p\n", debugstr_w(szComponent), index, szProduct );
if (!szComponent || !*szComponent || !szProduct)
return ERROR_INVALID_PARAMETER;
@@ -1396,35 +1391,33 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
return r;
}
-UINT WINAPI MsiEnumClientsExA(LPCSTR component, LPCSTR usersid, DWORD ctx, DWORD index,
- CHAR installed_product[GUID_SIZE],
- MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len)
+UINT WINAPI MsiEnumClientsExA( const char *component, const char *usersid, DWORD ctx, DWORD index,
+ char installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, char *sid,
+ DWORD *sid_len )
{
- FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_a(component), debugstr_a(usersid),
- ctx, index, installed_product, installed_ctx, sid, sid_len);
+ FIXME( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_a(component), debugstr_a(usersid), ctx, index,
+ installed_product, installed_ctx, sid, sid_len );
return ERROR_ACCESS_DENIED;
}
-UINT WINAPI MsiEnumClientsExW(LPCWSTR component, LPCWSTR usersid, DWORD ctx, DWORD index,
- WCHAR installed_product[GUID_SIZE],
- MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len)
+UINT WINAPI MsiEnumClientsExW( const WCHAR *component, const WCHAR *usersid, DWORD ctx, DWORD index,
+ WCHAR installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, WCHAR *sid,
+ DWORD *sid_len )
{
- FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_w(component), debugstr_w(usersid),
- ctx, index, installed_product, installed_ctx, sid, sid_len);
+ FIXME( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(component), debugstr_w(usersid), ctx, index,
+ installed_product, installed_ctx, sid, sid_len );
return ERROR_ACCESS_DENIED;
}
-static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
- awstring *lpQualBuf, LPDWORD pcchQual,
- awstring *lpAppBuf, LPDWORD pcchAppBuf )
+static UINT MSI_EnumComponentQualifiers( const WCHAR *szComponent, DWORD iIndex, awstring *lpQualBuf,
+ DWORD *pcchQual, awstring *lpAppBuf, DWORD *pcchAppBuf )
{
DWORD name_sz, val_sz, name_max, val_max, type, ofs;
- LPWSTR name = NULL, val = NULL;
+ WCHAR *name = NULL, *val = NULL;
UINT r, r2;
HKEY key;
- TRACE("%s %08x %p %p %p %p\n", debugstr_w(szComponent), iIndex,
- lpQualBuf, pcchQual, lpAppBuf, pcchAppBuf);
+ TRACE( "%s, %lu, %p, %p, %p, %p\n", debugstr_w(szComponent), iIndex, lpQualBuf, pcchQual, lpAppBuf, pcchAppBuf );
if (!szComponent)
return ERROR_INVALID_PARAMETER;
@@ -1451,8 +1444,7 @@ static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
{
name_sz = name_max;
val_sz = val_max;
- r = RegEnumValueW( key, iIndex, name, &name_sz,
- NULL, &type, (LPBYTE)val, &val_sz );
+ r = RegEnumValueW( key, iIndex, name, &name_sz, NULL, &type, (BYTE *)val, &val_sz );
if (r == ERROR_SUCCESS)
break;
if (r != ERROR_MORE_DATA)
@@ -1460,7 +1452,7 @@ static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
if (type != REG_MULTI_SZ)
{
- ERR("component data has wrong type (%d)\n", type);
+ ERR( "component data has wrong type (%lu)\n", type );
goto end;
}
@@ -1483,7 +1475,7 @@ static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
goto end;
continue;
}
- ERR("should be enough data, but isn't %d %d\n", name_sz, val_sz );
+ ERR( "should be enough data, but isn't %lu %lu\n", name_sz, val_sz );
goto end;
}
@@ -1510,17 +1502,16 @@ end:
/*************************************************************************
* MsiEnumComponentQualifiersA [MSI.@]
*/
-UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
- LPSTR lpQualifierBuf, LPDWORD pcchQualifierBuf,
- LPSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf )
+UINT WINAPI MsiEnumComponentQualifiersA( const char *szComponent, DWORD iIndex, char *lpQualifierBuf,
+ DWORD *pcchQualifierBuf, char *lpApplicationDataBuf,
+ DWORD *pcchApplicationDataBuf )
{
awstring qual, appdata;
- LPWSTR comp;
+ WCHAR *comp;
UINT r;
- TRACE("%s %08x %p %p %p %p\n", debugstr_a(szComponent), iIndex,
- lpQualifierBuf, pcchQualifierBuf, lpApplicationDataBuf,
- pcchApplicationDataBuf);
+ TRACE( "%s, %lu, %p, %p, %p, %p\n", debugstr_a(szComponent), iIndex, lpQualifierBuf, pcchQualifierBuf,
+ lpApplicationDataBuf, pcchApplicationDataBuf );
comp = strdupAtoW( szComponent );
if (szComponent && !comp)
@@ -1541,15 +1532,14 @@ UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
/*************************************************************************
* MsiEnumComponentQualifiersW [MSI.@]
*/
-UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex,
- LPWSTR lpQualifierBuf, LPDWORD pcchQualifierBuf,
- LPWSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf )
+UINT WINAPI MsiEnumComponentQualifiersW( const WCHAR *szComponent, DWORD iIndex, WCHAR *lpQualifierBuf,
+ DWORD *pcchQualifierBuf, WCHAR *lpApplicationDataBuf,
+ DWORD *pcchApplicationDataBuf )
{
awstring qual, appdata;
- TRACE("%s %08x %p %p %p %p\n", debugstr_w(szComponent), iIndex,
- lpQualifierBuf, pcchQualifierBuf, lpApplicationDataBuf,
- pcchApplicationDataBuf);
+ TRACE( "%s, %lu, %p, %p, %p, %p\n", debugstr_w(szComponent), iIndex, lpQualifierBuf, pcchQualifierBuf,
+ lpApplicationDataBuf, pcchApplicationDataBuf );
qual.unicode = TRUE;
qual.str.w = lpQualifierBuf;
@@ -1557,24 +1547,22 @@ UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex,
appdata.unicode = TRUE;
appdata.str.w = lpApplicationDataBuf;
- return MSI_EnumComponentQualifiers( szComponent, iIndex,
- &qual, pcchQualifierBuf, &appdata, pcchApplicationDataBuf );
+ return MSI_EnumComponentQualifiers( szComponent, iIndex, &qual, pcchQualifierBuf, &appdata, pcchApplicationDataBuf );
}
/*************************************************************************
* MsiEnumRelatedProductsW [MSI.@]
*
*/
-UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved,
- DWORD iProductIndex, LPWSTR lpProductBuf)
+UINT WINAPI MsiEnumRelatedProductsW( const WCHAR *szUpgradeCode, DWORD dwReserved, DWORD iProductIndex,
+ WCHAR *lpProductBuf )
{
UINT r;
HKEY hkey;
WCHAR szKeyName[SQUASHED_GUID_SIZE];
DWORD dwSize = ARRAY_SIZE(szKeyName);
- TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved,
- iProductIndex, lpProductBuf);
+ TRACE( "%s, %#lx, %lu, %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf );
if (NULL == szUpgradeCode)
return ERROR_INVALID_PARAMETER;
@@ -1597,15 +1585,14 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved,
* MsiEnumRelatedProductsA [MSI.@]
*
*/
-UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
- DWORD iProductIndex, LPSTR lpProductBuf)
+UINT WINAPI MsiEnumRelatedProductsA( const char *szUpgradeCode, DWORD dwReserved, DWORD iProductIndex,
+ char *lpProductBuf )
{
- LPWSTR szwUpgradeCode = NULL;
+ WCHAR *szwUpgradeCode = NULL;
WCHAR productW[GUID_SIZE];
UINT r;
- TRACE("%s %u %u %p\n", debugstr_a(szUpgradeCode), dwReserved,
- iProductIndex, lpProductBuf);
+ TRACE( "%s, %#lx, %lu, %p\n", debugstr_a(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf );
if (szUpgradeCode)
{
@@ -1628,23 +1615,19 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
/***********************************************************************
* MsiEnumPatchesExA [MSI.@]
*/
-UINT WINAPI MsiEnumPatchesExA(LPCSTR szProductCode, LPCSTR szUserSid,
- DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPSTR szPatchCode,
- LPSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext,
- LPSTR szTargetUserSid, LPDWORD pcchTargetUserSid)
+UINT WINAPI MsiEnumPatchesExA( const char *szProductCode, const char *szUserSid, DWORD dwContext, DWORD dwFilter,
+ DWORD dwIndex, char *szPatchCode, char *szTargetProductCode,
+ MSIINSTALLCONTEXT *pdwTargetProductContext, char *szTargetUserSid,
+ DWORD *pcchTargetUserSid )
{
- LPWSTR prodcode = NULL;
- LPWSTR usersid = NULL;
- LPWSTR targsid = NULL;
- WCHAR patch[GUID_SIZE];
- WCHAR targprod[GUID_SIZE];
+ WCHAR *prodcode = NULL, *usersid = NULL, *targsid = NULL;
+ WCHAR patch[GUID_SIZE], targprod[GUID_SIZE];
DWORD len;
UINT r;
- TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n",
- debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, dwFilter,
- dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext,
- szTargetUserSid, pcchTargetUserSid);
+ TRACE( "%s, %s, %#lx, %lu, %lu, %p, %p, %p, %p, %p\n", debugstr_a(szProductCode), debugstr_a(szUserSid),
+ dwContext, dwFilter, dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid,
+ pcchTargetUserSid );
if (szTargetUserSid && !pcchTargetUserSid)
return ERROR_INVALID_PARAMETER;
@@ -1977,10 +1960,10 @@ done:
/***********************************************************************
* MsiEnumPatchesExW [MSI.@]
*/
-UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
- DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPWSTR szPatchCode,
- LPWSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext,
- LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid)
+UINT WINAPI MsiEnumPatchesExW( const WCHAR *szProductCode, const WCHAR *szUserSid, DWORD dwContext, DWORD dwFilter,
+ DWORD dwIndex, WCHAR *szPatchCode, WCHAR *szTargetProductCode,
+ MSIINSTALLCONTEXT *pdwTargetProductContext, WCHAR *szTargetUserSid,
+ DWORD *pcchTargetUserSid )
{
WCHAR squashed_pc[SQUASHED_GUID_SIZE];
DWORD idx = 0;
@@ -1988,10 +1971,9 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
static DWORD last_index;
- TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n",
- debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, dwFilter,
- dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext,
- szTargetUserSid, pcchTargetUserSid);
+ TRACE( "%s, %s, %#lx, %lu, %lu, %p, %p, %p, %p, %p)\n", debugstr_w(szProductCode), debugstr_w(szUserSid),
+ dwContext, dwFilter, dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid,
+ pcchTargetUserSid );
if (!szProductCode || !squash_guid( szProductCode, squashed_pc ))
return ERROR_INVALID_PARAMETER;
@@ -2031,16 +2013,15 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
/***********************************************************************
* MsiEnumPatchesA [MSI.@]
*/
-UINT WINAPI MsiEnumPatchesA(LPCSTR szProduct, DWORD iPatchIndex,
- LPSTR lpPatchBuf, LPSTR lpTransformsBuf, LPDWORD pcchTransformsBuf)
+UINT WINAPI MsiEnumPatchesA( const char *szProduct, DWORD iPatchIndex, char *lpPatchBuf, char *lpTransformsBuf,
+ DWORD *pcchTransformsBuf )
{
- LPWSTR product, transforms;
- WCHAR patch[GUID_SIZE];
+ WCHAR *product, *transforms, patch[GUID_SIZE];
DWORD len;
UINT r;
- TRACE("(%s %d %p %p %p)\n", debugstr_a(szProduct), iPatchIndex,
- lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
+ TRACE( "%s, %lu, %p, %p, %p\n", debugstr_a(szProduct), iPatchIndex, lpPatchBuf, lpTransformsBuf,
+ pcchTransformsBuf );
if (!szProduct || !lpPatchBuf || !lpTransformsBuf || !pcchTransformsBuf)
return ERROR_INVALID_PARAMETER;
@@ -2086,16 +2067,16 @@ done:
/***********************************************************************
* MsiEnumPatchesW [MSI.@]
*/
-UINT WINAPI MsiEnumPatchesW(LPCWSTR szProduct, DWORD iPatchIndex,
- LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, LPDWORD pcchTransformsBuf)
+UINT WINAPI MsiEnumPatchesW( const WCHAR *szProduct, DWORD iPatchIndex, WCHAR *lpPatchBuf, WCHAR *lpTransformsBuf,
+ DWORD *pcchTransformsBuf )
{
WCHAR *transforms = NULL, squashed_pc[SQUASHED_GUID_SIZE];
HKEY prod;
DWORD idx = 0;
UINT r;
- TRACE("(%s %d %p %p %p)\n", debugstr_w(szProduct), iPatchIndex,
- lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
+ TRACE( "%s, %lu, %p, %p, %p)\n", debugstr_w(szProduct), iPatchIndex, lpPatchBuf, lpTransformsBuf,
+ pcchTransformsBuf );
if (!szProduct || !squash_guid( szProduct, squashed_pc ))
return ERROR_INVALID_PARAMETER;
@@ -2133,15 +2114,15 @@ done:
return r;
}
-UINT WINAPI MsiEnumProductsExA( LPCSTR product, LPCSTR usersid, DWORD ctx, DWORD index,
- CHAR installed_product[GUID_SIZE],
- MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len )
+UINT WINAPI MsiEnumProductsExA( const char *product, const char *usersid, DWORD ctx, DWORD index,
+ char installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, char *sid,
+ DWORD *sid_len )
{
UINT r;
WCHAR installed_productW[GUID_SIZE], *productW = NULL, *usersidW = NULL, *sidW = NULL;
- TRACE("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_a(product), debugstr_a(usersid),
- ctx, index, installed_product, installed_ctx, sid, sid_len);
+ TRACE( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_a(product), debugstr_a(usersid), ctx, index,
+ installed_product, installed_ctx, sid, sid_len );
if (sid && !sid_len) return ERROR_INVALID_PARAMETER;
if (product && !(productW = strdupAtoW( product ))) return ERROR_OUTOFMEMORY;
@@ -2342,16 +2323,16 @@ done:
return r;
}
-UINT WINAPI MsiEnumProductsExW( LPCWSTR product, LPCWSTR usersid, DWORD ctx, DWORD index,
- WCHAR installed_product[GUID_SIZE],
- MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len )
+UINT WINAPI MsiEnumProductsExW( const WCHAR *product, const WCHAR *usersid, DWORD ctx, DWORD index,
+ WCHAR installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, WCHAR *sid,
+ DWORD *sid_len )
{
UINT r;
DWORD idx = 0;
static DWORD last_index;
- TRACE("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_w(product), debugstr_w(usersid),
- ctx, index, installed_product, installed_ctx, sid, sid_len);
+ TRACE( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(product), debugstr_w(usersid), ctx, index,
+ installed_product, installed_ctx, sid, sid_len );
if ((sid && !sid_len) || !ctx || (usersid && ctx == MSIINSTALLCONTEXT_MACHINE))
return ERROR_INVALID_PARAMETER;
diff --git a/dlls/msi/script.c b/dlls/msi/script.c
index 4585c2b5922..26dcddc041e 100644
--- a/dlls/msi/script.c
+++ b/dlls/msi/script.c
@@ -90,7 +90,7 @@ static ULONG WINAPI MsiActiveScriptSite_AddRef(IActiveScriptSite* iface)
{
MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE( "(%p)->(%lu)\n", This, ref );
return ref;
}
@@ -99,7 +99,7 @@ static ULONG WINAPI MsiActiveScriptSite_Release(IActiveScriptSite* iface)
MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE( "(%p)->(%lu)\n", This, ref );
if (!ref)
msi_free(This);
@@ -118,7 +118,7 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface,
{
MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface);
- TRACE("(%p)->(%p, %d, %p, %p)\n", This, pstrName, dwReturnMask, ppiunkItem, ppti);
+ TRACE( "(%p)->(%p, %lu, %p, %p)\n", This, pstrName, dwReturnMask, ppiunkItem, ppti );
/* Determine the kind of pointer that is requested, and make sure placeholder is valid */
if (dwReturnMask & SCRIPTINFO_ITYPEINFO) {
diff --git a/dlls/msi/source.c b/dlls/msi/source.c
index 0eed436774a..7ed0aabf142 100644
--- a/dlls/msi/source.c
+++ b/dlls/msi/source.c
@@ -141,21 +141,17 @@ static UINT OpenURLSubkey(HKEY rootkey, HKEY *key, BOOL create)
/******************************************************************
* MsiSourceListEnumMediaDisksA (MSI.@)
*/
-UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode,
- LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext,
- DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId,
- LPSTR szVolumeLabel, LPDWORD pcchVolumeLabel,
- LPSTR szDiskPrompt, LPDWORD pcchDiskPrompt)
+UINT WINAPI MsiSourceListEnumMediaDisksA( const char *szProductCodeOrPatchCode, const char *szUserSid,
+ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex,
+ DWORD *pdwDiskId, char *szVolumeLabel, DWORD *pcchVolumeLabel,
+ char *szDiskPrompt, DWORD *pcchDiskPrompt )
{
- LPWSTR product = NULL;
- LPWSTR usersid = NULL;
- LPWSTR volume = NULL;
- LPWSTR prompt = NULL;
+ WCHAR *product = NULL, *usersid = NULL, *volume = NULL, *prompt = NULL;
UINT r = ERROR_INVALID_PARAMETER;
- TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_a(szProductCodeOrPatchCode),
- debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, pdwDiskId,
- szVolumeLabel, pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt);
+ TRACE( "%s, %s, %d, %#lx, %lu, %p, %p, %p, %p, %p\n", debugstr_a(szProductCodeOrPatchCode),
+ debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, pdwDiskId, szVolumeLabel, pcchVolumeLabel,
+ szDiskPrompt, pcchDiskPrompt );
if (szDiskPrompt && !pcchDiskPrompt)
return ERROR_INVALID_PARAMETER;
@@ -199,11 +195,10 @@ done:
/******************************************************************
* MsiSourceListEnumMediaDisksW (MSI.@)
*/
-UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode,
- LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext,
- DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId,
- LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel,
- LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt)
+UINT WINAPI MsiSourceListEnumMediaDisksW( const WCHAR *szProductCodeOrPatchCode, const WCHAR *szUserSid,
+ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex,
+ DWORD *pdwDiskId, WCHAR *szVolumeLabel, DWORD *pcchVolumeLabel,
+ WCHAR *szDiskPrompt, DWORD *pcchDiskPrompt )
{
WCHAR squashed_pc[SQUASHED_GUID_SIZE], convert[11];
WCHAR *value = NULL, *data = NULL, *ptr, *ptr2;
@@ -213,9 +208,9 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode,
UINT r;
static DWORD index = 0;
- TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p)\n", debugstr_w(szProductCodeOrPatchCode),
- debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel,
- pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt);
+ TRACE( "%s, %s, %d, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(szProductCodeOrPatchCode),
+ debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel, pcchVolumeLabel,
+ szDiskPrompt, pcchDiskPrompt );
if (!szProductCodeOrPatchCode || !squash_guid( szProductCodeOrPatchCode, squashed_pc ))
return ERROR_INVALID_PARAMETER;
@@ -331,20 +326,17 @@ done:
/******************************************************************
* MsiSourceListEnumSourcesA (MSI.@)
*/
-UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR szProductCodeOrPatch, LPCSTR szUserSid,
- MSIINSTALLCONTEXT dwContext,
- DWORD dwOptions, DWORD dwIndex,
- LPSTR szSource, LPDWORD pcchSource)
+UINT WINAPI MsiSourceListEnumSourcesA( const char *szProductCodeOrPatch, const char *szUserSid,
+ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex, char *szSource,
+ DWORD *pcchSource )
{
- LPWSTR product = NULL;
- LPWSTR usersid = NULL;
- LPWSTR source = NULL;
+ WCHAR *product = NULL, *usersid = NULL, *source = NULL;
DWORD len = 0;
UINT r = ERROR_INVALID_PARAMETER;
static DWORD index = 0;
- TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_a(szProductCodeOrPatch),
- debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource);
+ TRACE( "%s, %s, %d, %#lx, %lu, %p, %p)\n", debugstr_a(szProductCodeOrPatch), debugstr_a(szUserSid), dwContext,
+ dwOptions, dwIndex, szSource, pcchSource );
if (dwIndex == 0)
index = 0;
@@ -403,10 +395,9 @@ done:
/******************************************************************
* MsiSourceListEnumSourcesW (MSI.@)
*/
-UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR szProductCodeOrPatch, LPCWSTR szUserSid,
- MSIINSTALLCONTEXT dwContext,
- DWORD dwOptions, DWORD dwIndex,
- LPWSTR szSource, LPDWORD pcchSource)
+UINT WINAPI MsiSourceListEnumSourcesW( const WCHAR *szProductCodeOrPatch, const WCHAR *szUserSid,
+ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex, WCHAR *szSource,
+ DWORD *pcchSource )
{
WCHAR squashed_pc[SQUASHED_GUID_SIZE], name[32];
HKEY source = NULL, subkey = NULL;
@@ -414,8 +405,8 @@ UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR szProductCodeOrPatch, LPCWSTR szUs
UINT r = ERROR_INVALID_PARAMETER;
static DWORD index = 0;
- TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_w(szProductCodeOrPatch),
- debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource);
+ TRACE( "%s, %s, %d, %#lx, %lu, %p, %p\n", debugstr_w(szProductCodeOrPatch), debugstr_w(szUserSid), dwContext,
+ dwOptions, dwIndex, szSource, pcchSource );
if (dwIndex == 0)
index = 0;
@@ -754,17 +745,16 @@ UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid,
/******************************************************************
* MsiSourceListSetInfoW (MSI.@)
*/
-UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions,
- LPCWSTR szProperty, LPCWSTR szValue)
+UINT WINAPI MsiSourceListSetInfoW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext,
+ DWORD dwOptions, const WCHAR *szProperty, const WCHAR *szValue )
{
WCHAR squashed_pc[SQUASHED_GUID_SIZE];
HKEY sourcekey, media;
LPCWSTR property;
UINT rc;
- TRACE("%s %s %x %x %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid),
- dwContext, dwOptions, debugstr_w(szProperty), debugstr_w(szValue));
+ TRACE( "%s, %s, %d, %#lx, %s, %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions,
+ debugstr_w(szProperty), debugstr_w(szValue) );
if (!szProduct || !squash_guid( szProduct, squashed_pc ))
return ERROR_INVALID_PARAMETER;
@@ -1041,9 +1031,8 @@ error:
/******************************************************************
* MsiSourceListAddSourceExW (MSI.@)
*/
-UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szSource,
- DWORD dwIndex)
+UINT WINAPI MsiSourceListAddSourceExW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext,
+ DWORD dwOptions, const WCHAR *szSource, DWORD dwIndex )
{
HKEY sourcekey, typekey;
UINT rc;
@@ -1053,8 +1042,8 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid,
LPCWSTR postfix;
DWORD size, count, index;
- TRACE("%s %s %x %x %s %i\n", debugstr_w(szProduct), debugstr_w(szUserSid),
- dwContext, dwOptions, debugstr_w(szSource), dwIndex);
+ TRACE( "%s, %s, %d, %#lx, %s, %lu\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions,
+ debugstr_w(szSource), dwIndex );
if (!szProduct || !squash_guid( szProduct, squashed_pc ))
return ERROR_INVALID_PARAMETER;
@@ -1086,7 +1075,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid,
rc = OpenMediaSubkey(sourcekey, &typekey, TRUE);
else
{
- ERR("unknown media type: %08x\n", dwOptions);
+ ERR( "unknown media type: %#lx\n", dwOptions );
RegCloseKey(sourcekey);
return ERROR_FUNCTION_FAILED;
}
@@ -1194,18 +1183,17 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR szProduct, LPCSTR szUserSid,
/******************************************************************
* MsiSourceListAddMediaDiskW (MSI.@)
*/
-UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwDiskId,
- LPCWSTR szVolumeLabel, LPCWSTR szDiskPrompt)
+UINT WINAPI MsiSourceListAddMediaDiskW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext,
+ DWORD dwOptions, DWORD dwDiskId, const WCHAR *szVolumeLabel,
+ const WCHAR *szDiskPrompt )
{
HKEY sourcekey, mediakey;
UINT rc;
WCHAR *buffer, squashed_pc[SQUASHED_GUID_SIZE], szIndex[10];
DWORD size;
- TRACE("%s %s %x %x %i %s %s\n", debugstr_w(szProduct),
- debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId,
- debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt));
+ TRACE( "%s, %s, %d, %#lx, %lu, %s, %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions,
+ dwDiskId, debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt) );
if (!szProduct || !squash_guid( szProduct, squashed_pc ))
return ERROR_INVALID_PARAMETER;
@@ -1257,81 +1245,77 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid,
/******************************************************************
* MsiSourceListClearAllA (MSI.@)
*/
-UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD dwReserved )
+UINT WINAPI MsiSourceListClearAllA( const char *szProduct, const char *szUserName, DWORD dwReserved )
{
- FIXME("(%s %s %d)\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved);
+ FIXME( "%s, %s, %#lx\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListClearAllW (MSI.@)
*/
-UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD dwReserved )
+UINT WINAPI MsiSourceListClearAllW( const WCHAR *szProduct, const WCHAR *szUserName, DWORD dwReserved )
{
- FIXME("(%s %s %d)\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved);
+ FIXME( "%s, %s, %#lx\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListClearAllExA (MSI.@)
*/
-UINT WINAPI MsiSourceListClearAllExA( LPCSTR szProduct, LPCSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions )
+UINT WINAPI MsiSourceListClearAllExA( const char *szProduct, const char *szUserSid, MSIINSTALLCONTEXT dwContext,
+ DWORD dwOptions )
{
- FIXME("(%s %s %d %08x)\n", debugstr_a(szProduct), debugstr_a(szUserSid),
- dwContext, dwOptions);
+ FIXME( "%s, %s, %d, %#lx\n", debugstr_a(szProduct), debugstr_a(szUserSid), dwContext, dwOptions );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListClearAllExW (MSI.@)
*/
-UINT WINAPI MsiSourceListClearAllExW( LPCWSTR szProduct, LPCWSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions )
+UINT WINAPI MsiSourceListClearAllExW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext,
+ DWORD dwOptions )
{
- FIXME("(%s %s %d %08x)\n", debugstr_w(szProduct), debugstr_w(szUserSid),
- dwContext, dwOptions);
+ FIXME( "%s, %s, %d, %#lx\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListClearSourceA (MSI.@)
*/
-UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions,
- LPCSTR szSource)
+UINT WINAPI MsiSourceListClearSourceA( const char *szProductCodeOrPatchCode, const char *szUserSid,
+ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, const char *szSource )
{
- FIXME("(%s %s %x %x %s)\n", debugstr_a(szProductCodeOrPatchCode), debugstr_a(szUserSid),
- dwContext, dwOptions, debugstr_a(szSource));
+ FIXME( "%s, %s, %d, %#lx, %s\n", debugstr_a(szProductCodeOrPatchCode), debugstr_a(szUserSid), dwContext,
+ dwOptions, debugstr_a(szSource) );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListClearSourceW (MSI.@)
*/
-UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR szUserSid,
- MSIINSTALLCONTEXT dwContext, DWORD dwOptions,
- LPCWSTR szSource)
+UINT WINAPI MsiSourceListClearSourceW( const WCHAR *szProductCodeOrPatchCode, const WCHAR *szUserSid,
+ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szSource )
{
- FIXME("(%s %s %x %x %s)\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid),
- dwContext, dwOptions, debugstr_w(szSource));
+ FIXME( "%s, %s, %d, %#lx, %s\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), dwContext,
+ dwOptions, debugstr_w(szSource) );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListForceResolutionA (MSI.@)
*/
-UINT WINAPI MsiSourceListForceResolutionA(const CHAR *product, const CHAR *user, DWORD reserved)
+UINT WINAPI MsiSourceListForceResolutionA( const char *product, const char *user, DWORD reserved )
{
- FIXME("(%s %s %x)\n", debugstr_a(product), debugstr_a(user), reserved);
+ FIXME( "%s, %s, %#lx\n", debugstr_a(product), debugstr_a(user), reserved );
return ERROR_SUCCESS;
}
/******************************************************************
* MsiSourceListForceResolutionW (MSI.@)
*/
-UINT WINAPI MsiSourceListForceResolutionW(const WCHAR *product, const WCHAR *user, DWORD reserved)
+UINT WINAPI MsiSourceListForceResolutionW( const WCHAR *product, const WCHAR *user, DWORD reserved )
{
- FIXME("(%s %s %x)\n", debugstr_w(product), debugstr_w(user), reserved);
+ FIXME( "%s, %s, %#lx\n", debugstr_w(product), debugstr_w(user), reserved );
return ERROR_SUCCESS;
}
diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c
index 53698f32872..faa9fe4333a 100644
--- a/dlls/msi/streams.c
+++ b/dlls/msi/streams.c
@@ -481,7 +481,7 @@ static UINT load_streams( MSIDATABASE *db )
CoTaskMemFree( stat.pwcsName );
if (FAILED( hr ))
{
- ERR("unable to open stream %08x\n", hr);
+ ERR( "unable to open stream %#lx\n", hr );
r = ERROR_FUNCTION_FAILED;
break;
}
@@ -584,7 +584,7 @@ static HRESULT write_stream( IStream *dst, IStream *src )
hr = IStream_Read( src, buf, size, &count );
if (FAILED( hr ) || count != size)
{
- WARN("failed to read stream: %08x\n", hr);
+ WARN( "failed to read stream: %#lx\n", hr );
return E_INVALIDARG;
}
stat.cbSize.QuadPart -= count;
@@ -594,7 +594,7 @@ static HRESULT write_stream( IStream *dst, IStream *src )
hr = IStream_Write( dst, buf, size, &count );
if (FAILED( hr ) || count != size)
{
- WARN("failed to write stream: %08x\n", hr);
+ WARN( "failed to write stream: %#lx\n", hr );
return E_INVALIDARG;
}
}
@@ -628,7 +628,7 @@ UINT msi_commit_streams( MSIDATABASE *db )
hr = write_stream( stream, db->streams[i].stream );
if (FAILED( hr ))
{
- ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr);
+ ERR( "failed to write stream %s (hr = %#lx)\n", debugstr_w(encname), hr );
msi_free( encname );
IStream_Release( stream );
return ERROR_FUNCTION_FAILED;
@@ -637,14 +637,14 @@ UINT msi_commit_streams( MSIDATABASE *db )
IStream_Release( stream );
if (FAILED( hr ))
{
- ERR("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr);
+ ERR( "failed to commit stream %s (hr = %#lx)\n", debugstr_w(encname), hr );
msi_free( encname );
return ERROR_FUNCTION_FAILED;
}
}
else if (hr != STG_E_FILEALREADYEXISTS)
{
- ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr);
+ ERR( "failed to create stream %s (hr = %#lx)\n", debugstr_w(encname), hr );
msi_free( encname );
return ERROR_FUNCTION_FAILED;
}
diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index fb0134810b9..70c6873a331 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -544,15 +544,15 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref )
r = add_string( st, n, data+offset, len, refs, TRUE );
if( r != n )
- ERR("Failed to add string %d\n", n );
+ ERR( "Failed to add string %lu\n", n );
n++;
offset += len;
}
if ( datasize != offset )
- ERR("string table load failed! (%08x != %08x), please report\n", datasize, offset );
+ ERR( "string table load failed! (%u != %lu), please report\n", datasize, offset );
- TRACE("Loaded %d strings\n", count);
+ TRACE( "loaded %lu strings\n", count );
end:
msi_free( pool );
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index c0e1e3151ca..296d554cfe0 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -184,14 +184,14 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz
{
if( idofs[i].propid >= MSI_MAX_PROPS )
{
- ERR("Unknown property ID %d\n", idofs[i].propid );
+ ERR( "unknown property ID %lu\n", idofs[i].propid );
break;
}
type = get_type( idofs[i].propid );
if( type == VT_EMPTY )
{
- ERR("propid %d has unknown type\n", idofs[i].propid);
+ ERR( "propid %lu has unknown type\n", idofs[i].propid );
break;
}
@@ -282,7 +282,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm )
if( section_hdr.cProperties > MSI_MAX_PROPS )
{
- ERR("too many properties %d\n", section_hdr.cProperties);
+ ERR( "too many properties %lu\n", section_hdr.cProperties );
return ERROR_FUNCTION_FAILED;
}
@@ -298,7 +298,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm )
if( SUCCEEDED(r) && count == sz )
read_properties_from_data( si->property, data, sz + SECT_HDR_SIZE );
else
- ERR("failed to read properties %d %d\n", count, sz);
+ ERR( "failed to read properties %lu %lu\n", count, sz );
msi_free( data );
return ERROR_SUCCESS;
@@ -498,15 +498,14 @@ UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **r
return ERROR_SUCCESS;
}
-UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase,
- LPCWSTR szDatabase, UINT uiUpdateCount, MSIHANDLE *pHandle )
+UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, const WCHAR *szDatabase, UINT uiUpdateCount,
+ MSIHANDLE *pHandle )
{
MSISUMMARYINFO *si;
MSIDATABASE *db;
UINT ret;
- TRACE("%d %s %d %p\n", hDatabase, debugstr_w(szDatabase),
- uiUpdateCount, pHandle);
+ TRACE( "%lu, %s, %u, %p\n", hDatabase, debugstr_w(szDatabase), uiUpdateCount, pHandle );
if( !pHandle )
return ERROR_INVALID_PARAMETER;
@@ -569,14 +568,13 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase,
return ret;
}
-UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase,
- LPCSTR szDatabase, UINT uiUpdateCount, MSIHANDLE *pHandle)
+UINT WINAPI MsiGetSummaryInformationA( MSIHANDLE hDatabase, const char *szDatabase, UINT uiUpdateCount,
+ MSIHANDLE *pHandle )
{
- LPWSTR szwDatabase = NULL;
+ WCHAR *szwDatabase = NULL;
UINT ret;
- TRACE("%d %s %d %p\n", hDatabase, debugstr_a(szDatabase),
- uiUpdateCount, pHandle);
+ TRACE( "%lu, %s, %u, %p\n", hDatabase, debugstr_a(szDatabase), uiUpdateCount, pHandle );
if( szDatabase )
{
@@ -592,11 +590,11 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase,
return ret;
}
-UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount)
+UINT WINAPI MsiSummaryInfoGetPropertyCount( MSIHANDLE hSummaryInfo, UINT *pCount )
{
MSISUMMARYINFO *si;
- TRACE("%d %p\n", hSummaryInfo, pCount);
+ TRACE( "%lu, %p\n", hSummaryInfo, pCount );
si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
if( !si )
@@ -723,16 +721,15 @@ LPWSTR msi_get_suminfo_product( IStorage *stg )
return prod;
}
-UINT WINAPI MsiSummaryInfoGetPropertyA(
- MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue,
- FILETIME *pftValue, LPSTR szValueBuf, LPDWORD pcchValueBuf)
+UINT WINAPI MsiSummaryInfoGetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
+ FILETIME *pftValue, char *szValueBuf, DWORD *pcchValueBuf )
{
MSISUMMARYINFO *si;
awstring str;
UINT r;
- TRACE("%u, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType,
- piValue, pftValue, szValueBuf, pcchValueBuf );
+ TRACE( "%lu, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType, piValue, pftValue, szValueBuf,
+ pcchValueBuf );
if (uiProperty >= MSI_MAX_PROPS)
{
@@ -775,16 +772,15 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
return r;
}
-UINT WINAPI MsiSummaryInfoGetPropertyW(
- MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue,
- FILETIME *pftValue, LPWSTR szValueBuf, LPDWORD pcchValueBuf)
+UINT WINAPI MsiSummaryInfoGetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
+ FILETIME *pftValue, WCHAR *szValueBuf, DWORD *pcchValueBuf )
{
MSISUMMARYINFO *si;
awstring str;
UINT r;
- TRACE("%u, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType,
- piValue, pftValue, szValueBuf, pcchValueBuf );
+ TRACE( "%lu, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType, piValue, pftValue, szValueBuf,
+ pcchValueBuf );
if (uiProperty >= MSI_MAX_PROPS)
{
@@ -895,15 +891,14 @@ static UINT msi_set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT uiDataType,
return set_prop( si, uiProperty, type, iValue, pftValue, str );
}
-UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType,
- INT iValue, FILETIME *pftValue, LPCWSTR szValue )
+UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, INT iValue,
+ FILETIME *pftValue, const WCHAR *szValue )
{
awcstring str;
MSISUMMARYINFO *si;
UINT ret;
- TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue,
- debugstr_w(szValue) );
+ TRACE( "%lu, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_w(szValue) );
if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO )))
{
@@ -926,15 +921,14 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT
return ret;
}
-UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT uiDataType,
- INT iValue, FILETIME *pftValue, LPCSTR szValue )
+UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, INT iValue,
+ FILETIME *pftValue, const char *szValue )
{
awcstring str;
MSISUMMARYINFO *si;
UINT ret;
- TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue,
- debugstr_a(szValue) );
+ TRACE( "%lu, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_a(szValue) );
if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO )))
{
@@ -1209,7 +1203,7 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle )
MSISUMMARYINFO *si;
UINT ret;
- TRACE("%d\n", handle );
+ TRACE( "%lu\n", handle );
si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
if( !si )
@@ -1221,12 +1215,13 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle )
return ret;
}
-UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, LPCSTR transform, int error, int validation )
+UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, const char *transform, int error,
+ int validation )
{
UINT r;
WCHAR *transformW = NULL;
- TRACE("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_a(transform), error, validation);
+ TRACE( "%lu, %lu, %s, %d, %d\n", db, db_ref, debugstr_a(transform), error, validation );
if (transform && !(transformW = strdupAtoW( transform )))
return ERROR_OUTOFMEMORY;
@@ -1236,9 +1231,10 @@ UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, LPCS
return r;
}
-UINT WINAPI MsiCreateTransformSummaryInfoW( MSIHANDLE db, MSIHANDLE db_ref, LPCWSTR transform, int error, int validation )
+UINT WINAPI MsiCreateTransformSummaryInfoW( MSIHANDLE db, MSIHANDLE db_ref, const WCHAR *transform, int error,
+ int validation )
{
- FIXME("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation);
+ FIXME( "%lu, %lu, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation );
return ERROR_FUNCTION_FAILED;
}
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index abffe75a1c9..8168e2f837d 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -221,8 +221,7 @@ void enum_stream_names( IStorage *stg )
if( FAILED( r ) || !count )
break;
decode_streamname( stat.pwcsName, name );
- TRACE("stream %2d -> %s %s\n", n,
- debugstr_w(stat.pwcsName), debugstr_w(name) );
+ TRACE( "stream %2lu -> %s %s\n", n, debugstr_w(stat.pwcsName), debugstr_w(name) );
CoTaskMemFree( stat.pwcsName );
n++;
}
@@ -250,14 +249,14 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table,
msi_free( encname );
if( FAILED( r ) )
{
- WARN("open stream failed r = %08x - empty table?\n", r);
+ WARN( "open stream failed r = %#lx - empty table?\n", r );
return ret;
}
r = IStream_Stat(stm, &stat, STATFLAG_NONAME );
if( FAILED( r ) )
{
- WARN("open stream failed r = %08x!\n", r);
+ WARN( "open stream failed r = %#lx!\n", r );
goto end;
}
@@ -271,7 +270,7 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table,
data = msi_alloc( sz );
if( !data )
{
- WARN("couldn't allocate memory r=%08x!\n", r);
+ WARN( "couldn't allocate memory r = %#lx!\n", r );
ret = ERROR_NOT_ENOUGH_MEMORY;
goto end;
}
@@ -280,7 +279,7 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table,
if( FAILED( r ) || ( count != sz ) )
{
msi_free( data );
- WARN("read stream failed r = %08x!\n", r);
+ WARN("read stream failed r = %#lx!\n", r);
goto end;
}
@@ -316,7 +315,7 @@ UINT write_stream_data( IStorage *stg, LPCWSTR stname,
msi_free( encname );
if( FAILED( r ) )
{
- WARN("open stream failed r = %08x\n", r);
+ WARN( "open stream failed r = %#lx\n", r );
return ret;
}
@@ -1929,7 +1928,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view)
{
MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
- TRACE("%p %d\n", view, tv->table->ref_count);
+ TRACE( "%p, %ld\n", view, tv->table->ref_count );
return InterlockedIncrement(&tv->table->ref_count);
}
@@ -2914,7 +2913,7 @@ UINT MSI_CommitTables( MSIDATABASE *db )
hr = IStorage_Commit( db->storage, 0 );
if (FAILED( hr ))
{
- WARN("failed to commit changes 0x%08x\n", hr);
+ WARN( "failed to commit changes %#lx\n", hr );
r = ERROR_FUNCTION_FAILED;
}
return r;
diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c
index 18649fced3d..c9744e51859 100644
--- a/dlls/msi/upgrade.c
+++ b/dlls/msi/upgrade.c
@@ -142,7 +142,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
HKEY hukey;
INT r;
- TRACE("Looking at index %u product %s\n", index, debugstr_w(product));
+ TRACE( "looking at index %lu product %s\n", index, debugstr_w(product) );
unsquash_guid(product, productid);
if (MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hukey, FALSE) &&
--
2.30.2
1
0
07 Feb '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44202
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/undname.c | 6 ++++++
dlls/ucrtbase/tests/cpp.c | 21 ++++++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
1
0
[PATCH 1/4] dlls/msvcrt, msvcp90, concrt140: use correct integral type for interlock
by Eric Pouech 07 Feb '22
by Eric Pouech 07 Feb '22
07 Feb '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/concrt140/details.c | 2 +-
dlls/msvcp90/details.c | 2 +-
dlls/msvcrt/concurrency.c | 4 ++--
dlls/msvcrt/file.c | 8 ++++----
dlls/msvcrt/heap.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c
index 59345c52871..72bb744744c 100644
--- a/dlls/concrt140/details.c
+++ b/dlls/concrt140/details.c
@@ -371,7 +371,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this)
DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4@details@Concurrency@@")
-static int _Runtime_object_id;
+static LONG _Runtime_object_id;
typedef struct
{
diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c
index 6b54ea9597f..d63a47667f9 100644
--- a/dlls/msvcp90/details.c
+++ b/dlls/msvcp90/details.c
@@ -385,7 +385,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this)
DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4@details@Concurrency@@")
-static int _Runtime_object_id;
+static LONG _Runtime_object_id;
typedef struct
{
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index 0a393cd0004..6afe6e81489 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
typedef exception cexception;
CREATE_EXCEPTION_OBJECT(cexception)
-static int context_id = -1;
-static int scheduler_id = -1;
+static LONG context_id = -1;
+static LONG scheduler_id = -1;
typedef enum {
SchedulerKind,
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 2b0395d7535..2666492956c 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -144,8 +144,8 @@ static int MSVCRT_max_streams = 512, MSVCRT_stream_idx;
static int MSVCRT_umask = 0;
/* INTERNAL: static data for tmpnam and _wtmpname functions */
-static int tmpnam_unique;
-static int tmpnam_s_unique;
+static LONG tmpnam_unique;
+static LONG tmpnam_s_unique;
static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e';
static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't';
@@ -4935,7 +4935,7 @@ void CDECL setbuf(FILE* file, char *buf)
setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
}
-static int tmpnam_helper(char *s, size_t size, int *tmpnam_unique, int tmp_max)
+static int tmpnam_helper(char *s, size_t size, LONG *tmpnam_unique, int tmp_max)
{
char tmpstr[8];
char *p = s;
@@ -5006,7 +5006,7 @@ char * CDECL tmpnam(char *s)
return tmpnam_helper(s, -1, &tmpnam_unique, TMP_MAX) ? NULL : s;
}
-static int wtmpnam_helper(wchar_t *s, size_t size, int *tmpnam_unique, int tmp_max)
+static int wtmpnam_helper(wchar_t *s, size_t size, LONG *tmpnam_unique, int tmp_max)
{
wchar_t tmpstr[8];
wchar_t *p = s;
diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index 429a9e2ecda..049c4e0cd93 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -46,7 +46,7 @@ static HANDLE heap, sb_heap;
typedef int (CDECL *MSVCRT_new_handler_func)(size_t size);
static MSVCRT_new_handler_func MSVCRT_new_handler;
-static int MSVCRT_new_mode;
+static LONG MSVCRT_new_mode;
/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */
static unsigned int MSVCRT_amblksiz = 16;
3
6
07 Feb '22
Fixes a regression introduced by
5c009c17b3a212c3f5b0034c465077c0c593daae.
For IPV6 socket already bound with bind() with IPV6_V6ONLY set to 0
the address returned by getsockname() may change after it is connected
to a IPV4 peer (e. g., from :: to ::ffff:192.0.2.128).
The effect of blamed commit is that before that Unix getsockname()
was called for each ws2_32 getsockname() and after the commit the
socket name is cached at bind and connect.
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
Fixes Street Fighter V connection to server. The game first sets IPV6_V6ONLY to 0, then binds the IPV6 socket
to "::", then calls for WSAConnectEx and keeps querying the address, which in the correct case should become
e. g. ::ffff:192.0.2.128 after connection but stays at the initial state after the blamed commit.
server/sock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/sock.c b/server/sock.c
index 40fb0cac535..512b7c0f78e 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2340,7 +2340,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
allow_fd_caching( sock->fd );
unix_len = sizeof(unix_addr);
- if (!sock->bound && !getsockname( unix_fd, &unix_addr.addr, &unix_len ))
+ if (!getsockname( unix_fd, &unix_addr.addr, &unix_len ))
sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) );
sock->bound = 1;
--
2.34.1
1
0
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/d3dx9_24/d3dx9_24.spec | 2 +-
dlls/d3dx9_25/d3dx9_25.spec | 2 +-
dlls/d3dx9_26/d3dx9_26.spec | 2 +-
dlls/d3dx9_27/d3dx9_27.spec | 2 +-
dlls/d3dx9_28/d3dx9_28.spec | 2 +-
dlls/d3dx9_29/d3dx9_29.spec | 2 +-
dlls/d3dx9_30/d3dx9_30.spec | 2 +-
dlls/d3dx9_31/d3dx9_31.spec | 2 +-
dlls/d3dx9_32/d3dx9_32.spec | 2 +-
dlls/d3dx9_33/d3dx9_33.spec | 2 +-
dlls/d3dx9_34/d3dx9_34.spec | 2 +-
dlls/d3dx9_35/d3dx9_35.spec | 2 +-
dlls/d3dx9_36/d3dx9_36.spec | 2 +-
dlls/d3dx9_36/d3dx9_private.h | 2 +
dlls/d3dx9_36/math.c | 147 ++++++++++++++++++++++++
dlls/d3dx9_36/surface.c | 2 +-
dlls/d3dx9_36/tests/math.c | 208 ++++++++++++++++++++++++++++++++++
dlls/d3dx9_37/d3dx9_37.spec | 2 +-
dlls/d3dx9_38/d3dx9_38.spec | 2 +-
dlls/d3dx9_39/d3dx9_39.spec | 2 +-
dlls/d3dx9_40/d3dx9_40.spec | 2 +-
dlls/d3dx9_41/d3dx9_41.spec | 2 +-
dlls/d3dx9_42/d3dx9_42.spec | 2 +-
dlls/d3dx9_43/d3dx9_43.spec | 2 +-
include/d3dx9math.h | 1 +
25 files changed, 379 insertions(+), 21 deletions(-)
diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
index d617d766f85..8791e4ec044 100644
--- a/dlls/d3dx9_24/d3dx9_24.spec
+++ b/dlls/d3dx9_24/d3dx9_24.spec
@@ -256,7 +256,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
index f13923dcb3a..0431a9f7f75 100644
--- a/dlls/d3dx9_25/d3dx9_25.spec
+++ b/dlls/d3dx9_25/d3dx9_25.spec
@@ -256,7 +256,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
index 286a9a094a0..5ab0a1d9fea 100644
--- a/dlls/d3dx9_26/d3dx9_26.spec
+++ b/dlls/d3dx9_26/d3dx9_26.spec
@@ -260,7 +260,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
index 286a9a094a0..5ab0a1d9fea 100644
--- a/dlls/d3dx9_27/d3dx9_27.spec
+++ b/dlls/d3dx9_27/d3dx9_27.spec
@@ -260,7 +260,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
index 06ced20df61..af5b6077202 100644
--- a/dlls/d3dx9_28/d3dx9_28.spec
+++ b/dlls/d3dx9_28/d3dx9_28.spec
@@ -265,7 +265,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
index 06ced20df61..af5b6077202 100644
--- a/dlls/d3dx9_29/d3dx9_29.spec
+++ b/dlls/d3dx9_29/d3dx9_29.spec
@@ -265,7 +265,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
index 06ced20df61..af5b6077202 100644
--- a/dlls/d3dx9_30/d3dx9_30.spec
+++ b/dlls/d3dx9_30/d3dx9_30.spec
@@ -265,7 +265,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
index c9aca309a35..8f77dc666a2 100644
--- a/dlls/d3dx9_31/d3dx9_31.spec
+++ b/dlls/d3dx9_31/d3dx9_31.spec
@@ -262,7 +262,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_32/d3dx9_32.spec
+++ b/dlls/d3dx9_32/d3dx9_32.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_33/d3dx9_33.spec
+++ b/dlls/d3dx9_33/d3dx9_33.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_34/d3dx9_34.spec
+++ b/dlls/d3dx9_34/d3dx9_34.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_35/d3dx9_35.spec
+++ b/dlls/d3dx9_35/d3dx9_35.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
index c3308b04d44..2d286b04694 100644
--- a/dlls/d3dx9_36/d3dx9_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -100,6 +100,8 @@ HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPE
const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN;
const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN;
+void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst);
+
void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size,
const struct pixel_format_desc *format) DECLSPEC_HIDDEN;
diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
index a7b0a018680..80f357e00e9 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -2969,6 +2969,153 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in)
out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35];
}
+static void set_vec3(D3DXVECTOR3 *v, float x, float y, float z)
+{
+ v->x = x;
+ v->y = y;
+ v->z = z;
+}
+
+/*
+ * The following implementation of D3DXSHProjectCubeMap is based on the
+ * SHProjectCubeMap() implementation from Microsoft's DirectXMath library,
+ * covered under the following copyright:
+ *
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ */
+HRESULT WINAPI D3DXSHProjectCubeMap(unsigned int order, IDirect3DCubeTexture9 *texture, float *red, float *green, float *blue)
+{
+ const unsigned int order_square = order * order;
+ const struct pixel_format_desc *format;
+ unsigned int x, y, i, face;
+ float B, S, proj_normal;
+ D3DSURFACE_DESC desc;
+ float Wt = 0.0f;
+ float *temp;
+ HRESULT hr;
+
+ TRACE("order %u, texture %p, red %p, green %p, blue %p.\n", order, texture, red, green, blue);
+
+ if (!texture || !red || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER)
+ return D3DERR_INVALIDCALL;
+
+ memset(red, 0, order_square * sizeof(float));
+ if (green)
+ memset(green, 0, order_square * sizeof(float));
+ if (blue)
+ memset(blue, 0, order_square * sizeof(float));
+
+ if (FAILED(hr = IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &desc)))
+ {
+ ERR("Failed to get level desc, hr %#x.\n", hr);
+ return hr;
+ }
+
+ format = get_format_info(desc.Format);
+ if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF)
+ {
+ FIXME("Unsupported texture format %#x.\n", desc.Format);
+ return D3DERR_INVALIDCALL;
+ }
+
+ if (!(temp = malloc(order_square * sizeof(*temp))))
+ return E_OUTOFMEMORY;
+
+ B = -1.0f + 1.0f / desc.Width;
+ if (desc.Width > 1)
+ S = 2.0f * (1.0f - 1.0f / desc.Width) / (desc.Width - 1.0f);
+ else
+ S = 0.0f;
+
+ for (face = 0; face < 6; ++face)
+ {
+ D3DLOCKED_RECT map_desc;
+
+ if (FAILED(hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, D3DLOCK_READONLY)))
+ {
+ ERR("Failed to map texture, hr %#x.\n", hr);
+ free(temp);
+ return hr;
+ }
+
+ for (y = 0; y < desc.Height; ++y)
+ {
+ const BYTE *row = (const BYTE *)map_desc.pBits + y * map_desc.Pitch;
+
+ for (x = 0; x < desc.Width; ++x)
+ {
+ float diff_solid, x_3d, y_3d;
+ const float u = x * S + B;
+ const float v = y * S + B;
+ struct vec4 colour;
+ D3DXVECTOR3 dir;
+
+ x_3d = (x * 2.0f + 1.0f) / desc.Width - 1.0f;
+ y_3d = (y * 2.0f + 1.0f) / desc.Width - 1.0f;
+
+ switch (face)
+ {
+ case D3DCUBEMAP_FACE_POSITIVE_X:
+ set_vec3(&dir, 1.0f, -y_3d, -x_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_NEGATIVE_X:
+ set_vec3(&dir, -1.0f, -y_3d, x_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_POSITIVE_Y:
+ set_vec3(&dir, x_3d, 1.0f, y_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_NEGATIVE_Y:
+ set_vec3(&dir, x_3d, -1.0f, -y_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_POSITIVE_Z:
+ set_vec3(&dir, x_3d, -y_3d, 1.0f);
+ break;
+
+ case D3DCUBEMAP_FACE_NEGATIVE_Z:
+ set_vec3(&dir, -x_3d, -y_3d, -1.0f);
+ break;
+ }
+
+ /* This is more complex than powf(..., 1.5f), but also happens
+ * to be slightly more accurate, and slightly faster as well. */
+ diff_solid = 4.0f / ((1.0f + u * u + v * v) * sqrtf(1.0f + u * u + v * v));
+ Wt += diff_solid;
+
+ D3DXVec3Normalize(&dir, &dir);
+ D3DXSHEvalDirection(temp, order, &dir);
+
+ format_to_vec4(format, &row[x * format->block_byte_count], &colour);
+
+ for (i = 0; i < order_square; ++i)
+ {
+ red[i] += temp[i] * colour.x * diff_solid;
+ if (green)
+ green[i] += temp[i] * colour.y * diff_solid;
+ if (blue)
+ blue[i] += temp[i] * colour.z * diff_solid;
+ }
+ }
+ }
+
+ IDirect3DCubeTexture9_UnlockRect(texture, face, 0);
+ }
+
+ proj_normal = (4.0f * M_PI) / Wt;
+ D3DXSHScale(red, order, red, proj_normal);
+ if (green)
+ D3DXSHScale(green, order, green, proj_normal);
+ if (blue)
+ D3DXSHScale(blue, order, blue, proj_normal);
+
+ free(temp);
+ return D3D_OK;
+}
+
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in)
{
FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36];
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index c3f9f84a789..2ca6f093b55 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1564,7 +1564,7 @@ static DWORD make_argb_color(const struct argb_conversion_info *info, const DWOR
}
/* It doesn't work for components bigger than 32 bits (or somewhat smaller but unaligned). */
-static void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst)
+void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst)
{
DWORD mask, tmp;
unsigned int c;
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index 6f64e25d200..62f4eaec124 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -22,6 +22,7 @@
#include "wine/test.h"
#include "d3dx9.h"
#include <math.h>
+#include <stdint.h>
static BOOL compare_float(float f, float g, unsigned int ulps)
{
@@ -205,6 +206,53 @@ static void set_matrix(D3DXMATRIX* mat,
U(mat)->m[3][0] = m30; U(mat)->m[3][1] = m31; U(mat)->m[3][2] = m32; U(mat)->m[3][3] = m33;
}
+static HWND create_window(void)
+{
+ RECT r = {0, 0, 640, 480};
+
+ AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE);
+
+ return CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL);
+}
+
+static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window)
+{
+ D3DPRESENT_PARAMETERS present_parameters = {0};
+ unsigned int adapter_ordinal;
+ IDirect3DDevice9 *device;
+ DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
+
+ adapter_ordinal = D3DADAPTER_DEFAULT;
+ present_parameters.BackBufferWidth = 640;
+ present_parameters.BackBufferHeight = 480;
+ present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8;
+ present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
+ present_parameters.hDeviceWindow = focus_window;
+ present_parameters.Windowed = TRUE;
+ present_parameters.EnableAutoDepthStencil = TRUE;
+ present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8;
+
+ if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window,
+ behavior_flags, &present_parameters, &device)))
+ return device;
+
+ present_parameters.AutoDepthStencilFormat = D3DFMT_D16;
+ if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window,
+ behavior_flags, &present_parameters, &device)))
+ return device;
+
+ behavior_flags = (behavior_flags
+ & ~(D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING))
+ | D3DCREATE_HARDWARE_VERTEXPROCESSING;
+
+ if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window,
+ behavior_flags, &present_parameters, &device)))
+ return device;
+
+ return NULL;
+}
+
static void D3DXColorTest(void)
{
D3DXCOLOR color, color1, color2, expected, got;
@@ -4364,6 +4412,165 @@ static void test_D3DXSHScale(void)
}
}
+static void test_D3DXSHProjectCubeMap(void)
+{
+ unsigned int i, j, level, face, x, y;
+ float red[4], green[4], blue[4];
+ IDirect3DCubeTexture9 *texture;
+ IDirect3DDevice9 *device;
+ D3DLOCKED_RECT map_desc;
+ IDirect3D9 *d3d;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+
+ static const struct
+ {
+ D3DFORMAT format;
+ float red[4];
+ float green[4];
+ float blue[4];
+ }
+ tests[] =
+ {
+ {D3DFMT_A8R8G8B8,
+ {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f},
+ {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f},
+ {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}},
+ {D3DFMT_X8R8G8B8,
+ {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f},
+ {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f},
+ {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}},
+ {D3DFMT_A8B8G8R8,
+ {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f},
+ {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f},
+ {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f}},
+ {D3DFMT_R5G6B5,
+ {1.77099848f, -3.88867334e-2f, 6.73775524e-2f, -1.26888147e-2f},
+ {1.77244151f, -5.64723741e-4f, -2.77878426e-4f, -9.10691451e-3f},
+ {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}},
+ {D3DFMT_A1R5G5B5,
+ {1.78022826f, 1.46923587e-2f, 3.58058624e-2f, 2.51076911e-2f},
+ {1.77233493f, -7.58088892e-4f, -2.03727093e-3f, -1.34809706e-2f},
+ {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}},
+ {D3DFMT_X1R5G5B5,
+ {1.78022826f, 1.46923587e-2f, 3.58058624e-2f, 2.51076911e-2f},
+ {1.77233493f, -7.58088892e-4f, -2.03727093e-3f, -1.34809706e-2f},
+ {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}},
+ {D3DFMT_A2R10G10B10,
+ {1.79359019f, -7.74506712e-4f, 8.65613017e-3f, 5.75336441e-3f},
+ {1.77067971f, 6.42523961e-3f, 1.35379164e-2f, 2.24088971e-3f},
+ {1.76601243f, -4.94002625e-2f, 1.28124524e-2f, -7.69229094e-3f}},
+ {D3DFMT_A2B10G10R10,
+ {1.76601243f, -4.94002625e-2f, 1.28124524e-2f, -7.69229094e-3f},
+ {1.77067971f, 6.42523961e-3f, 1.35379164e-2f, 2.24088971e-3f},
+ {1.79359019f, -7.74506712e-4f, 8.65613017e-3f, 5.75336441e-3f}},
+ {D3DFMT_A16B16G16R16,
+ {1.75979614f, 1.44450525e-2f, -3.25212209e-3f, 2.98178056e-3f},
+ {1.78080165f, -2.63770130e-2f, 6.31967233e-3f, 3.66022950e-3f},
+ {1.77588308f, -1.93727610e-3f, -3.22831096e-3f, -6.18841546e-3f}},
+ {D3DFMT_A16B16G16R16F,
+ { 5.17193642e+1f, -3.41681671e+2f, -8.82221741e+2f, 7.77049316e+2f},
+ {-2.08198950e+3f, 5.24323584e+3f, -3.42663379e+3f, 3.80999243e+3f},
+ {-1.10743945e+3f, -9.43649292e+2f, 5.48424316e+2f, 1.65352710e+3f}},
+ };
+
+ window = create_window();
+ d3d = Direct3DCreate9(D3D_SDK_VERSION);
+ ok(!!d3d, "Failed to create a D3D object.\n");
+ if (!(device = create_device(d3d, window)))
+ {
+ skip("Failed to create a D3D device, skipping tests.\n");
+ IDirect3D9_Release(d3d);
+ DestroyWindow(window);
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ winetest_push_context("Format %#x", tests[i].format);
+
+ hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 4, D3DUSAGE_DYNAMIC,
+ tests[i].format, D3DPOOL_DEFAULT, &texture, NULL);
+ if (FAILED(hr))
+ {
+ skip("Failed to create cube texture.\n");
+ winetest_pop_context();
+ continue;
+ }
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (face = 0; face < 6; ++face)
+ {
+ hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, 0);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (y = 0; y < 8; ++y)
+ {
+ uint8_t *row = (uint8_t *)map_desc.pBits + y * map_desc.Pitch;
+
+ for (x = 0; x < map_desc.Pitch; ++x)
+ row[x] = face * 111 + y * 39 + x * 7;
+ }
+
+ hr = IDirect3DCubeTexture9_UnlockRect(texture, face, 0);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (level = 1; level < 4; ++level)
+ {
+ hr = IDirect3DCubeTexture9_LockRect(texture, face, level, &map_desc, NULL, 0);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ memset(map_desc.pBits, 0xcc, 4 * map_desc.Pitch);
+ hr = IDirect3DCubeTexture9_UnlockRect(texture, face, level);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ }
+ }
+
+ hr = D3DXSHProjectCubeMap(1, texture, red, green, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(7, texture, red, green, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(2, NULL, red, green, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ memset(red, 0, sizeof(red));
+ memset(green, 0, sizeof(green));
+ memset(blue, 0, sizeof(blue));
+ hr = D3DXSHProjectCubeMap(2, texture, red, green, blue);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (j = 0; j < 4; ++j)
+ {
+ ok(compare_float(red[j], tests[i].red[j], 1024),
+ "Got unexpected value %.8e for red coefficient %u.\n", red[j], j);
+ ok(compare_float(green[j], tests[i].green[j], 1024),
+ "Got unexpected value %.8e for green coefficient %u.\n", green[j], j);
+ ok(compare_float(blue[j], tests[i].blue[j], 1024),
+ "Got unexpected value %.8e for blue coefficient %u.\n", blue[j], j);
+ }
+
+ hr = D3DXSHProjectCubeMap(2, texture, red, NULL, NULL);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(2, texture, NULL, green, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(2, texture, NULL, NULL, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ IDirect3DCubeTexture9_Release(texture);
+
+ winetest_pop_context();
+ }
+
+ refcount = IDirect3DDevice9_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ IDirect3D9_Release(d3d);
+ DestroyWindow(window);
+}
+
START_TEST(math)
{
D3DXColorTest();
@@ -4393,4 +4600,5 @@ START_TEST(math)
test_D3DXSHRotate();
test_D3DXSHRotateZ();
test_D3DXSHScale();
+ test_D3DXSHProjectCubeMap();
}
diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_37/d3dx9_37.spec
+++ b/dlls/d3dx9_37/d3dx9_37.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_38/d3dx9_38.spec
+++ b/dlls/d3dx9_38/d3dx9_38.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_39/d3dx9_39.spec
+++ b/dlls/d3dx9_39/d3dx9_39.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_40/d3dx9_40.spec
+++ b/dlls/d3dx9_40/d3dx9_40.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_41/d3dx9_41.spec
+++ b/dlls/d3dx9_41/d3dx9_41.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
index 0851945d36b..4a418d1508a 100644
--- a/dlls/d3dx9_42/d3dx9_42.spec
+++ b/dlls/d3dx9_42/d3dx9_42.spec
@@ -262,7 +262,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
index 0851945d36b..4a418d1508a 100644
--- a/dlls/d3dx9_43/d3dx9_43.spec
+++ b/dlls/d3dx9_43/d3dx9_43.spec
@@ -262,7 +262,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/include/d3dx9math.h b/include/d3dx9math.h
index bf03ca3abaa..32d894f9fed 100644
--- a/include/d3dx9math.h
+++ b/include/d3dx9math.h
@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA
FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b);
FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b);
FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b);
+HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *texture, FLOAT *red, FLOAT *green, FLOAT *blue);
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in);
FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in);
FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);
--
2.34.1
2
1
07 Feb '22
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
---
dlls/evr/evr_private.h | 21 ---------------------
dlls/evr/presenter.c | 10 +++++-----
dlls/evr/sample.c | 27 +++------------------------
dlls/mf/clock.c | 4 ++--
dlls/mf/copier.c | 2 +-
dlls/mf/evr.c | 12 ++++++------
dlls/mf/mf_private.h | 21 ---------------------
dlls/mf/samplegrabber.c | 10 +++++-----
dlls/mf/sar.c | 12 ++++++------
dlls/mfplat/buffer.c | 2 +-
dlls/mfplat/main.c | 10 +++++-----
dlls/mfplat/mfplat_private.h | 21 ---------------------
dlls/mfplat/sample.c | 4 ++--
dlls/quartz/acmwrapper.c | 6 +++---
dlls/quartz/avidec.c | 2 +-
dlls/quartz/dsoundrender.c | 10 +++++-----
dlls/quartz/filtergraph.c | 12 ++++++------
dlls/quartz/memallocator.c | 8 ++++----
dlls/quartz/quartz_private.h | 21 ---------------------
dlls/quartz/systemclock.c | 6 +++---
dlls/winegstreamer/gst_private.h | 21 ---------------------
dlls/winegstreamer/quartz_parser.c | 6 +++---
dlls/winegstreamer/wm_asyncreader.c | 8 ++++----
dlls/winegstreamer/wm_reader.c | 8 ++++----
include/wine/debug.h | 21 +++++++++++++++++++++
libs/strmbase/filter.c | 2 +-
libs/strmbase/mediatype.c | 4 ++--
libs/strmbase/pin.c | 4 ++--
libs/strmbase/renderer.c | 8 ++++----
libs/strmbase/strmbase_private.h | 21 ---------------------
30 files changed, 99 insertions(+), 225 deletions(-)
diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h
index ef38b0f70cf..dabaaf8ee1a 100644
--- a/dlls/evr/evr_private.h
+++ b/dlls/evr/evr_private.h
@@ -24,27 +24,6 @@
#include "wine/strmbase.h"
#include "wine/debug.h"
-static inline const char *debugstr_time(LONGLONG time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
-
static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect)
{
if (!rect) return "(null)";
diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index 7e14cb2f720..864891eec6d 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -902,7 +902,7 @@ static HRESULT WINAPI video_presenter_OnClockStart(IMFVideoPresenter *iface, MFT
{
struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface);
- TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), wine_dbgstr_longlong(offset));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_longlong(offset));
EnterCriticalSection(&presenter->cs);
presenter->state = PRESENTER_STATE_STARTED;
@@ -915,7 +915,7 @@ static HRESULT WINAPI video_presenter_OnClockStop(IMFVideoPresenter *iface, MFTI
{
struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&presenter->cs);
presenter->state = PRESENTER_STATE_STOPPED;
@@ -929,7 +929,7 @@ static HRESULT WINAPI video_presenter_OnClockPause(IMFVideoPresenter *iface, MFT
{
struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&presenter->cs);
presenter->state = PRESENTER_STATE_PAUSED;
@@ -942,7 +942,7 @@ static HRESULT WINAPI video_presenter_OnClockRestart(IMFVideoPresenter *iface, M
{
struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&presenter->cs);
presenter->state = PRESENTER_STATE_STARTED;
@@ -953,7 +953,7 @@ static HRESULT WINAPI video_presenter_OnClockRestart(IMFVideoPresenter *iface, M
static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, MFTIME systime, float rate)
{
- FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate);
+ FIXME("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate);
return E_NOTIMPL;
}
diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c
index 1d29b6cdc2c..b8ac408e4ff 100644
--- a/dlls/evr/sample.c
+++ b/dlls/evr/sample.c
@@ -29,27 +29,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(evr);
-static const char *debugstr_time(LONGLONG time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
-
struct surface_buffer
{
IMFMediaBuffer IMFMediaBuffer_iface;
@@ -1258,7 +1237,7 @@ static HRESULT WINAPI video_sample_SetSampleTime(IMFSample *iface, LONGLONG time
{
struct video_sample *sample = impl_from_IMFSample(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(timestamp));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(timestamp));
EnterCriticalSection(&sample->cs);
sample->timestamp = timestamp;
@@ -1289,7 +1268,7 @@ static HRESULT WINAPI video_sample_SetSampleDuration(IMFSample *iface, LONGLONG
{
struct video_sample *sample = impl_from_IMFSample(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(duration));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(duration));
EnterCriticalSection(&sample->cs);
sample->duration = duration;
@@ -1523,7 +1502,7 @@ static void WINAPI desired_video_sample_SetDesiredSampleTimeAndDuration(IMFDesir
{
struct video_sample *sample = impl_from_IMFDesiredSample(iface);
- TRACE("%p, %s, %s.\n", iface, debugstr_time(sample_time), debugstr_time(sample_duration));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(sample_time), wine_dbgstr_reference_time(sample_duration));
EnterCriticalSection(&sample->cs);
sample->flags |= SAMPLE_PROP_HAS_DESIRED_PROPS;
diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c
index 4a3ad7ec7c1..a4212ee0402 100644
--- a/dlls/mf/clock.c
+++ b/dlls/mf/clock.c
@@ -660,7 +660,7 @@ static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG
struct clock_state_change_param param = {{0}};
HRESULT hr;
- TRACE("%p, %s.\n", iface, debugstr_time(start_offset));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(start_offset));
EnterCriticalSection(&clock->cs);
clock->start_offset = param.u.offset = start_offset;
@@ -885,7 +885,7 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags,
struct clock_timer *clock_timer;
HRESULT hr;
- TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key);
+ TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, wine_dbgstr_reference_time(time), callback, state, cancel_key);
if (!(clock_timer = calloc(1, sizeof(*clock_timer))))
return E_OUTOFMEMORY;
diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c
index fe5664ee4c7..4972c9f9c44 100644
--- a/dlls/mf/copier.c
+++ b/dlls/mf/copier.c
@@ -424,7 +424,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputStatus(IMFTransform *ifac
static HRESULT WINAPI sample_copier_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper)
{
- TRACE("%p, %s, %s.\n", iface, debugstr_time(lower), debugstr_time(upper));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(lower), wine_dbgstr_reference_time(upper));
return E_NOTIMPL;
}
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index 5e8b559af04..173e712ab84 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -1504,7 +1504,7 @@ static HRESULT WINAPI video_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *
HRESULT hr = S_OK;
size_t i;
- TRACE("%p, %s.\n", iface, debugstr_time(start_time));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(start_time));
EnterCriticalSection(&renderer->cs);
if (renderer->flags & EVR_SHUT_DOWN)
@@ -1880,7 +1880,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *
unsigned int state, request_sample;
size_t i;
- TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_reference_time(offset));
EnterCriticalSection(&renderer->cs);
@@ -1923,7 +1923,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *i
struct video_renderer *renderer = impl_from_IMFClockStateSink(iface);
size_t i;
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&renderer->cs);
@@ -1960,7 +1960,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *
struct video_renderer *renderer = impl_from_IMFClockStateSink(iface);
size_t i;
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&renderer->cs);
@@ -1987,7 +1987,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink
struct video_renderer *renderer = impl_from_IMFClockStateSink(iface);
size_t i;
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&renderer->cs);
@@ -2010,7 +2010,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink
struct video_renderer *renderer = impl_from_IMFClockStateSink(iface);
IMFClockStateSink *sink;
- TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate);
+ TRACE("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate);
EnterCriticalSection(&renderer->cs);
diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h
index db6f101cd6d..c6f853e4950 100644
--- a/dlls/mf/mf_private.h
+++ b/dlls/mf/mf_private.h
@@ -58,27 +58,6 @@ struct activate_funcs
HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) DECLSPEC_HIDDEN;
-static inline const char *debugstr_time(LONGLONG time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
-
extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN;
extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN;
extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN;
diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c
index e7d3be68df3..53c7e381d6a 100644
--- a/dlls/mf/samplegrabber.c
+++ b/dlls/mf/samplegrabber.c
@@ -1170,7 +1170,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *
{
struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface);
- TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_reference_time(offset));
return sample_grabber_set_state(grabber, SINK_STATE_RUNNING, systime, offset);
}
@@ -1179,7 +1179,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *i
{
struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
return sample_grabber_set_state(grabber, SINK_STATE_STOPPED, systime, 0);
}
@@ -1188,7 +1188,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *
{
struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
return sample_grabber_set_state(grabber, SINK_STATE_PAUSED, systime, 0);
}
@@ -1197,7 +1197,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink
{
struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
return sample_grabber_set_state(grabber, SINK_STATE_RUNNING, systime, PRESENTATION_CURRENT_POSITION);
}
@@ -1206,7 +1206,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink
{
struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface);
- TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate);
+ TRACE("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate);
return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate);
}
diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c
index 3c9bac90c9f..a6513fc167f 100644
--- a/dlls/mf/sar.c
+++ b/dlls/mf/sar.c
@@ -518,7 +518,7 @@ static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *
{
struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(start_time));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(start_time));
if (renderer->flags & SAR_SHUT_DOWN)
return MF_E_SHUTDOWN;
@@ -626,7 +626,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink *
struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface);
HRESULT hr = S_OK;
- TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_reference_time(offset));
EnterCriticalSection(&renderer->cs);
if (renderer->audio_client)
@@ -654,7 +654,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStop(IMFClockStateSink *i
struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface);
HRESULT hr = S_OK;
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&renderer->cs);
if (renderer->audio_client)
@@ -686,7 +686,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockPause(IMFClockStateSink *
struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface);
HRESULT hr;
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&renderer->cs);
if (renderer->state == STREAM_STATE_RUNNING)
@@ -715,7 +715,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink
BOOL preroll = FALSE;
HRESULT hr = S_OK;
- TRACE("%p, %s.\n", iface, debugstr_time(systime));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime));
EnterCriticalSection(&renderer->cs);
if (renderer->audio_client)
@@ -741,7 +741,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink
static HRESULT WINAPI audio_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate)
{
- FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate);
+ FIXME("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate);
return E_NOTIMPL;
}
diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index f161bb29d80..525c902d192 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -1560,7 +1560,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO
HRESULT hr;
GUID major;
- TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer);
+ TRACE("%p, %s, %u, %u, %p.\n", media_type, wine_dbgstr_reference_time(duration), min_length, alignment, buffer);
if (!media_type)
return E_INVALIDARG;
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index e79f59d41dd..ec24b32318b 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -8057,7 +8057,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if
MFCLOCK_STATE state;
HRESULT hr;
- TRACE("%p, %s, %s.\n", iface, debugstr_time(system_time), debugstr_time(start_offset));
+ TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(system_time), wine_dbgstr_reference_time(start_offset));
EnterCriticalSection(&source->cs);
state = source->state;
@@ -8094,7 +8094,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa
struct system_time_source *source = impl_from_IMFClockStateSink(iface);
HRESULT hr;
- TRACE("%p, %s.\n", iface, debugstr_time(system_time));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(system_time));
EnterCriticalSection(&source->cs);
if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP)))
@@ -8109,7 +8109,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if
struct system_time_source *source = impl_from_IMFClockStateSink(iface);
HRESULT hr;
- TRACE("%p, %s.\n", iface, debugstr_time(system_time));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(system_time));
EnterCriticalSection(&source->cs);
if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE)))
@@ -8127,7 +8127,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink *
struct system_time_source *source = impl_from_IMFClockStateSink(iface);
HRESULT hr;
- TRACE("%p, %s.\n", iface, debugstr_time(system_time));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(system_time));
EnterCriticalSection(&source->cs);
if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART)))
@@ -8145,7 +8145,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink *
struct system_time_source *source = impl_from_IMFClockStateSink(iface);
double intpart;
- TRACE("%p, %s, %f.\n", iface, debugstr_time(system_time), rate);
+ TRACE("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(system_time), rate);
if (rate == 0.0f)
return MF_E_UNSUPPORTED_RATE;
diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h
index b646d9e7cbb..bc673987650 100644
--- a/dlls/mfplat/mfplat_private.h
+++ b/dlls/mfplat/mfplat_private.h
@@ -183,24 +183,3 @@ static inline const char *debugstr_fourcc(DWORD format)
return wine_dbgstr_an((char *)&format, 4);
}
-
-static inline const char *debugstr_time(LONGLONG time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c
index 04c68c87199..72eca896dae 100644
--- a/dlls/mfplat/sample.c
+++ b/dlls/mfplat/sample.c
@@ -528,7 +528,7 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp)
{
struct sample *sample = impl_from_IMFSample(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(timestamp));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(timestamp));
EnterCriticalSection(&sample->attributes.cs);
sample->timestamp = timestamp;
@@ -559,7 +559,7 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati
{
struct sample *sample = impl_from_IMFSample(iface);
- TRACE("%p, %s.\n", iface, debugstr_time(duration));
+ TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(duration));
EnterCriticalSection(&sample->attributes.cs);
sample->duration = duration;
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index 12d96f69376..04f942b7d9d 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -203,7 +203,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
goto error;
}
- TRACE("Sample start time: %s.\n", debugstr_time(tStart));
+ TRACE("Sample start time: %s.\n", wine_dbgstr_reference_time(tStart));
if (ash.cbSrcLengthUsed == cbSrcStream)
{
IMediaSample_SetTime(pOutSample, &tStart, &tStop);
@@ -236,7 +236,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
IMediaSample_SetMediaTime(pOutSample, NULL, NULL);
}
- TRACE("Sample stop time: %s\n", debugstr_time(tStart));
+ TRACE("Sample stop time: %s\n", wine_dbgstr_reference_time(tStart));
hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {
@@ -418,7 +418,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface,
HRESULT hr = S_OK;
TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
- filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
+ filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp));
if (filter->source_qc_sink)
return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q);
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 30b6c741eed..ebd59beaf70 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -477,7 +477,7 @@ static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface,
struct avi_decompressor *filter = impl_from_source_IQualityControl(iface);
TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
- filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
+ filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp));
EnterCriticalSection(&filter->filter.stream_cs);
if (q.Late > 0)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index 1abd4bdbcec..4f6ebb620e5 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -182,7 +182,7 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This,
*ret_writepos = writepos;
} else if (delta_t < 0) {
REFERENCE_TIME past, min_writepos_t;
- WARN("Delta too big %s/%s, overwriting old data or even skipping\n", debugstr_time(delta_t), debugstr_time(max_lag));
+ WARN("Delta too big %s/%s, overwriting old data or even skipping\n", wine_dbgstr_reference_time(delta_t), wine_dbgstr_reference_time(max_lag));
if (min_writepos >= playpos)
min_writepos_t = cur + time_from_pos(This, min_writepos - playpos);
else
@@ -200,7 +200,7 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This,
}
} else /* delta_t > 0 */ {
DWORD aheadbytes;
- WARN("Delta too big %s/%s, too far ahead\n", debugstr_time(delta_t), debugstr_time(max_lag));
+ WARN("Delta too big %s/%s, too far ahead\n", wine_dbgstr_reference_time(delta_t), wine_dbgstr_reference_time(max_lag));
aheadbytes = pos_from_time(This, delta_t);
WARN("Advancing %lu bytes.\n", aheadbytes);
if (delta_t >= DSoundRenderer_Max_Fill)
@@ -213,8 +213,8 @@ end:
else
*pfree = This->buf_size + playpos - *ret_writepos;
if (time_from_pos(This, This->buf_size - *pfree) >= DSoundRenderer_Max_Fill) {
- TRACE("Blocked: too full %s / %s\n", debugstr_time(time_from_pos(This, This->buf_size - *pfree)),
- debugstr_time(DSoundRenderer_Max_Fill));
+ TRACE("Blocked: too full %s / %s\n", wine_dbgstr_reference_time(time_from_pos(This, This->buf_size - *pfree)),
+ wine_dbgstr_reference_time(DSoundRenderer_Max_Fill));
return S_FALSE;
}
return S_OK;
@@ -962,7 +962,7 @@ static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,
struct dsound_render *filter = impl_from_IQualityControl(iface);
FIXME("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s, stub!\n",
- filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
+ filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp));
return E_NOTIMPL;
}
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 1849174cf97..867eab011d5 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -2249,7 +2249,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *d
LeaveCriticalSection(&graph->cs);
TRACE("Returning hr %#lx, duration %s (%s seconds).\n", hr,
- wine_dbgstr_longlong(*duration), debugstr_time(*duration));
+ wine_dbgstr_longlong(*duration), wine_dbgstr_reference_time(*duration));
return hr;
}
@@ -2290,7 +2290,7 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON
LeaveCriticalSection(&graph->cs);
- TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), debugstr_time(*stop));
+ TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), wine_dbgstr_reference_time(*stop));
return hr;
}
@@ -2320,7 +2320,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG
LeaveCriticalSection(&graph->cs);
- TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), debugstr_time(ret));
+ TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), wine_dbgstr_reference_time(ret));
*current = ret;
return S_OK;
@@ -2361,10 +2361,10 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags);
if (current_ptr)
TRACE("Setting current position to %s (%s seconds).\n",
- wine_dbgstr_longlong(*current_ptr), debugstr_time(*current_ptr));
+ wine_dbgstr_longlong(*current_ptr), wine_dbgstr_reference_time(*current_ptr));
if (stop_ptr)
TRACE("Setting stop position to %s (%s seconds).\n",
- wine_dbgstr_longlong(*stop_ptr), debugstr_time(*stop_ptr));
+ wine_dbgstr_longlong(*stop_ptr), wine_dbgstr_reference_time(*stop_ptr));
if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning
&& (current_flags & 0x7) != AM_SEEKING_NoPositioning)
@@ -5093,7 +5093,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start)
struct filter_graph *graph = impl_from_IMediaFilter(iface);
HRESULT hr;
- TRACE("graph %p, start %s.\n", graph, debugstr_time(start));
+ TRACE("graph %p, start %s.\n", graph, wine_dbgstr_reference_time(start));
EnterCriticalSection(&graph->cs);
diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c
index 87869b4d6b2..715f4b704e0 100644
--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -560,8 +560,8 @@ static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 *iface, REFERENCE_TI
{
StdMediaSample2 *sample = impl_from_IMediaSample2(iface);
- TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)",
- end ? debugstr_time(*end) : "(null)");
+ TRACE("sample %p, start %s, end %s.\n", sample, start ? wine_dbgstr_reference_time(*start) : "(null)",
+ end ? wine_dbgstr_reference_time(*end) : "(null)");
if (start)
{
@@ -742,8 +742,8 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLON
{
StdMediaSample2 *sample = impl_from_IMediaSample2(iface);
- TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)",
- end ? debugstr_time(*end) : "(null)");
+ TRACE("sample %p, start %s, end %s.\n", sample, start ? wine_dbgstr_reference_time(*start) : "(null)",
+ end ? wine_dbgstr_reference_time(*end) : "(null)");
if (start)
{
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index c706d906a26..c68a65244a3 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -37,27 +37,6 @@
#include "wine/strmbase.h"
#include "wine/list.h"
-static inline const char *debugstr_time(REFERENCE_TIME time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
-
/* see IAsyncReader::Request on MSDN for the explanation of this */
#define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000)
#define BYTES_FROM_MEDIATIME(time) ((time) / 10000000)
diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c
index 729122fec46..9bdbd3e62eb 100644
--- a/dlls/quartz/systemclock.c
+++ b/dlls/quartz/systemclock.c
@@ -259,7 +259,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_
LeaveCriticalSection(&clock->cs);
- TRACE("clock %p, time %p, returning %s.\n", clock, time, debugstr_time(ret));
+ TRACE("clock %p, time %p, returning %s.\n", clock, time, wine_dbgstr_reference_time(ret));
return hr;
}
@@ -269,7 +269,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface,
struct system_clock *clock = impl_from_IReferenceClock(iface);
TRACE("clock %p, base %s, offset %s, event %#Ix, cookie %p.\n",
- clock, debugstr_time(base), debugstr_time(offset), event, cookie);
+ clock, wine_dbgstr_reference_time(base), wine_dbgstr_reference_time(offset), event, cookie);
if (base + offset <= 0)
return E_INVALIDARG;
@@ -283,7 +283,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface,
struct system_clock *clock = impl_from_IReferenceClock(iface);
TRACE("clock %p, start %s, period %s, semaphore %#Ix, cookie %p.\n",
- clock, debugstr_time(start), debugstr_time(period), semaphore, cookie);
+ clock, wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(period), semaphore, cookie);
if (start <= 0 || period <= 0)
return E_INVALIDARG;
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 222bce3b2c7..7286688666d 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -41,27 +41,6 @@
bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN;
-static inline const char *debugstr_time(REFERENCE_TIME time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
-
#define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000)
struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
index 331bc9a888a..704e782554e 100644
--- a/dlls/winegstreamer/quartz_parser.c
+++ b/dlls/winegstreamer/quartz_parser.c
@@ -1298,8 +1298,8 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface,
int i;
TRACE("pin %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n",
- pin, current ? debugstr_time(*current) : "<null>", current_flags,
- stop ? debugstr_time(*stop) : "<null>", stop_flags);
+ pin, current ? wine_dbgstr_reference_time(*current) : "<null>", current_flags,
+ stop ? wine_dbgstr_reference_time(*stop) : "<null>", stop_flags);
if (pin->pin.pin.filter->state == State_Stopped)
{
@@ -1419,7 +1419,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil
TRACE("pin %p, sender %p, type %s, proportion %ld, late %s, timestamp %s.\n",
pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion,
- debugstr_time(q.Late), debugstr_time(q.TimeStamp));
+ wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp));
/* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the
* current time instead of the time of the last buffer). GstClockTime is
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index fc919ef2c49..41c335210b8 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -319,7 +319,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface,
static const DWORD zero;
TRACE("reader %p, start %s, duration %s, rate %.8e, context %p.\n",
- reader, debugstr_time(start), debugstr_time(duration), rate, context);
+ reader, wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(duration), rate, context);
if (rate != 1.0f)
FIXME("Ignoring rate %.8e.\n", rate);
@@ -448,7 +448,7 @@ static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QW
{
struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
- TRACE("reader %p, time %s.\n", reader, debugstr_time(time));
+ TRACE("reader %p, time %s.\n", reader, wine_dbgstr_reference_time(time));
EnterCriticalSection(&reader->stream_cs);
@@ -1492,7 +1492,7 @@ static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME
struct async_reader *reader = impl_from_IReferenceClock(iface);
FIXME("reader %p, basetime %s, streamtime %s, event %#Ix, cookie %p, stub!\n",
- reader, debugstr_time(basetime), debugstr_time(streamtime), event, cookie);
+ reader, wine_dbgstr_reference_time(basetime), wine_dbgstr_reference_time(streamtime), event, cookie);
return E_NOTIMPL;
}
@@ -1503,7 +1503,7 @@ static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_
struct async_reader *reader = impl_from_IReferenceClock(iface);
FIXME("reader %p, starttime %s, period %s, semaphore %#Ix, cookie %p, stub!\n",
- reader, debugstr_time(starttime), debugstr_time(period), semaphore, cookie);
+ reader, wine_dbgstr_reference_time(starttime), wine_dbgstr_reference_time(period), semaphore, cookie);
return E_NOTIMPL;
}
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index d40afb66afd..4e14f03fb20 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -912,7 +912,7 @@ static HRESULT WINAPI profile_CreateNewStreamPrioritization(IWMProfile3 *iface,
static HRESULT WINAPI profile_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *count)
{
- FIXME("iface %p, duration %s, count %p, stub!\n", iface, debugstr_time(duration), count);
+ FIXME("iface %p, duration %s, count %p, stub!\n", iface, wine_dbgstr_reference_time(duration), count);
return E_NOTIMPL;
}
@@ -1029,7 +1029,7 @@ static HRESULT WINAPI header_info_GetAttributeByName(IWMHeaderInfo3 *iface, WORD
EnterCriticalSection(&reader->cs);
duration = wg_parser_stream_get_duration(wg_parser_get_stream(reader->wg_parser, 0));
LeaveCriticalSection(&reader->cs);
- TRACE("Returning duration %s.\n", debugstr_time(duration));
+ TRACE("Returning duration %s.\n", wine_dbgstr_reference_time(duration));
memcpy(value, &duration, sizeof(QWORD));
return S_OK;
}
@@ -1084,7 +1084,7 @@ static HRESULT WINAPI header_info_GetMarker(IWMHeaderInfo3 *iface,
static HRESULT WINAPI header_info_AddMarker(IWMHeaderInfo3 *iface, const WCHAR *name, QWORD time)
{
- FIXME("iface %p, name %s, time %s, stub!\n", iface, debugstr_w(name), debugstr_time(time));
+ FIXME("iface %p, name %s, time %s, stub!\n", iface, debugstr_w(name), wine_dbgstr_reference_time(time));
return E_NOTIMPL;
}
@@ -1112,7 +1112,7 @@ static HRESULT WINAPI header_info_AddScript(IWMHeaderInfo3 *iface,
const WCHAR *type, const WCHAR *command, QWORD time)
{
FIXME("iface %p, type %s, command %s, time %s, stub!\n",
- iface, debugstr_w(type), debugstr_w(command), debugstr_time(time));
+ iface, debugstr_w(type), debugstr_w(command), wine_dbgstr_reference_time(time));
return E_NOTIMPL;
}
diff --git a/include/wine/debug.h b/include/wine/debug.h
index 58f92754164..566fb185745 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -349,6 +349,27 @@ static inline const char *wine_dbgstr_longlong( ULONGLONG ll )
else return wine_dbg_sprintf( "%lx", (unsigned long)ll );
}
+static inline const char *wine_dbgstr_reference_time( LONGLONG time )
+{
+ ULONGLONG abstime = time >= 0 ? time : -time;
+ unsigned int i = 0, j = 0;
+ char buffer[23], rev[23];
+
+ while (abstime || i <= 8)
+ {
+ buffer[i++] = '0' + (abstime % 10);
+ abstime /= 10;
+ if (i == 7) buffer[i++] = '.';
+ }
+ if (time < 0) buffer[i++] = '-';
+
+ while (i--) rev[j++] = buffer[i];
+ while (rev[j-1] == '0' && rev[j-2] != '.') --j;
+ rev[j] = 0;
+
+ return wine_dbg_sprintf("%s", rev);
+}
+
#if defined(__oaidl_h__) && defined(V_VT)
static inline const char *wine_dbgstr_vt( VARTYPE vt )
diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c
index 2cf874ac1f1..9b9e05223d0 100644
--- a/libs/strmbase/filter.c
+++ b/libs/strmbase/filter.c
@@ -347,7 +347,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start)
struct strmbase_filter *filter = impl_from_IBaseFilter(iface);
HRESULT hr = S_OK;
- TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_time(start));
+ TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), wine_dbgstr_reference_time(start));
EnterCriticalSection(&filter->filter_cs);
diff --git a/libs/strmbase/mediatype.c b/libs/strmbase/mediatype.c
index 6f66999c390..e0618d06acb 100644
--- a/libs/strmbase/mediatype.c
+++ b/libs/strmbase/mediatype.c
@@ -109,7 +109,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget));
if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate);
if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate);
- TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame));
+ TRACE("%s sec/frame, ", wine_dbgstr_reference_time(vih->AvgTimePerFrame));
TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u",
vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes,
vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression),
@@ -128,7 +128,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget));
if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate);
if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate);
- TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame));
+ TRACE("%s sec/frame, ", wine_dbgstr_reference_time(vih->AvgTimePerFrame));
if (vih->dwInterlaceFlags) TRACE("interlace flags %#x, ", vih->dwInterlaceFlags);
if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags);
TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY);
diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c
index 36b3fdf1425..cb958099d38 100644
--- a/libs/strmbase/pin.c
+++ b/libs/strmbase/pin.c
@@ -650,7 +650,7 @@ static HRESULT WINAPI source_NewSegment(IPin * iface, REFERENCE_TIME start, REFE
struct strmbase_source *pin = impl_source_from_IPin(iface);
TRACE("pin %p %s:%s, start %s, stop %s, rate %.16e.\n", pin, debugstr_w(pin->pin.filter->name),
- debugstr_w(pin->pin.name), debugstr_time(start), debugstr_time(stop), rate);
+ debugstr_w(pin->pin.name), wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(stop), rate);
return S_OK;
}
@@ -1019,7 +1019,7 @@ static HRESULT WINAPI sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFEREN
newsegmentargs args;
TRACE("pin %p %s:%s, start %s, stop %s, rate %.16e.\n", pin, debugstr_w(pin->pin.filter->name),
- debugstr_w(pin->pin.name), debugstr_time(start), debugstr_time(stop), rate);
+ debugstr_w(pin->pin.name), wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(stop), rate);
if (pin->pFuncsTable->sink_new_segment)
return pin->pFuncsTable->sink_new_segment(pin, start, stop, rate);
diff --git a/libs/strmbase/renderer.c b/libs/strmbase/renderer.c
index da257555a19..70e3c78207a 100644
--- a/libs/strmbase/renderer.c
+++ b/libs/strmbase/renderer.c
@@ -107,11 +107,11 @@ static void perform_qos(struct strmbase_renderer *filter,
}
TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n",
- debugstr_time(start), debugstr_time(entered), debugstr_time(left),
- debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter));
+ wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(entered), wine_dbgstr_reference_time(left),
+ wine_dbgstr_reference_time(pt), wine_dbgstr_reference_time(duration), wine_dbgstr_reference_time(jitter));
TRACE("average duration %s, average pt %s, average rate %.16e.\n",
- debugstr_time(filter->avg_duration), debugstr_time(filter->avg_pt), filter->avg_rate);
+ wine_dbgstr_reference_time(filter->avg_duration), wine_dbgstr_reference_time(filter->avg_pt), filter->avg_rate);
/* Collect running averages. For first observations, we copy the values. */
if (filter->avg_duration < 0)
@@ -527,7 +527,7 @@ static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter
HRESULT hr = S_FALSE;
TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n",
- filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
+ filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp));
if (filter->qc_sink)
return IQualityControl_Notify(filter->qc_sink, &filter->filter.IBaseFilter_iface, q);
diff --git a/libs/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h
index 9ac0b24bb1a..ad9da316c2c 100644
--- a/libs/strmbase/strmbase_private.h
+++ b/libs/strmbase/strmbase_private.h
@@ -32,25 +32,4 @@
#include "wine/list.h"
#include "wine/strmbase.h"
-static inline const char *debugstr_time(REFERENCE_TIME time)
-{
- ULONGLONG abstime = time >= 0 ? time : -time;
- unsigned int i = 0, j = 0;
- char buffer[23], rev[23];
-
- while (abstime || i <= 8)
- {
- buffer[i++] = '0' + (abstime % 10);
- abstime /= 10;
- if (i == 7) buffer[i++] = '.';
- }
- if (time < 0) buffer[i++] = '-';
-
- while (i--) rev[j++] = buffer[i];
- while (rev[j-1] == '0' && rev[j-2] != '.') --j;
- rev[j] = 0;
-
- return wine_dbg_sprintf("%s", rev);
-}
-
#endif /* __WINE_STRMBASE_PRIVATE_H */
--
2.35.1
1
0
07 Feb '22
From: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
v4: Modify "use_mt" instead of run_queued_tests().
This supersedes patch 225752.
dlls/dxgi/tests/dxgi.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index a83964d75233..f70d849aebc9 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -7595,6 +7595,11 @@ START_TEST(dxgi)
ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, ®istry_mode), "Failed to get display mode.\n");
use_mt = !getenv("WINETEST_NO_MT_D3D");
+ /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when
+ * requested. When using the chunk allocator, running the tests with more
+ * than one thread can exceed the 32-bit virtual address space. */
+ if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))
+ use_mt = FALSE;
argc = winetest_get_mainargs(&argv);
for (i = 2; i < argc; ++i)
--
2.30.2
2
1
07 Feb '22
From: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
v4: Modify "use_mt" instead of run_queued_tests().
This supersedes patch 225753.
dlls/d3d11/tests/d3d11.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 93f0aa896e8f..52c8816b689e 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -34055,6 +34055,11 @@ START_TEST(d3d11)
char **argv;
use_mt = !getenv("WINETEST_NO_MT_D3D");
+ /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when
+ * requested. When using the chunk allocator, running the tests with more
+ * than one thread can exceed the 32-bit virtual address space. */
+ if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))
+ use_mt = FALSE;
argc = winetest_get_mainargs(&argv);
for (i = 2; i < argc; ++i)
--
2.30.2
2
1
[PATCH vkd3d 2/2] configure: Don't require pthread for Mingw builds.
by Alexandre Julliard 07 Feb '22
by Alexandre Julliard 07 Feb '22
07 Feb '22
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
configure.ac | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index d296dfd4bc6d..45220f840bfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,10 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no])
VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no])
dnl Check for headers
-AC_CHECK_HEADERS([dlfcn.h pthread.h \
+AC_CHECK_HEADERS([dlfcn.h \
vulkan/vulkan.h \
vulkan/spirv.h vulkan/GLSL.std.450.h \
spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h])
-AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])])
AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h not found.])])
AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes" \
-a "x$ac_cv_header_vulkan_spirv_h" != "xyes"],
@@ -103,8 +102,15 @@ AC_CHECK_LIB([dl], [dlopen],
[DL_LIBS="-ldl"],
[AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])])
-AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
-VKD3D_CHECK_PTHREAD
+case $host_os in
+ mingw32*) ;;
+ *) AC_CHECK_HEADERS([pthread.h])
+ AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])])
+ AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
+ VKD3D_CHECK_PTHREAD
+ VKD3D_CHECK_PTHREAD_SETNAME_NP
+ ;;
+esac
AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
VKD3D_CHECK_VULKAN
@@ -132,8 +138,6 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__built
VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)])
VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)])
-VKD3D_CHECK_PTHREAD_SETNAME_NP
-
dnl Makefiles
AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
[AC_MSG_ERROR([libxcb is required for demos.])])
--
2.34.1
3
2
[PATCH vkd3d 1/2] vkd3d: Add a create thread implementation for Windows.
by Alexandre Julliard 07 Feb '22
by Alexandre Julliard 07 Feb '22
07 Feb '22
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
libs/vkd3d/device.c | 42 ++++++++++++++++++++++++++++++++++++++
libs/vkd3d/vkd3d_private.h | 14 +++++++++----
2 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index fe90eb37ef00..3360fd6eeeb8 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -4037,6 +4037,23 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason,
device->removed_reason = reason;
}
+
+#ifdef _WIN32
+struct thread_data
+{
+ PFN_vkd3d_thread main_pfn;
+ void *data;
+};
+
+static DWORD WINAPI call_thread_main(void *data)
+{
+ struct thread_data *thread_data = data;
+ thread_data->main_pfn(thread_data->data);
+ vkd3d_free(thread_data);
+ return 0;
+}
+#endif
+
HRESULT vkd3d_create_thread(struct vkd3d_instance *instance,
PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread)
{
@@ -4053,11 +4070,27 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance,
}
else
{
+#ifdef _WIN32
+ struct thread_data *thread_data;
+
+ if (!(thread_data = vkd3d_malloc(sizeof(*thread_data))))
+ return E_OUTOFMEMORY;
+
+ thread_data->main_pfn = thread_main;
+ thread_data->data = data;
+ if (!(thread->handle = CreateThread(NULL, 0, call_thread_main, thread_data, 0, NULL)))
+ {
+ ERR("Failed to create thread, error %d.\n", GetLastError());
+ vkd3d_free(thread_data);
+ hr = E_FAIL;
+ }
+#else
if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data)))
{
ERR("Failed to create thread, error %d.\n", rc);
hr = hresult_from_errno(rc);
}
+#endif
}
return hr;
@@ -4075,11 +4108,20 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha
}
else
{
+#ifdef _WIN32
+ if ((rc = WaitForSingleObject(thread->handle, INFINITE)) != WAIT_OBJECT_0)
+ {
+ ERR("Failed to wait for thread, ret %#x.\n", rc);
+ hr = E_FAIL;
+ }
+ CloseHandle(thread->handle);
+#else
if ((rc = pthread_join(thread->pthread, NULL)))
{
ERR("Failed to join thread, error %d.\n", rc);
hr = hresult_from_errno(rc);
}
+#endif
}
return hr;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index ece111325e77..67989c11285a 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -40,7 +40,6 @@
#include <assert.h>
#include <inttypes.h>
#include <limits.h>
-#include <pthread.h>
#include <stdbool.h>
#define VK_CALL(f) (vk_procs->f)
@@ -169,14 +168,13 @@ struct vkd3d_instance
LONG refcount;
};
+#ifdef _WIN32
+
union vkd3d_thread_handle
{
- pthread_t pthread;
void *handle;
};
-#ifdef _WIN32
-
struct vkd3d_mutex
{
CRITICAL_SECTION lock;
@@ -241,6 +239,14 @@ static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond)
#else /* _WIN32 */
+#include <pthread.h>
+
+union vkd3d_thread_handle
+{
+ pthread_t pthread;
+ void *handle;
+};
+
struct vkd3d_mutex
{
pthread_mutex_t lock;
--
2.34.1
2
1
[PATCH vkd3d 1/5] vkd3d: Pass shader extension info to all graphics stages.
by Conor McCarthy 07 Feb '22
by Conor McCarthy 07 Feb '22
07 Feb '22
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
libs/vkd3d/state.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index fa4de634..a7a878ca 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -2515,13 +2515,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
VkVertexInputBindingDivisorDescriptionEXT *binding_divisor;
const struct vkd3d_vulkan_info *vk_info = &device->vk_info;
uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT];
+ struct vkd3d_shader_spirv_target_info *stage_target_info;
uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT];
+ struct vkd3d_shader_descriptor_offset_info offset_info;
struct vkd3d_shader_parameter ps_shader_parameters[1];
struct vkd3d_shader_transform_feedback_info xfb_info;
struct vkd3d_shader_spirv_target_info ps_target_info;
struct vkd3d_shader_interface_info shader_interface;
- struct vkd3d_shader_descriptor_offset_info offset_info;
- struct vkd3d_shader_spirv_target_info *target_info;
+ struct vkd3d_shader_spirv_target_info target_info;
const struct d3d12_root_signature *root_signature;
struct vkd3d_shader_signature input_signature;
bool have_attachment, is_dsv_format_unknown;
@@ -2726,6 +2727,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
}
}
+ memset(&target_info, 0, sizeof(target_info));
+ target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO;
+ target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0;
+ target_info.extensions = vk_info->shader_extensions;
+ target_info.extension_count = vk_info->shader_extension_count;
+
graphics->xfb_enabled = false;
if (so_desc->NumEntries)
{
@@ -2778,7 +2785,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
offset_info.descriptor_table_count = 0;
offset_info.binding_offsets = root_signature->descriptor_offsets;
offset_info.uav_counter_offsets = NULL;
- vkd3d_prepend_struct(&shader_interface, &offset_info);
}
for (i = 0; i < ARRAY_SIZE(shader_stages); ++i)
@@ -2810,7 +2816,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
shader_interface.uav_counters = NULL;
shader_interface.uav_counter_count = 0;
- target_info = NULL;
+ stage_target_info = &target_info;
switch (shader_stages[i].stage)
{
case VK_SHADER_STAGE_VERTEX_BIT:
@@ -2837,7 +2843,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
case VK_SHADER_STAGE_FRAGMENT_BIT:
shader_interface.uav_counters = state->uav_counters.bindings;
shader_interface.uav_counter_count = state->uav_counters.binding_count;
- target_info = &ps_target_info;
+ stage_target_info = &ps_target_info;
break;
default:
@@ -2846,10 +2852,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
}
shader_interface.next = NULL;
+ xfb_info.next = NULL;
+ ps_target_info.next = NULL;
+ target_info.next = NULL;
+ offset_info.next = NULL;
if (shader_stages[i].stage == xfb_stage)
vkd3d_prepend_struct(&shader_interface, &xfb_info);
- if (target_info)
- vkd3d_prepend_struct(&shader_interface, target_info);
+ vkd3d_prepend_struct(&shader_interface, stage_target_info);
+ if (root_signature->descriptor_offsets)
+ vkd3d_prepend_struct(&shader_interface, &offset_info);
if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count],
shader_stages[i].stage, b, &shader_interface)))
--
2.34.1
2
7
07 Feb '22
From: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
v4: Modify "use_mt" instead of run_queued_tests().
This supersedes patch 225754.
dlls/d3d10core/tests/d3d10core.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index a5f7f4202d52..49622bd0e264 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -19223,6 +19223,11 @@ START_TEST(d3d10core)
char **argv;
use_mt = !getenv("WINETEST_NO_MT_D3D");
+ /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when
+ * requested. When using the chunk allocator, running the tests with more
+ * than one thread can exceed the 32-bit virtual address space. */
+ if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))
+ use_mt = FALSE;
argc = winetest_get_mainargs(&argv);
for (i = 2; i < argc; ++i)
--
2.30.2
1
0
07 Feb '22
From: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
v4: Modify "use_mt" instead of run_queued_tests().
This supersedes patch 225755.
dlls/d2d1/tests/d2d1.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 2ac48e026c32..ba67dd53111c 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -10551,6 +10551,11 @@ START_TEST(d2d1)
pD2D1ConvertColorSpace = (void *)GetProcAddress(d2d1_dll, "D2D1ConvertColorSpace");
use_mt = !getenv("WINETEST_NO_MT_D3D");
+ /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when
+ * requested. When using the chunk allocator, running the tests with more
+ * than one thread can exceed the 32-bit virtual address space. */
+ if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))
+ use_mt = FALSE;
argc = winetest_get_mainargs(&argv);
for (i = 2; i < argc; ++i)
--
2.30.2
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
v2: fixed test breakage
dlls/xmllite/tests/Makefile.in | 1 -
dlls/xmllite/tests/reader.c | 488 +++++++++++------------
dlls/xmllite/tests/writer.c | 694 ++++++++++++++++-----------------
3 files changed, 591 insertions(+), 592 deletions(-)
diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in
index 1548dc50193..6a87e6663aa 100644
--- a/dlls/xmllite/tests/Makefile.in
+++ b/dlls/xmllite/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = xmllite.dll
IMPORTS = xmllite ole32
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index c4e53a5c40c..d0d2373aaf1 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -50,7 +50,7 @@ static IStream *create_stream_on_data(const void *data, unsigned int size)
memcpy(ptr, data, size);
hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(stream != NULL, "Expected non-NULL stream\n");
GlobalUnlock(hglobal);
@@ -209,7 +209,7 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml
stream = create_stream_on_data(xml, strlen(xml));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
- ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
}
@@ -222,9 +222,9 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t
hr = IXmlReader_Read(reader, &type);
if (expected_type == XmlNodeType_None)
- ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr);
+ ok_(__FILE__,line)(hr == S_FALSE, "Read returned %#lx, expected S_FALSE.\n", hr);
else
- ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Read returned %#lx.\n", hr);
ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type);
}
@@ -233,7 +233,7 @@ static void _next_attribute(unsigned line, IXmlReader *reader)
{
HRESULT hr;
hr = IXmlReader_MoveToNextAttribute(reader);
- ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
}
#define move_to_element(a) _move_to_element(__LINE__,a)
@@ -241,7 +241,7 @@ static void _move_to_element(unsigned line, IXmlReader *reader)
{
HRESULT hr;
hr = IXmlReader_MoveToElement(reader);
- ok_(__FILE__,line)(hr == S_OK, "MoveToElement failed: %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
}
static void test_read_state(IXmlReader *reader, XmlReadState expected,
@@ -269,11 +269,11 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected,
static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetValue(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetValue returned %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "value = %s\n", wine_dbgstr_w(str));
return str;
@@ -283,12 +283,12 @@ static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR
static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetLocalName(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetLocalName returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -297,12 +297,12 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR
static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetPrefix(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "prefix = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -311,12 +311,12 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHA
static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetNamespaceUri(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "namespace = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -325,12 +325,12 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const W
static const WCHAR *_reader_qname(IXmlReader *reader, const WCHAR *expect, unsigned line)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -343,7 +343,7 @@ static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned l
HRESULT hr;
hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count);
- ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok_(__FILE__,line)(count == 1, "got %u\n", c);
ok_(__FILE__,line)(c == expected_char, "got %x\n", c);
}
@@ -528,84 +528,84 @@ static void test_reader_create(void)
}
hr = CreateXmlReader(&IID_IStream, (void **)&unk, NULL);
- ok(hr == E_NOINTERFACE, "got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlReader(&IID_IUnknown, (void **)&unk, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(unk, &IID_IXmlReader, (void **)&reader);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)reader, "unexpected interface\n");
IXmlReader_Release(reader);
IUnknown_Release(unk);
hr = CreateXmlReader(&IID_IUnknown, (void **)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IXmlReader_Release(reader);
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE(reader, XmlReadState_Closed);
nodetype = XmlNodeType_Element;
hr = IXmlReader_GetNodeType(reader, &nodetype);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got %d\n", nodetype);
/* crashes on XP, 2k3, works on newer versions */
if (0)
{
hr = IXmlReader_GetNodeType(reader, NULL);
- ok(hr == E_INVALIDARG, "got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
}
resolver = (void*)0xdeadbeef;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(resolver == NULL, "got %p\n", resolver);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR)&testresolver);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
resolver = NULL;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(resolver == &testresolver, "got %p\n", resolver);
IXmlResolver_Release(resolver);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
dtd = 2;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd);
dtd = 2;
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* Null input pointer, releases previous input */
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
/* test input interface selection sequence */
hr = testinput_createinstance((void**)&input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
if (hr == S_OK)
{
input_iids.count = 0;
hr = IXmlReader_SetInput(reader, input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE);
IUnknown_Release(input);
}
@@ -623,71 +623,71 @@ static void test_readerinput(void)
LONG ref;
hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ref = IStream_AddRef(stream);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IStream_Release(stream);
hr = CreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(reader_input, &IID_IStream, (void**)&stream2);
- ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(reader_input, &IID_ISequentialStream, (void**)&stream2);
- ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
/* IXmlReaderInput grabs a stream reference */
ref = IStream_AddRef(stream);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IStream_Release(stream);
/* try ::SetInput() with valid IXmlReaderInput */
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ref = IUnknown_AddRef(reader_input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(reader_input);
hr = IXmlReader_SetInput(reader, reader_input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE(reader, XmlReadState_Initial);
nodetype = XmlNodeType_Element;
hr = IXmlReader_GetNodeType(reader, &nodetype);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got %d\n", nodetype);
/* IXmlReader grabs a IXmlReaderInput reference */
ref = IUnknown_AddRef(reader_input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(reader_input);
ref = IStream_AddRef(stream);
- ok(ref == 4, "Expected 4, got %d\n", ref);
+ ok(ref == 4, "Expected 4, got %ld.\n", ref);
IStream_Release(stream);
/* reset input and check state */
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
IXmlReader_Release(reader);
ref = IStream_AddRef(stream);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IStream_Release(stream);
ref = IUnknown_AddRef(reader_input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(reader_input);
/* IID_IXmlReaderInput */
@@ -696,9 +696,9 @@ static void test_readerinput(void)
Such query will be used only to check if input is really IXmlReaderInput */
obj = (IUnknown*)0xdeadbeef;
hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ref = IUnknown_AddRef(reader_input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(reader_input);
IUnknown_Release(reader_input);
@@ -708,59 +708,59 @@ static void test_readerinput(void)
/* test input interface selection sequence */
input = NULL;
hr = testinput_createinstance((void**)&input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
input_iids.count = 0;
ref = IUnknown_AddRef(input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(input);
hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &reader_input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, empty_seq, NULL, FALSE);
/* IXmlReaderInput stores stream interface as IUnknown */
ref = IUnknown_AddRef(input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(input);
hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
input_iids.count = 0;
ref = IUnknown_AddRef(reader_input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(reader_input);
ref = IUnknown_AddRef(input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(input);
hr = IXmlReader_SetInput(reader, reader_input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_readerinput, NULL, FALSE);
TEST_READER_STATE(reader, XmlReadState_Closed);
ref = IUnknown_AddRef(input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(input);
ref = IUnknown_AddRef(reader_input);
ok(ref == 3 || broken(ref == 2) /* versions 1.0.x and 1.1.x - XP, Vista */,
- "Expected 3, got %d\n", ref);
+ "Expected 3, got %ld.\n", ref);
IUnknown_Release(reader_input);
/* repeat another time, no check or caching here */
input_iids.count = 0;
hr = IXmlReader_SetInput(reader, reader_input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_readerinput, NULL, FALSE);
/* another reader */
hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader2, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* resolving from IXmlReaderInput to IStream/ISequentialStream is done at
::SetInput() level, each time it's called */
input_iids.count = 0;
hr = IXmlReader_SetInput(reader2, reader_input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_readerinput, NULL, FALSE);
IXmlReader_Release(reader2);
@@ -777,11 +777,11 @@ static void test_reader_state(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* invalid arguments */
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* attempt to read on closed reader */
TEST_READER_STATE(reader, XmlReadState_Closed);
@@ -790,7 +790,7 @@ if (0)
{
/* newer versions crash here, probably because no input was set */
hr = IXmlReader_Read(reader, &nodetype);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
}
set_input_string(reader, "xml");
TEST_READER_STATE(reader, XmlReadState_Initial);
@@ -798,7 +798,7 @@ if (0)
nodetype = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &nodetype);
todo_wine
- ok(FAILED(hr), "got %08x\n", hr);
+ ok(FAILED(hr), "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype);
todo_wine
@@ -807,7 +807,7 @@ if (0)
nodetype = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &nodetype);
todo_wine
- ok(FAILED(hr), "got %08x\n", hr);
+ ok(FAILED(hr), "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype);
IXmlReader_Release(reader);
@@ -850,26 +850,26 @@ static void test_read_xmldeclaration(void)
const WCHAR *val;
hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full));
hr = IXmlReader_SetInput(reader, (IUnknown*)stream);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 0, "got %d\n", count);
/* try to move without attributes */
hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
TEST_READER_POSITION(reader, 0, 0);
@@ -890,7 +890,7 @@ static void test_read_xmldeclaration(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
TEST_READER_POSITION2(reader, 1, 7, ~0u, 55);
@@ -899,40 +899,40 @@ static void test_read_xmldeclaration(void)
next_attribute(reader);
next_attribute(reader);
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_POSITION2(reader, 1, 7, ~0u, 55);
hr = IXmlReader_GetAttributeCount(reader, NULL);
- ok(hr == E_INVALIDARG, "got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 3, "Expected 3, got %d\n", count);
for (i = 0; i < count; i++)
{
len = 0;
hr = IXmlReader_GetLocalName(reader, &val, &len);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len);
ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val));
len = 0;
hr = IXmlReader_GetValue(reader, &val, &len);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len);
ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val));
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "got %08x\n", hr);
+ ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "Unexpected hr %#lx.\n", hr);
}
TEST_DEPTH(reader, 1);
@@ -942,7 +942,7 @@ static void test_read_xmldeclaration(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type);
type = XmlNodeType_XmlDeclaration;
@@ -950,7 +950,7 @@ static void test_read_xmldeclaration(void)
/* newer versions return syntax error here cause document is incomplete,
it makes more sense than invalid char error */
todo_wine {
- ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr);
+ ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "got %d\n", type);
}
IStream_Release(stream);
@@ -959,14 +959,14 @@ todo_wine {
stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_XmlDeclaration);
TEST_READER_POSITION2(reader, 1, 3, ~0u, 21);
TEST_READER_STATE(reader, XmlReadState_Interactive);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 1, "expected 1, got %d\n", count);
ret = IXmlReader_IsEmptyElement(reader);
@@ -982,20 +982,20 @@ todo_wine {
type = -1;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
TEST_READER_POSITION2(reader, 1, 7, ~0u, 21);
/* try to move from last attribute */
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_Element);
TEST_READER_POSITION2(reader, 1, 23, ~0u, 40);
TEST_READER_STATE(reader, XmlReadState_Interactive);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 0, "expected 0, got %d\n", count);
ret = IXmlReader_IsEmptyElement(reader);
@@ -1007,7 +1007,7 @@ todo_wine {
type = -1;
hr = IXmlReader_Read(reader, &type);
todo_wine
- ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr);
+ ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type));
TEST_READER_POSITION(reader, 1, 41);
todo_wine
@@ -1053,7 +1053,7 @@ static void test_read_comment(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, teststr);
@@ -1066,7 +1066,7 @@ static void test_read_comment(void)
if (type == XmlNodeType_Text || type == XmlNodeType_Comment)
{
hr = IXmlReader_GetValue(reader, &value, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*value != 0, "Expected node value\n");
}
i++;
@@ -1079,9 +1079,9 @@ static void test_read_comment(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1092,14 +1092,14 @@ static void test_read_comment(void)
str = NULL;
hr = IXmlReader_GetLocalName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
reader_qname(reader, L"");
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
/* value */
@@ -1134,7 +1134,7 @@ static void test_read_pi(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1145,9 +1145,9 @@ static void test_read_pi(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1160,7 +1160,7 @@ static void test_read_pi(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(test->name), "got %u\n", len);
ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str));
@@ -1230,7 +1230,7 @@ static void test_read_full(void)
int i;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, test->xml);
@@ -1257,10 +1257,10 @@ static void test_read_public_dtd(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse);
- ok(hr == S_OK, "got 0x%8x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, test_public_dtd);
@@ -1268,15 +1268,15 @@ static void test_read_public_dtd(void)
count = 0;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 2, "got %d\n", count);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
reader_name(reader, L"PUBLIC");
@@ -1286,7 +1286,7 @@ static void test_read_public_dtd(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
reader_name(reader, L"SYSTEM");
@@ -1298,7 +1298,7 @@ static void test_read_public_dtd(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine {
ok(len == lstrlenW(dtdnameW), "got %u\n", len);
ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str));
@@ -1320,10 +1320,10 @@ static void test_read_system_dtd(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse);
- ok(hr == S_OK, "got 0x%8x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, test_system_dtd);
@@ -1331,15 +1331,15 @@ static void test_read_system_dtd(void)
count = 0;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 1, "got %d\n", count);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
reader_name(reader, L"SYSTEM");
@@ -1351,7 +1351,7 @@ static void test_read_system_dtd(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine {
ok(len == lstrlenW(dtdnameW), "got %u\n", len);
ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str));
@@ -1397,7 +1397,7 @@ static void test_read_element(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1406,10 +1406,10 @@ static void test_read_element(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX)
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1420,7 +1420,7 @@ static void test_read_element(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(test->name), "got %u\n", len);
ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str));
@@ -1444,7 +1444,7 @@ static void test_read_element(void)
depth = 123;
hr = IXmlReader_GetDepth(reader, &depth);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]);
if (type == XmlNodeType_Element || type == XmlNodeType_EndElement)
@@ -1453,7 +1453,7 @@ static void test_read_element(void)
prefix = NULL;
hr = IXmlReader_GetPrefix(reader, &prefix, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(prefix != NULL, "got %p\n", prefix);
if (!*prefix)
@@ -1462,12 +1462,12 @@ static void test_read_element(void)
local = NULL;
hr = IXmlReader_GetLocalName(reader, &local, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(local != NULL, "got %p\n", local);
qname = NULL;
hr = IXmlReader_GetQualifiedName(reader, &qname, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(qname != NULL, "got %p\n", qname);
ok(local == qname, "expected same pointer\n");
@@ -1478,7 +1478,7 @@ static void test_read_element(void)
{
count = 1;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 0, "got %u\n", count);
}
@@ -1486,7 +1486,7 @@ static void test_read_element(void)
{
count = 0;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* moving to attributes increases depth */
if (count)
@@ -1496,14 +1496,14 @@ static void test_read_element(void)
reader_value(reader, L"");
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetValue(reader, &value, NULL);
ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value));
depth = 123;
hr = IXmlReader_GetDepth(reader, &depth);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(depth == depths[i] + 1, "%u: got depth %u, expected %u\n", i, depth, depths[i] + 1);
move_to_element(reader);
@@ -1511,7 +1511,7 @@ static void test_read_element(void)
depth = 123;
hr = IXmlReader_GetDepth(reader, &depth);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]);
}
}
@@ -1526,7 +1526,7 @@ static void test_read_element(void)
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr);
+ ok(hr == WC_E_ELEMENTMATCH, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "got %d\n", type);
TEST_READER_STATE(reader, XmlReadState_Error);
@@ -1544,16 +1544,16 @@ static void test_read_pending(void)
int c;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* first read call returns incomplete node, second attempt fails with E_PENDING */
stream_readcall = 0;
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr);
+ ok(hr == S_OK || broken(hr == E_PENDING), "Unexpected hr %#lx.\n", hr);
/* newer versions are happy when it's enough data to detect node type,
older versions keep reading until it fails to read more */
todo_wine
@@ -1564,7 +1564,7 @@ static void test_read_pending(void)
c = stream_readcall;
value = (void*)0xdeadbeef;
hr = IXmlReader_GetValue(reader, &value, NULL);
- ok(hr == E_PENDING, "got 0x%08x\n", hr);
+ ok(hr == E_PENDING, "Unexpected hr %#lx.\n", hr);
ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value);
ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1);
@@ -1581,12 +1581,12 @@ static void test_readvaluechunk(void)
UINT c;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, "<!-- comment1 --><!-- comment2 -->");
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Comment, "type = %u\n", type);
read_value_char(reader, ' ');
@@ -1599,13 +1599,13 @@ static void test_readvaluechunk(void)
c = 0;
b = 0;
hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(c == 0, "got %u\n", c);
ok(b == 0, "got %x\n", b);
c = 0xdeadbeef;
hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!c, "c = %u\n", c);
reader_value(reader, L"omment1 ");
@@ -1615,13 +1615,13 @@ static void test_readvaluechunk(void)
c = 0xdeadbeef;
hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!c, "c = %u\n", c);
c = 0xdeadbeef;
memset(buf, 0xcc, sizeof(buf));
hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(c == 10, "got %u\n", c);
ok(buf[c] == 0xcccc, "buffer overflow\n");
buf[c] = 0;
@@ -1630,7 +1630,7 @@ static void test_readvaluechunk(void)
c = 0xdeadbeef;
memset(buf, 0xcc, sizeof(buf));
hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(!c, "got %u\n", c);
/* portion read as chunk is skipped from resulting node value */
@@ -1640,7 +1640,7 @@ static void test_readvaluechunk(void)
c = 0xdeadbeef;
b = 0xffff;
hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(c == 0, "got %u\n", c);
ok(b == 0xffff, "got %x\n", b);
@@ -1666,7 +1666,7 @@ static void test_read_cdata(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1685,9 +1685,9 @@ static void test_read_cdata(void)
}
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1699,19 +1699,19 @@ static void test_read_cdata(void)
str = NULL;
hr = IXmlReader_GetLocalName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
len = 1;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == 0, "got %u\n", len);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
/* value */
@@ -1740,7 +1740,7 @@ static void test_read_text(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1757,7 +1757,7 @@ static void test_read_text(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
}
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1769,19 +1769,19 @@ static void test_read_text(void)
str = NULL;
hr = IXmlReader_GetLocalName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
len = 1;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == 0, "got %u\n", len);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
/* value */
@@ -1812,7 +1812,7 @@ static void test_isemptyelement(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1823,7 +1823,7 @@ static void test_isemptyelement(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "got %d\n", type);
ret = IXmlReader_IsEmptyElement(reader);
@@ -1867,7 +1867,7 @@ static void test_read_attribute(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1878,9 +1878,9 @@ static void test_read_attribute(void)
hr = IXmlReader_Read(reader, NULL);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1888,19 +1888,19 @@ static void test_read_attribute(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "Failed to get node type, %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_name(reader, test->name);
len = 1;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(test->name), "got %u\n", len);
ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str));
@@ -1921,23 +1921,23 @@ static void test_reader_properties(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
value = 0;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value);
- ok(hr == S_OK, "GetProperty failed: %08x\n", hr);
- ok(value == 256, "Unexpected default max depth value %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == 256, "Unexpected default max depth value %Id.\n", value);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0);
- ok(hr == S_OK, "SetProperty failed: %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0);
- ok(hr == S_OK, "SetProperty failed: %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
value = 256;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value);
- ok(hr == S_OK, "GetProperty failed: %08x\n", hr);
- ok(value == 0, "Unexpected max depth value %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == 0, "Unexpected max depth value %Id.\n", value);
IXmlReader_Release(reader);
}
@@ -1960,7 +1960,7 @@ static void test_prefix(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(prefix_tests); i++) {
XmlNodeType type;
@@ -1968,16 +1968,16 @@ static void test_prefix(void)
set_input_string(reader, prefix_tests[i].xml);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "Read() failed, %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type);
reader_prefix(reader, prefix_tests[i].prefix1);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type);
reader_prefix(reader, prefix_tests[i].prefix2);
@@ -1985,7 +1985,7 @@ static void test_prefix(void)
next_attribute(reader);
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type);
reader_prefix(reader, prefix_tests[i].prefix3);
@@ -2035,7 +2035,7 @@ static void test_namespaceuri(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(uri_tests); i++) {
unsigned int j = 0;
@@ -2059,13 +2059,13 @@ static void test_namespaceuri(void)
local = NULL;
length = 0;
hr = IXmlReader_GetLocalName(reader, &local, &length);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(local != NULL, "Unexpected NULL local name pointer\n");
qname = NULL;
length2 = 0;
hr = IXmlReader_GetQualifiedName(reader, &qname, &length2);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(qname != NULL, "Unexpected NULL qualified name pointer\n");
if (type == XmlNodeType_Element ||
@@ -2100,28 +2100,28 @@ static void test_read_charref(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, testA);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type);
hr = IXmlReader_GetValue(reader, &value, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value));
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "Unexpected node type %d\n", type);
IXmlReader_Release(reader);
@@ -2154,7 +2154,7 @@ static void test_encoding_detection(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* there's no way to query detected encoding back, so just verify that document is browsable */
@@ -2164,7 +2164,7 @@ static void test_encoding_detection(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type != XmlNodeType_None, "Unexpected node type %d\n", type);
}
@@ -2173,11 +2173,11 @@ static void test_encoding_detection(void)
stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "%u: got %08x\n", i, hr);
+ ok(hr == S_OK, "%u: unexpected hr %#lx.\n", i, hr);
ok(type != XmlNodeType_None, "%u: unexpected node type %d\n", i, type);
IStream_Release(stream);
@@ -2193,8 +2193,8 @@ static void test_eof_state(IXmlReader *reader, BOOL eof)
ok(IXmlReader_IsEOF(reader) == eof, "Unexpected IsEOF() result\n");
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state);
- ok(hr == S_OK, "GetProperty() failed, %#x\n", hr);
- ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %ld\n", state);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %Id.\n", state);
}
static void test_endoffile(void)
@@ -2204,7 +2204,7 @@ static void test_endoffile(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_eof_state(reader, FALSE);
@@ -2214,46 +2214,46 @@ static void test_endoffile(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected type %d\n", type);
test_eof_state(reader, FALSE);
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_FALSE, "got %#x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "Unexpected type %d\n", type);
test_eof_state(reader, TRUE);
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_eof_state(reader, FALSE);
IXmlReader_Release(reader);
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, "<a/>text");
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected type %d\n", type);
test_eof_state(reader, FALSE);
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == WC_E_SYNTAX, "got %#x\n", hr);
+ ok(hr == WC_E_SYNTAX, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "Unexpected type %d\n", type);
test_eof_state(reader, FALSE);
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IXmlReader_Release(reader);
}
@@ -2274,37 +2274,37 @@ static void test_max_element_depth(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, xml);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 1);
TEST_READER_STATE(reader, XmlReadState_Interactive);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH2(reader, 0, 2);
TEST_READER_STATE(reader, XmlReadState_Error);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 10);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH2(reader, 0, 2);
TEST_READER_STATE(reader, XmlReadState_Error);
@@ -2313,34 +2313,34 @@ static void test_max_element_depth(void)
set_input_string(reader, xml);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 1);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 2);
TEST_READER_STATE(reader, XmlReadState_Interactive);
nodetype = 123;
hr = IXmlReader_Read(reader, &nodetype);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype);
nodetype = 123;
hr = IXmlReader_Read(reader, &nodetype);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype);
TEST_DEPTH2(reader, 0, 2);
@@ -2350,7 +2350,7 @@ static void test_max_element_depth(void)
set_input_string(reader, xml);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
count = 0;
while (IXmlReader_Read(reader, NULL) == S_OK)
@@ -2370,25 +2370,25 @@ static void test_reader_position(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE(reader, XmlReadState_Closed);
/* position methods with Null args */
hr = IXmlReader_GetLineNumber(reader, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetLinePosition(reader, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
position = 123;
hr = IXmlReader_GetLinePosition(reader, &position);
- ok(hr == S_FALSE, "got %#x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(position == 0, "got %u\n", position);
position = 123;
hr = IXmlReader_GetLineNumber(reader, &position);
- ok(hr == S_FALSE, "got %#x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(position == 0, "got %u\n", position);
set_input_string(reader, xml);
@@ -2396,7 +2396,7 @@ static void test_reader_position(void)
TEST_READER_STATE(reader, XmlReadState_Initial);
TEST_READER_POSITION(reader, 0, 0);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "got type %d\n", type);
TEST_READER_POSITION2(reader, 1, 2, ~0u, 34);
@@ -2410,17 +2410,17 @@ static void test_reader_position(void)
TEST_READER_POSITION2(reader, 1, 2, ~0u, 34);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Whitespace, "got type %d\n", type);
TEST_READER_POSITION2(reader, 1, 35, 2, 6);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_EndElement, "got type %d\n", type);
TEST_READER_POSITION2(reader, 2, 3, 2, 6);
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
TEST_READER_POSITION(reader, 0, 0);
@@ -2434,7 +2434,7 @@ static void test_string_pointers(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, "<elem xmlns=\"myns\">myns<elem2 /></elem>");
@@ -2565,67 +2565,67 @@ static void test_attribute_by_name(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "Failed to create reader, hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, xml);
hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL);
- ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_Element);
hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_Element);
hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"myns");
hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value a");
hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value b");
hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"ns uri");
hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value b");
hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value c2");
hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value c");
IXmlReader_Release(reader);
diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c
index c69aa42598d..8d096b0d632 100644
--- a/dlls/xmllite/tests/writer.c
+++ b/dlls/xmllite/tests/writer.c
@@ -41,7 +41,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
ULONG refcount;
IUnknown_AddRef(obj);
refcount = IUnknown_Release(obj);
- ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount);
+ ok_(__FILE__, line)(refcount == ref, "expected refcount %lu, got %lu.\n", ref, refcount);
}
static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line)
@@ -52,10 +52,10 @@ static void check_output_raw(IStream *stream, const void *expected, SIZE_T size,
WCHAR *ptr;
hr = GetHGlobalFromStream(stream, &hglobal);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#lx.\n", hr);
content_size = GlobalSize(hglobal);
- ok_(__FILE__, line)(size == content_size, "Unexpected test output size %ld.\n", content_size);
+ ok_(__FILE__, line)(size == content_size, "Unexpected test output size %Id.\n", content_size);
ptr = GlobalLock(hglobal);
if (size <= content_size)
ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n");
@@ -73,7 +73,7 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l
char *ptr;
hr = GetHGlobalFromStream(stream, &hglobal);
- ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
size = GlobalSize(hglobal);
ptr = GlobalLock(hglobal);
@@ -111,7 +111,7 @@ static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property)
HRESULT hr;
hr = IXmlWriter_SetProperty(writer, property, TRUE);
- ok(hr == S_OK, "Failed to set writer property, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to set writer property, hr %#lx.\n", hr);
}
/* used to test all Write* methods for consistent error state */
@@ -123,67 +123,67 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr)
/* FIXME: add WriteAttributes */
hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteCharEntity(writer, aW[0]);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteChars(writer, aW, 1);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteEntityRef(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteName(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteNmToken(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
/* FIXME: add WriteNode */
/* FIXME: add WriteNodeShallow */
hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteRaw(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteRawChars(writer, aW, 1);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteString(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
/* FIXME: add WriteSurrogateCharEntity */
/* FIXME: add WriteWhitespace */
@@ -195,10 +195,10 @@ static IStream *writer_set_output(IXmlWriter *writer)
HRESULT hr;
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
return stream;
}
@@ -295,39 +295,39 @@ static void test_writer_create(void)
}
hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL);
- ok(hr == E_NOINTERFACE, "got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)writer, "unexpected interface pointer\n");
IUnknown_Release(unk);
IXmlWriter_Release(writer);
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* check default properties values */
value = 0;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == TRUE, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == TRUE, "got %Id.\n", value);
value = TRUE;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == FALSE, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == FALSE, "got %Id.\n", value);
value = TRUE;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == FALSE, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == FALSE, "got %Id.\n", value);
value = XmlConformanceLevel_Auto;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == XmlConformanceLevel_Document, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == XmlConformanceLevel_Document, "got %Id.\n", value);
IXmlWriter_Release(writer);
}
@@ -337,78 +337,78 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output)
HRESULT hr;
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "Failed to set output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to set output, hr %#lx.\n", hr);
/* TODO: WriteAttributes */
hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCharEntity(writer, 0x100);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteChars(writer, aW, 1);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEntityRef(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteName(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteNmToken(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
/* TODO: WriteNode */
/* TODO: WriteNodeShallow */
hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRawChars(writer, aW, 1);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteString(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
/* TODO: WriteSurrogateCharEntity */
- /* ًُُTODO: WriteWhitespace */
+ /* TODO: WriteWhitespace */
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
}
static void test_writeroutput(void)
@@ -425,15 +425,15 @@ static void test_writeroutput(void)
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, NULL, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
EXPECT_REF(output, 1);
IUnknown_Release(output);
hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
unk = NULL;
hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine
ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output);
EXPECT_REF(output, 2);
@@ -444,14 +444,14 @@ static void test_writeroutput(void)
output = NULL;
hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IUnknown_Release(output);
hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
unk = NULL;
hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(unk != NULL, "got %p\n", unk);
/* releasing 'unk' crashes on native */
IUnknown_Release(output);
@@ -460,27 +460,27 @@ static void test_writeroutput(void)
/* create with us-ascii */
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IUnknown_Release(output);
/* Output with codepage 1200. */
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer, hr %#lx.\n", hr);
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output);
- ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to set writer output, hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "Write failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Write failed, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW));
@@ -489,11 +489,11 @@ static void test_writeroutput(void)
/* Create output with meaningless code page value. */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr);
output = NULL;
hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output);
- ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr);
test_invalid_output_encoding(writer, output);
CHECK_OUTPUT(stream, "");
@@ -503,11 +503,11 @@ static void test_writeroutput(void)
/* Same, with invalid encoding name. */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, dummyW, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_invalid_output_encoding(writer, output);
CHECK_OUTPUT(stream, "");
@@ -532,55 +532,55 @@ static void test_writestartdocument(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* output not set */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
/* nothing written yet */
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, fullprolog);
/* one more time */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
/* now add PI manually, and try to start a document */
stream = writer_set_output(writer);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
/* another attempt to add 'xml' PI */
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
@@ -589,23 +589,23 @@ static void test_writestartdocument(void)
/* create with us-ascii */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion2);
@@ -620,28 +620,28 @@ static void test_flush(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
g_write_len = 0;
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(g_write_len > 0, "got %d\n", g_write_len);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(g_write_len > 0, "Unexpected length %lu.\n", g_write_len);
g_write_len = 1;
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(g_write_len == 0, "got %d\n", g_write_len);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(g_write_len == 0, "Unexpected length %lu.\n", g_write_len);
/* Release() flushes too */
g_write_len = 1;
IXmlWriter_Release(writer);
- ok(g_write_len == 0, "got %d\n", g_write_len);
+ ok(g_write_len == 0, "Unexpected length %lu.\n", g_write_len);
}
static void test_omitxmldeclaration(void)
@@ -656,20 +656,20 @@ static void test_omitxmldeclaration(void)
char *ptr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = GetHGlobalFromStream(stream, &hglobal);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ptr = GlobalLock(hglobal);
ok(!ptr, "got %p\n", ptr);
@@ -677,7 +677,7 @@ static void test_omitxmldeclaration(void)
/* one more time */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
@@ -685,35 +685,35 @@ static void test_omitxmldeclaration(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
/* another attempt to add 'xml' PI */
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
IXmlWriter_Release(writer);
@@ -735,25 +735,25 @@ static void test_bom(void)
HRESULT hr;
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* BOM is on by default */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, bomW, sizeof(bomW));
@@ -762,19 +762,19 @@ static void test_bom(void)
/* start with PI */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, piW, sizeof(piW));
@@ -783,19 +783,19 @@ static void test_bom(void)
/* start with element */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, aopenW, sizeof(aopenW));
@@ -804,24 +804,24 @@ static void test_bom(void)
/* WriteElementString */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = GetHGlobalFromStream(stream, &hglobal);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, afullW, sizeof(afullW));
@@ -922,65 +922,65 @@ static void test_WriteStartElement(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<a");
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
IXmlWriter_Release(writer);
/* WriteElementString */
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, "prefix", "a", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "c", NULL, NULL);
- ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "d", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, "", "e", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, "prefix2", "f", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<prefix:a xmlns:prefix=\"uri\">"
@@ -1000,24 +1000,24 @@ static void test_WriteStartElement(void)
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr);
hr = write_start_element(writer, start_element_tests[i].prefix, start_element_tests[i].local,
start_element_tests[i].uri);
- ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr);
if (SUCCEEDED(start_element_tests[i].hr))
{
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, start_element_tests[i].output_partial, start_element_tests[i].todo_partial, __LINE__);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, start_element_tests[i].output, start_element_tests[i].todo, __LINE__);
}
@@ -1072,54 +1072,54 @@ static void test_WriteElementString(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "b", "uri", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, "prefix", "c", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "d", NULL, NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix2", "d", "uri", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "e", "uri", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "f", "uri2", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "g", "uri3", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "h", NULL, NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix_i", "i", NULL, NULL);
- ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "", "j", "uri", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a><b>value</b><b />"
@@ -1142,24 +1142,24 @@ static void test_WriteElementString(void)
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr);
hr = write_element_string(writer, element_string_tests[i].prefix, element_string_tests[i].local,
element_string_tests[i].uri, element_string_tests[i].value);
- ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr);
if (SUCCEEDED(element_string_tests[i].hr))
{
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__);
}
@@ -1177,24 +1177,24 @@ static void test_WriteEndElement(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<a><b /></a>");
@@ -1213,47 +1213,47 @@ static void test_writeenddocument(void)
char *ptr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
/* WriteEndDocument resets it to initial state */
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = GetHGlobalFromStream(stream, &hglobal);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ptr = GlobalLock(hglobal);
ok(ptr == NULL, "got %p\n", ptr);
/* we still need to flush manually, WriteEndDocument doesn't do that */
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<a><b /></a>");
@@ -1271,35 +1271,35 @@ static void test_WriteComment(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, closeW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<!--a--><b><!--a--><!----><!--- ->-->");
@@ -1318,32 +1318,32 @@ static void test_WriteCData(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, closeW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, close2W);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b>"
@@ -1367,48 +1367,48 @@ static void test_WriteRaw(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteRaw(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, rawW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:<!--a<:-->a<:<a>a</a>");
@@ -1424,7 +1424,7 @@ static void test_writer_state(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* initial state */
check_writer_state(writer, E_UNEXPECTED);
@@ -1433,7 +1433,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1442,7 +1442,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1451,7 +1451,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1460,7 +1460,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1469,7 +1469,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1478,7 +1478,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteName(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1487,7 +1487,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteNmToken(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1496,7 +1496,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteString(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1514,7 +1514,7 @@ static void test_indentation(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
@@ -1522,22 +1522,22 @@ static void test_indentation(void)
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, commentW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -1551,19 +1551,19 @@ static void test_indentation(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -1678,7 +1678,7 @@ static void test_WriteAttributeString(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
@@ -1687,26 +1687,26 @@ static void test_WriteAttributeString(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "e", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local,
attribute_tests[i].uri, attribute_tests[i].value);
todo_wine_if(attribute_tests[i].todo_hr)
- ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr);
+ ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#lx, expected %#lx.\n", i, hr, attribute_tests[i].hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, attribute_tests[i].output_partial, attribute_tests[i].todo_partial, __LINE__);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, attribute_tests[i].output, attribute_tests[i].todo, __LINE__);
IStream_Release(stream);
@@ -1716,41 +1716,41 @@ static void test_WriteAttributeString(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, "p", "a", "outeruri");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "prefix", "local", "uri", "b");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, NULL, "a", NULL, "b");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "p", "attr", NULL, "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = write_attribute_string(writer, "prefix", "local", NULL, "b");
todo_wine
- ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr);
+ ok(hr == WR_E_DUPLICATEATTRIBUTE, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, NULL, "attr2", "outeruri", "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = write_attribute_string(writer, "pr", "attr3", "outeruri", "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_TODO(stream,
"<p:a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" p:attr=\"value\" xmlns:p=\"outeruri\">"
@@ -1763,22 +1763,22 @@ static void test_WriteAttributeString(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "e", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "prefix", "attr", NULL, "value");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<e xmlns:prefix=\"uri\" prefix:attr=\"value\" />");
@@ -1796,7 +1796,7 @@ static void test_WriteFullEndElement(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* standalone element */
stream = writer_set_output(writer);
@@ -1805,19 +1805,19 @@ static void test_WriteFullEndElement(void)
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a></a>");
@@ -1830,22 +1830,22 @@ static void test_WriteFullEndElement(void)
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -1864,7 +1864,7 @@ static void test_WriteCharEntity(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* without indentation */
stream = writer_set_output(writer);
@@ -1872,22 +1872,22 @@ static void test_WriteCharEntity(void)
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCharEntity(writer, 0x100);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>Ā<a /></a>");
@@ -1903,39 +1903,39 @@ static void test_WriteString(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = write_string(writer, "a");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, "");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, "");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, "a");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* WriteString automatically escapes markup characters */
hr = write_string(writer, "<&\">=");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b>a<&\">=");
@@ -1944,22 +1944,22 @@ static void test_WriteString(void)
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b");
hr = write_string(writer, "");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b>");
@@ -1969,43 +1969,43 @@ static void test_WriteString(void)
/* With indentation */
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create a writer, hr %#lx.\n", hr);
stream = writer_set_output(writer);
writer_set_property(writer, XmlWriterProperty_Indent);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_string(writer, "text");
- ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
" <b>text");
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
" <b>text</b>");
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2017,29 +2017,29 @@ static void test_WriteString(void)
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
" <b />");
hr = write_start_element(writer, NULL, "c", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_attribute_string(writer, NULL, "attr", NULL, "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2047,10 +2047,10 @@ static void test_WriteString(void)
" <c attr=\"value\"");
hr = write_string(writer, "text");
- ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2058,10 +2058,10 @@ static void test_WriteString(void)
" <c attr=\"value\">text");
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2069,16 +2069,16 @@ static void test_WriteString(void)
" <c attr=\"value\">text</c>");
hr = write_start_element(writer, NULL, "d", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_string(writer, "");
- ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2087,10 +2087,10 @@ static void test_WriteString(void)
" <d></d>");
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2163,23 +2163,23 @@ static void test_WriteDocType(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Failed to create writer instance, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer instance, hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteDocType(writer, NULL, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteDocType(writer, emptyW, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* Name validation. */
hr = IXmlWriter_WriteDocType(writer, nameW, NULL, NULL, NULL);
- ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#x.\n", hr);
+ ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr);
/* Pubid validation. */
hr = IXmlWriter_WriteDocType(writer, aW, pubidW, NULL, NULL);
- ok(hr == WC_E_PUBLICID, "Unexpected hr %#x.\n", hr);
+ ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
@@ -2189,16 +2189,16 @@ static void test_WriteDocType(void)
hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid,
doctype_tests[i].subset);
- ok(hr == S_OK, "%u: failed to write doctype, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "%u: failed to write doctype, hr %#lx.\n", i, hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream, doctype_tests[i].output);
hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid,
doctype_tests[i].subset);
- ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#x.\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
}
--
2.34.1
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/xmllite/tests/Makefile.in | 1 -
dlls/xmllite/tests/reader.c | 488 +++++++++++------------
dlls/xmllite/tests/writer.c | 694 ++++++++++++++++-----------------
3 files changed, 591 insertions(+), 592 deletions(-)
diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in
index 1548dc50193..6a87e6663aa 100644
--- a/dlls/xmllite/tests/Makefile.in
+++ b/dlls/xmllite/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = xmllite.dll
IMPORTS = xmllite ole32
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index c4e53a5c40c..d0d2373aaf1 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -50,7 +50,7 @@ static IStream *create_stream_on_data(const void *data, unsigned int size)
memcpy(ptr, data, size);
hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(stream != NULL, "Expected non-NULL stream\n");
GlobalUnlock(hglobal);
@@ -209,7 +209,7 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml
stream = create_stream_on_data(xml, strlen(xml));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
- ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
}
@@ -222,9 +222,9 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t
hr = IXmlReader_Read(reader, &type);
if (expected_type == XmlNodeType_None)
- ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr);
+ ok_(__FILE__,line)(hr == S_FALSE, "Read returned %#lx, expected S_FALSE.\n", hr);
else
- ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Read returned %#lx.\n", hr);
ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type);
}
@@ -233,7 +233,7 @@ static void _next_attribute(unsigned line, IXmlReader *reader)
{
HRESULT hr;
hr = IXmlReader_MoveToNextAttribute(reader);
- ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
}
#define move_to_element(a) _move_to_element(__LINE__,a)
@@ -241,7 +241,7 @@ static void _move_to_element(unsigned line, IXmlReader *reader)
{
HRESULT hr;
hr = IXmlReader_MoveToElement(reader);
- ok_(__FILE__,line)(hr == S_OK, "MoveToElement failed: %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
}
static void test_read_state(IXmlReader *reader, XmlReadState expected,
@@ -269,11 +269,11 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected,
static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetValue(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetValue returned %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "value = %s\n", wine_dbgstr_w(str));
return str;
@@ -283,12 +283,12 @@ static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR
static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetLocalName(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetLocalName returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -297,12 +297,12 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR
static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetPrefix(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "prefix = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -311,12 +311,12 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHA
static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const WCHAR *expect)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetNamespaceUri(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "namespace = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -325,12 +325,12 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const W
static const WCHAR *_reader_qname(IXmlReader *reader, const WCHAR *expect, unsigned line)
{
const WCHAR *str = (void*)0xdeadbeef;
- ULONG len = 0xdeadbeef;
+ UINT len = 0xdeadbeef;
HRESULT hr;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr);
- ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len);
ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str));
return str;
}
@@ -343,7 +343,7 @@ static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned l
HRESULT hr;
hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count);
- ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr);
+ ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok_(__FILE__,line)(count == 1, "got %u\n", c);
ok_(__FILE__,line)(c == expected_char, "got %x\n", c);
}
@@ -528,84 +528,84 @@ static void test_reader_create(void)
}
hr = CreateXmlReader(&IID_IStream, (void **)&unk, NULL);
- ok(hr == E_NOINTERFACE, "got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlReader(&IID_IUnknown, (void **)&unk, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(unk, &IID_IXmlReader, (void **)&reader);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)reader, "unexpected interface\n");
IXmlReader_Release(reader);
IUnknown_Release(unk);
hr = CreateXmlReader(&IID_IUnknown, (void **)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IXmlReader_Release(reader);
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE(reader, XmlReadState_Closed);
nodetype = XmlNodeType_Element;
hr = IXmlReader_GetNodeType(reader, &nodetype);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got %d\n", nodetype);
/* crashes on XP, 2k3, works on newer versions */
if (0)
{
hr = IXmlReader_GetNodeType(reader, NULL);
- ok(hr == E_INVALIDARG, "got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
}
resolver = (void*)0xdeadbeef;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(resolver == NULL, "got %p\n", resolver);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR)&testresolver);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
resolver = NULL;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(resolver == &testresolver, "got %p\n", resolver);
IXmlResolver_Release(resolver);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
dtd = 2;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd);
dtd = 2;
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* Null input pointer, releases previous input */
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
/* test input interface selection sequence */
hr = testinput_createinstance((void**)&input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
if (hr == S_OK)
{
input_iids.count = 0;
hr = IXmlReader_SetInput(reader, input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE);
IUnknown_Release(input);
}
@@ -623,71 +623,71 @@ static void test_readerinput(void)
LONG ref;
hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ref = IStream_AddRef(stream);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IStream_Release(stream);
hr = CreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(reader_input, &IID_IStream, (void**)&stream2);
- ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(reader_input, &IID_ISequentialStream, (void**)&stream2);
- ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
/* IXmlReaderInput grabs a stream reference */
ref = IStream_AddRef(stream);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IStream_Release(stream);
/* try ::SetInput() with valid IXmlReaderInput */
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ref = IUnknown_AddRef(reader_input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(reader_input);
hr = IXmlReader_SetInput(reader, reader_input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE(reader, XmlReadState_Initial);
nodetype = XmlNodeType_Element;
hr = IXmlReader_GetNodeType(reader, &nodetype);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got %d\n", nodetype);
/* IXmlReader grabs a IXmlReaderInput reference */
ref = IUnknown_AddRef(reader_input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(reader_input);
ref = IStream_AddRef(stream);
- ok(ref == 4, "Expected 4, got %d\n", ref);
+ ok(ref == 4, "Expected 4, got %ld.\n", ref);
IStream_Release(stream);
/* reset input and check state */
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
IXmlReader_Release(reader);
ref = IStream_AddRef(stream);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IStream_Release(stream);
ref = IUnknown_AddRef(reader_input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(reader_input);
/* IID_IXmlReaderInput */
@@ -696,9 +696,9 @@ static void test_readerinput(void)
Such query will be used only to check if input is really IXmlReaderInput */
obj = (IUnknown*)0xdeadbeef;
hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ref = IUnknown_AddRef(reader_input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(reader_input);
IUnknown_Release(reader_input);
@@ -708,59 +708,59 @@ static void test_readerinput(void)
/* test input interface selection sequence */
input = NULL;
hr = testinput_createinstance((void**)&input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
input_iids.count = 0;
ref = IUnknown_AddRef(input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(input);
hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &reader_input);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, empty_seq, NULL, FALSE);
/* IXmlReaderInput stores stream interface as IUnknown */
ref = IUnknown_AddRef(input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(input);
hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
input_iids.count = 0;
ref = IUnknown_AddRef(reader_input);
- ok(ref == 2, "Expected 2, got %d\n", ref);
+ ok(ref == 2, "Expected 2, got %ld.\n", ref);
IUnknown_Release(reader_input);
ref = IUnknown_AddRef(input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(input);
hr = IXmlReader_SetInput(reader, reader_input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_readerinput, NULL, FALSE);
TEST_READER_STATE(reader, XmlReadState_Closed);
ref = IUnknown_AddRef(input);
- ok(ref == 3, "Expected 3, got %d\n", ref);
+ ok(ref == 3, "Expected 3, got %ld.\n", ref);
IUnknown_Release(input);
ref = IUnknown_AddRef(reader_input);
ok(ref == 3 || broken(ref == 2) /* versions 1.0.x and 1.1.x - XP, Vista */,
- "Expected 3, got %d\n", ref);
+ "Expected 3, got %ld.\n", ref);
IUnknown_Release(reader_input);
/* repeat another time, no check or caching here */
input_iids.count = 0;
hr = IXmlReader_SetInput(reader, reader_input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_readerinput, NULL, FALSE);
/* another reader */
hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader2, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* resolving from IXmlReaderInput to IStream/ISequentialStream is done at
::SetInput() level, each time it's called */
input_iids.count = 0;
hr = IXmlReader_SetInput(reader2, reader_input);
- ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
ok_iids(&input_iids, setinput_readerinput, NULL, FALSE);
IXmlReader_Release(reader2);
@@ -777,11 +777,11 @@ static void test_reader_state(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* invalid arguments */
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* attempt to read on closed reader */
TEST_READER_STATE(reader, XmlReadState_Closed);
@@ -790,7 +790,7 @@ if (0)
{
/* newer versions crash here, probably because no input was set */
hr = IXmlReader_Read(reader, &nodetype);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
}
set_input_string(reader, "xml");
TEST_READER_STATE(reader, XmlReadState_Initial);
@@ -798,7 +798,7 @@ if (0)
nodetype = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &nodetype);
todo_wine
- ok(FAILED(hr), "got %08x\n", hr);
+ ok(FAILED(hr), "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype);
todo_wine
@@ -807,7 +807,7 @@ if (0)
nodetype = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &nodetype);
todo_wine
- ok(FAILED(hr), "got %08x\n", hr);
+ ok(FAILED(hr), "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype);
IXmlReader_Release(reader);
@@ -850,26 +850,26 @@ static void test_read_xmldeclaration(void)
const WCHAR *val;
hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full));
hr = IXmlReader_SetInput(reader, (IUnknown*)stream);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 0, "got %d\n", count);
/* try to move without attributes */
hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
TEST_READER_POSITION(reader, 0, 0);
@@ -890,7 +890,7 @@ static void test_read_xmldeclaration(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
TEST_READER_POSITION2(reader, 1, 7, ~0u, 55);
@@ -899,40 +899,40 @@ static void test_read_xmldeclaration(void)
next_attribute(reader);
next_attribute(reader);
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_POSITION2(reader, 1, 7, ~0u, 55);
hr = IXmlReader_GetAttributeCount(reader, NULL);
- ok(hr == E_INVALIDARG, "got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 3, "Expected 3, got %d\n", count);
for (i = 0; i < count; i++)
{
len = 0;
hr = IXmlReader_GetLocalName(reader, &val, &len);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len);
ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val));
len = 0;
hr = IXmlReader_GetValue(reader, &val, &len);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len);
ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val));
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "got %08x\n", hr);
+ ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "Unexpected hr %#lx.\n", hr);
}
TEST_DEPTH(reader, 1);
@@ -942,7 +942,7 @@ static void test_read_xmldeclaration(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type);
type = XmlNodeType_XmlDeclaration;
@@ -950,7 +950,7 @@ static void test_read_xmldeclaration(void)
/* newer versions return syntax error here cause document is incomplete,
it makes more sense than invalid char error */
todo_wine {
- ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr);
+ ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "got %d\n", type);
}
IStream_Release(stream);
@@ -959,14 +959,14 @@ todo_wine {
stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_XmlDeclaration);
TEST_READER_POSITION2(reader, 1, 3, ~0u, 21);
TEST_READER_STATE(reader, XmlReadState_Interactive);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 1, "expected 1, got %d\n", count);
ret = IXmlReader_IsEmptyElement(reader);
@@ -982,20 +982,20 @@ todo_wine {
type = -1;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
TEST_READER_POSITION2(reader, 1, 7, ~0u, 21);
/* try to move from last attribute */
hr = IXmlReader_MoveToNextAttribute(reader);
- ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_Element);
TEST_READER_POSITION2(reader, 1, 23, ~0u, 40);
TEST_READER_STATE(reader, XmlReadState_Interactive);
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 0, "expected 0, got %d\n", count);
ret = IXmlReader_IsEmptyElement(reader);
@@ -1007,7 +1007,7 @@ todo_wine {
type = -1;
hr = IXmlReader_Read(reader, &type);
todo_wine
- ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr);
+ ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type));
TEST_READER_POSITION(reader, 1, 41);
todo_wine
@@ -1053,7 +1053,7 @@ static void test_read_comment(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, teststr);
@@ -1066,7 +1066,7 @@ static void test_read_comment(void)
if (type == XmlNodeType_Text || type == XmlNodeType_Comment)
{
hr = IXmlReader_GetValue(reader, &value, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*value != 0, "Expected node value\n");
}
i++;
@@ -1079,9 +1079,9 @@ static void test_read_comment(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1092,14 +1092,14 @@ static void test_read_comment(void)
str = NULL;
hr = IXmlReader_GetLocalName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
reader_qname(reader, L"");
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
/* value */
@@ -1134,7 +1134,7 @@ static void test_read_pi(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1145,9 +1145,9 @@ static void test_read_pi(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1160,7 +1160,7 @@ static void test_read_pi(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(test->name), "got %u\n", len);
ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str));
@@ -1230,7 +1230,7 @@ static void test_read_full(void)
int i;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, test->xml);
@@ -1257,10 +1257,10 @@ static void test_read_public_dtd(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse);
- ok(hr == S_OK, "got 0x%8x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, test_public_dtd);
@@ -1268,15 +1268,15 @@ static void test_read_public_dtd(void)
count = 0;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 2, "got %d\n", count);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
reader_name(reader, L"PUBLIC");
@@ -1286,7 +1286,7 @@ static void test_read_public_dtd(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
reader_name(reader, L"SYSTEM");
@@ -1298,7 +1298,7 @@ static void test_read_public_dtd(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine {
ok(len == lstrlenW(dtdnameW), "got %u\n", len);
ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str));
@@ -1320,10 +1320,10 @@ static void test_read_system_dtd(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse);
- ok(hr == S_OK, "got 0x%8x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, test_system_dtd);
@@ -1331,15 +1331,15 @@ static void test_read_system_dtd(void)
count = 0;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 1, "got %d\n", count);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "got %d\n", type);
reader_name(reader, L"SYSTEM");
@@ -1351,7 +1351,7 @@ static void test_read_system_dtd(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine {
ok(len == lstrlenW(dtdnameW), "got %u\n", len);
ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str));
@@ -1397,7 +1397,7 @@ static void test_read_element(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1406,10 +1406,10 @@ static void test_read_element(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX)
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1420,7 +1420,7 @@ static void test_read_element(void)
len = 0;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(test->name), "got %u\n", len);
ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str));
@@ -1444,7 +1444,7 @@ static void test_read_element(void)
depth = 123;
hr = IXmlReader_GetDepth(reader, &depth);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]);
if (type == XmlNodeType_Element || type == XmlNodeType_EndElement)
@@ -1453,7 +1453,7 @@ static void test_read_element(void)
prefix = NULL;
hr = IXmlReader_GetPrefix(reader, &prefix, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(prefix != NULL, "got %p\n", prefix);
if (!*prefix)
@@ -1462,12 +1462,12 @@ static void test_read_element(void)
local = NULL;
hr = IXmlReader_GetLocalName(reader, &local, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(local != NULL, "got %p\n", local);
qname = NULL;
hr = IXmlReader_GetQualifiedName(reader, &qname, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(qname != NULL, "got %p\n", qname);
ok(local == qname, "expected same pointer\n");
@@ -1478,7 +1478,7 @@ static void test_read_element(void)
{
count = 1;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(count == 0, "got %u\n", count);
}
@@ -1486,7 +1486,7 @@ static void test_read_element(void)
{
count = 0;
hr = IXmlReader_GetAttributeCount(reader, &count);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* moving to attributes increases depth */
if (count)
@@ -1496,14 +1496,14 @@ static void test_read_element(void)
reader_value(reader, L"");
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetValue(reader, &value, NULL);
ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value));
depth = 123;
hr = IXmlReader_GetDepth(reader, &depth);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(depth == depths[i] + 1, "%u: got depth %u, expected %u\n", i, depth, depths[i] + 1);
move_to_element(reader);
@@ -1511,7 +1511,7 @@ static void test_read_element(void)
depth = 123;
hr = IXmlReader_GetDepth(reader, &depth);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]);
}
}
@@ -1526,7 +1526,7 @@ static void test_read_element(void)
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr);
+ ok(hr == WC_E_ELEMENTMATCH, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "got %d\n", type);
TEST_READER_STATE(reader, XmlReadState_Error);
@@ -1544,16 +1544,16 @@ static void test_read_pending(void)
int c;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* first read call returns incomplete node, second attempt fails with E_PENDING */
stream_readcall = 0;
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr);
+ ok(hr == S_OK || broken(hr == E_PENDING), "Unexpected hr %#lx.\n", hr);
/* newer versions are happy when it's enough data to detect node type,
older versions keep reading until it fails to read more */
todo_wine
@@ -1564,7 +1564,7 @@ static void test_read_pending(void)
c = stream_readcall;
value = (void*)0xdeadbeef;
hr = IXmlReader_GetValue(reader, &value, NULL);
- ok(hr == E_PENDING, "got 0x%08x\n", hr);
+ ok(hr == E_PENDING, "Unexpected hr %#lx.\n", hr);
ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value);
ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1);
@@ -1581,12 +1581,12 @@ static void test_readvaluechunk(void)
UINT c;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, "<!-- comment1 --><!-- comment2 -->");
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Comment, "type = %u\n", type);
read_value_char(reader, ' ');
@@ -1599,13 +1599,13 @@ static void test_readvaluechunk(void)
c = 0;
b = 0;
hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(c == 0, "got %u\n", c);
ok(b == 0, "got %x\n", b);
c = 0xdeadbeef;
hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!c, "c = %u\n", c);
reader_value(reader, L"omment1 ");
@@ -1615,13 +1615,13 @@ static void test_readvaluechunk(void)
c = 0xdeadbeef;
hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!c, "c = %u\n", c);
c = 0xdeadbeef;
memset(buf, 0xcc, sizeof(buf));
hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(c == 10, "got %u\n", c);
ok(buf[c] == 0xcccc, "buffer overflow\n");
buf[c] = 0;
@@ -1630,7 +1630,7 @@ static void test_readvaluechunk(void)
c = 0xdeadbeef;
memset(buf, 0xcc, sizeof(buf));
hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(!c, "got %u\n", c);
/* portion read as chunk is skipped from resulting node value */
@@ -1640,7 +1640,7 @@ static void test_readvaluechunk(void)
c = 0xdeadbeef;
b = 0xffff;
hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(c == 0, "got %u\n", c);
ok(b == 0xffff, "got %x\n", b);
@@ -1666,7 +1666,7 @@ static void test_read_cdata(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1685,9 +1685,9 @@ static void test_read_cdata(void)
}
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1699,19 +1699,19 @@ static void test_read_cdata(void)
str = NULL;
hr = IXmlReader_GetLocalName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
len = 1;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == 0, "got %u\n", len);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
/* value */
@@ -1740,7 +1740,7 @@ static void test_read_text(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1757,7 +1757,7 @@ static void test_read_text(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
}
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1769,19 +1769,19 @@ static void test_read_text(void)
str = NULL;
hr = IXmlReader_GetLocalName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
len = 1;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == 0, "got %u\n", len);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(*str == 0, "got %s\n", wine_dbgstr_w(str));
/* value */
@@ -1812,7 +1812,7 @@ static void test_isemptyelement(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1823,7 +1823,7 @@ static void test_isemptyelement(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "got %d\n", type);
ret = IXmlReader_IsEmptyElement(reader);
@@ -1867,7 +1867,7 @@ static void test_read_attribute(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
while (test->xml)
{
@@ -1878,9 +1878,9 @@ static void test_read_attribute(void)
hr = IXmlReader_Read(reader, NULL);
if (test->hr_broken)
- ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml);
else
- ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
+ ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml);
if (hr == S_OK)
{
const WCHAR *str;
@@ -1888,19 +1888,19 @@ static void test_read_attribute(void)
type = XmlNodeType_None;
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "Failed to get node type, %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_name(reader, test->name);
len = 1;
str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &str, &len);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(len == lstrlenW(test->name), "got %u\n", len);
ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str));
@@ -1921,23 +1921,23 @@ static void test_reader_properties(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
value = 0;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value);
- ok(hr == S_OK, "GetProperty failed: %08x\n", hr);
- ok(value == 256, "Unexpected default max depth value %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == 256, "Unexpected default max depth value %Id.\n", value);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0);
- ok(hr == S_OK, "SetProperty failed: %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0);
- ok(hr == S_OK, "SetProperty failed: %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
value = 256;
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value);
- ok(hr == S_OK, "GetProperty failed: %08x\n", hr);
- ok(value == 0, "Unexpected max depth value %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == 0, "Unexpected max depth value %Id.\n", value);
IXmlReader_Release(reader);
}
@@ -1960,7 +1960,7 @@ static void test_prefix(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(prefix_tests); i++) {
XmlNodeType type;
@@ -1968,16 +1968,16 @@ static void test_prefix(void)
set_input_string(reader, prefix_tests[i].xml);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "Read() failed, %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type);
reader_prefix(reader, prefix_tests[i].prefix1);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type);
reader_prefix(reader, prefix_tests[i].prefix2);
@@ -1985,7 +1985,7 @@ static void test_prefix(void)
next_attribute(reader);
hr = IXmlReader_GetNodeType(reader, &type);
- ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type);
reader_prefix(reader, prefix_tests[i].prefix3);
@@ -2035,7 +2035,7 @@ static void test_namespaceuri(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(uri_tests); i++) {
unsigned int j = 0;
@@ -2059,13 +2059,13 @@ static void test_namespaceuri(void)
local = NULL;
length = 0;
hr = IXmlReader_GetLocalName(reader, &local, &length);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(local != NULL, "Unexpected NULL local name pointer\n");
qname = NULL;
length2 = 0;
hr = IXmlReader_GetQualifiedName(reader, &qname, &length2);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(qname != NULL, "Unexpected NULL qualified name pointer\n");
if (type == XmlNodeType_Element ||
@@ -2100,28 +2100,28 @@ static void test_read_charref(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, testA);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type);
hr = IXmlReader_GetValue(reader, &value, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value));
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_FALSE, "got %08x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "Unexpected node type %d\n", type);
IXmlReader_Release(reader);
@@ -2154,7 +2154,7 @@ static void test_encoding_detection(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* there's no way to query detected encoding back, so just verify that document is browsable */
@@ -2164,7 +2164,7 @@ static void test_encoding_detection(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type != XmlNodeType_None, "Unexpected node type %d\n", type);
}
@@ -2173,11 +2173,11 @@ static void test_encoding_detection(void)
stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "%u: got %08x\n", i, hr);
+ ok(hr == S_OK, "%u: unexpected hr %#lx.\n", i, hr);
ok(type != XmlNodeType_None, "%u: unexpected node type %d\n", i, type);
IStream_Release(stream);
@@ -2193,8 +2193,8 @@ static void test_eof_state(IXmlReader *reader, BOOL eof)
ok(IXmlReader_IsEOF(reader) == eof, "Unexpected IsEOF() result\n");
hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state);
- ok(hr == S_OK, "GetProperty() failed, %#x\n", hr);
- ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %ld\n", state);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %Id.\n", state);
}
static void test_endoffile(void)
@@ -2204,7 +2204,7 @@ static void test_endoffile(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_eof_state(reader, FALSE);
@@ -2214,46 +2214,46 @@ static void test_endoffile(void)
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected type %d\n", type);
test_eof_state(reader, FALSE);
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_FALSE, "got %#x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "Unexpected type %d\n", type);
test_eof_state(reader, TRUE);
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_eof_state(reader, FALSE);
IXmlReader_Release(reader);
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, "<a/>text");
type = XmlNodeType_None;
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %#x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "Unexpected type %d\n", type);
test_eof_state(reader, FALSE);
type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type);
- ok(hr == WC_E_SYNTAX, "got %#x\n", hr);
+ ok(hr == WC_E_SYNTAX, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_None, "Unexpected type %d\n", type);
test_eof_state(reader, FALSE);
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IXmlReader_Release(reader);
}
@@ -2274,37 +2274,37 @@ static void test_max_element_depth(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, xml);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 1);
TEST_READER_STATE(reader, XmlReadState_Interactive);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH2(reader, 0, 2);
TEST_READER_STATE(reader, XmlReadState_Error);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 10);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH2(reader, 0, 2);
TEST_READER_STATE(reader, XmlReadState_Error);
@@ -2313,34 +2313,34 @@ static void test_max_element_depth(void)
set_input_string(reader, xml);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 0);
hr = IXmlReader_Read(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 1);
hr = IXmlReader_MoveToFirstAttribute(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_DEPTH(reader, 2);
TEST_READER_STATE(reader, XmlReadState_Interactive);
nodetype = 123;
hr = IXmlReader_Read(reader, &nodetype);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype);
nodetype = 123;
hr = IXmlReader_Read(reader, &nodetype);
- ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr);
+ ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr);
ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype);
TEST_DEPTH2(reader, 0, 2);
@@ -2350,7 +2350,7 @@ static void test_max_element_depth(void)
set_input_string(reader, xml);
hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
count = 0;
while (IXmlReader_Read(reader, NULL) == S_OK)
@@ -2370,25 +2370,25 @@ static void test_reader_position(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE(reader, XmlReadState_Closed);
/* position methods with Null args */
hr = IXmlReader_GetLineNumber(reader, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_GetLinePosition(reader, NULL);
- ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
position = 123;
hr = IXmlReader_GetLinePosition(reader, &position);
- ok(hr == S_FALSE, "got %#x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(position == 0, "got %u\n", position);
position = 123;
hr = IXmlReader_GetLineNumber(reader, &position);
- ok(hr == S_FALSE, "got %#x\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
ok(position == 0, "got %u\n", position);
set_input_string(reader, xml);
@@ -2396,7 +2396,7 @@ static void test_reader_position(void)
TEST_READER_STATE(reader, XmlReadState_Initial);
TEST_READER_POSITION(reader, 0, 0);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Element, "got type %d\n", type);
TEST_READER_POSITION2(reader, 1, 2, ~0u, 34);
@@ -2410,17 +2410,17 @@ static void test_reader_position(void)
TEST_READER_POSITION2(reader, 1, 2, ~0u, 34);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_Whitespace, "got type %d\n", type);
TEST_READER_POSITION2(reader, 1, 35, 2, 6);
hr = IXmlReader_Read(reader, &type);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(type == XmlNodeType_EndElement, "got type %d\n", type);
TEST_READER_POSITION2(reader, 2, 3, 2, 6);
hr = IXmlReader_SetInput(reader, NULL);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
TEST_READER_POSITION(reader, 0, 0);
@@ -2434,7 +2434,7 @@ static void test_string_pointers(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, "<elem xmlns=\"myns\">myns<elem2 /></elem>");
@@ -2565,67 +2565,67 @@ static void test_attribute_by_name(void)
HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
- ok(hr == S_OK, "Failed to create reader, hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
set_input_string(reader, xml);
hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL);
- ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_Element);
hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
read_node(reader, XmlNodeType_Element);
hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"myns");
hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value a");
hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value b");
hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL);
- ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"ns uri");
hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value b");
hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value c2");
hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
reader_value(reader, L"value c");
IXmlReader_Release(reader);
diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c
index c69aa42598d..bfcea5d15de 100644
--- a/dlls/xmllite/tests/writer.c
+++ b/dlls/xmllite/tests/writer.c
@@ -41,7 +41,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
ULONG refcount;
IUnknown_AddRef(obj);
refcount = IUnknown_Release(obj);
- ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount);
+ ok_(__FILE__, line)(refcount == ref, "expected refcount %lu, got %lu.\n", ref, refcount);
}
static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line)
@@ -52,10 +52,10 @@ static void check_output_raw(IStream *stream, const void *expected, SIZE_T size,
WCHAR *ptr;
hr = GetHGlobalFromStream(stream, &hglobal);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#lx.\n", hr);
content_size = GlobalSize(hglobal);
- ok_(__FILE__, line)(size == content_size, "Unexpected test output size %ld.\n", content_size);
+ ok_(__FILE__, line)(size == content_size, "Unexpected test output size %Id.\n", content_size);
ptr = GlobalLock(hglobal);
if (size <= content_size)
ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n");
@@ -73,7 +73,7 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l
char *ptr;
hr = GetHGlobalFromStream(stream, &hglobal);
- ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
size = GlobalSize(hglobal);
ptr = GlobalLock(hglobal);
@@ -111,7 +111,7 @@ static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property)
HRESULT hr;
hr = IXmlWriter_SetProperty(writer, property, TRUE);
- ok(hr == S_OK, "Failed to set writer property, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to set writer property, hr %#lx.\n", hr);
}
/* used to test all Write* methods for consistent error state */
@@ -123,67 +123,67 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr)
/* FIXME: add WriteAttributes */
hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteCharEntity(writer, aW[0]);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteChars(writer, aW, 1);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteEntityRef(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteName(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteNmToken(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr);
/* FIXME: add WriteNode */
/* FIXME: add WriteNodeShallow */
hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteRaw(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteRawChars(writer, aW, 1);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
hr = IXmlWriter_WriteString(writer, aW);
- ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr);
+ ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr);
/* FIXME: add WriteSurrogateCharEntity */
/* FIXME: add WriteWhitespace */
@@ -195,10 +195,10 @@ static IStream *writer_set_output(IXmlWriter *writer)
HRESULT hr;
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
return stream;
}
@@ -295,39 +295,39 @@ static void test_writer_create(void)
}
hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL);
- ok(hr == E_NOINTERFACE, "got %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)writer, "unexpected interface pointer\n");
IUnknown_Release(unk);
IXmlWriter_Release(writer);
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* check default properties values */
value = 0;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == TRUE, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == TRUE, "got %Id.\n", value);
value = TRUE;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == FALSE, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == FALSE, "got %Id.\n", value);
value = TRUE;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == FALSE, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == FALSE, "got %Id.\n", value);
value = XmlConformanceLevel_Auto;
hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(value == XmlConformanceLevel_Document, "got %ld\n", value);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(value == XmlConformanceLevel_Document, "got %Id.\n", value);
IXmlWriter_Release(writer);
}
@@ -337,78 +337,78 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output)
HRESULT hr;
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "Failed to set output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to set output, hr %#lx.\n", hr);
/* TODO: WriteAttributes */
hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCharEntity(writer, 0x100);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteChars(writer, aW, 1);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEntityRef(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteName(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteNmToken(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
/* TODO: WriteNode */
/* TODO: WriteNodeShallow */
hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRawChars(writer, aW, 1);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteString(writer, aW);
- ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr);
+ ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
/* TODO: WriteSurrogateCharEntity */
- /* ًُُTODO: WriteWhitespace */
+ /* TODO: WriteWhitespace */
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
}
static void test_writeroutput(void)
@@ -425,15 +425,15 @@ static void test_writeroutput(void)
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, NULL, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
EXPECT_REF(output, 1);
IUnknown_Release(output);
hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
unk = NULL;
hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine
ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output);
EXPECT_REF(output, 2);
@@ -444,14 +444,14 @@ static void test_writeroutput(void)
output = NULL;
hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IUnknown_Release(output);
hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
unk = NULL;
hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(unk != NULL, "got %p\n", unk);
/* releasing 'unk' crashes on native */
IUnknown_Release(output);
@@ -460,27 +460,27 @@ static void test_writeroutput(void)
/* create with us-ascii */
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IUnknown_Release(output);
/* Output with codepage 1200. */
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer, hr %#lx.\n", hr);
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output);
- ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to set writer output, hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "Write failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Write failed, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW));
@@ -489,11 +489,11 @@ static void test_writeroutput(void)
/* Create output with meaningless code page value. */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr);
output = NULL;
hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output);
- ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr);
test_invalid_output_encoding(writer, output);
CHECK_OUTPUT(stream, "");
@@ -503,11 +503,11 @@ static void test_writeroutput(void)
/* Same, with invalid encoding name. */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, dummyW, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_invalid_output_encoding(writer, output);
CHECK_OUTPUT(stream, "");
@@ -532,55 +532,55 @@ static void test_writestartdocument(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* output not set */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
/* nothing written yet */
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, fullprolog);
/* one more time */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
/* now add PI manually, and try to start a document */
stream = writer_set_output(writer);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
/* another attempt to add 'xml' PI */
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
@@ -589,23 +589,23 @@ static void test_writestartdocument(void)
/* create with us-ascii */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
output = NULL;
hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion2);
@@ -620,28 +620,28 @@ static void test_flush(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
g_write_len = 0;
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(g_write_len > 0, "got %d\n", g_write_len);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(g_write_len > 0, "Unexpected length %lu.\n", g_write_len);
g_write_len = 1;
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(g_write_len == 0, "got %d\n", g_write_len);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ ok(g_write_len == 0, "Unexpected length %lu.\n", g_write_len);
/* Release() flushes too */
g_write_len = 1;
IXmlWriter_Release(writer);
- ok(g_write_len == 0, "got %d\n", g_write_len);
+ ok(g_write_len > 0, "Unexpected length %lu.\n", g_write_len);
}
static void test_omitxmldeclaration(void)
@@ -656,20 +656,20 @@ static void test_omitxmldeclaration(void)
char *ptr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = GetHGlobalFromStream(stream, &hglobal);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ptr = GlobalLock(hglobal);
ok(!ptr, "got %p\n", ptr);
@@ -677,7 +677,7 @@ static void test_omitxmldeclaration(void)
/* one more time */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
@@ -685,35 +685,35 @@ static void test_omitxmldeclaration(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, prologversion);
/* another attempt to add 'xml' PI */
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
IXmlWriter_Release(writer);
@@ -735,25 +735,25 @@ static void test_bom(void)
HRESULT hr;
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* BOM is on by default */
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, bomW, sizeof(bomW));
@@ -762,19 +762,19 @@ static void test_bom(void)
/* start with PI */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, piW, sizeof(piW));
@@ -783,19 +783,19 @@ static void test_bom(void)
/* start with element */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, aopenW, sizeof(aopenW));
@@ -804,24 +804,24 @@ static void test_bom(void)
/* WriteElementString */
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output);
- ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, output);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = GetHGlobalFromStream(stream, &hglobal);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_RAW(stream, afullW, sizeof(afullW));
@@ -922,65 +922,65 @@ static void test_WriteStartElement(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<a");
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
IXmlWriter_Release(writer);
/* WriteElementString */
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, "prefix", "a", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "c", NULL, NULL);
- ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "d", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, "", "e", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, "prefix2", "f", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<prefix:a xmlns:prefix=\"uri\">"
@@ -1000,24 +1000,24 @@ static void test_WriteStartElement(void)
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr);
hr = write_start_element(writer, start_element_tests[i].prefix, start_element_tests[i].local,
start_element_tests[i].uri);
- ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr);
if (SUCCEEDED(start_element_tests[i].hr))
{
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, start_element_tests[i].output_partial, start_element_tests[i].todo_partial, __LINE__);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, start_element_tests[i].output, start_element_tests[i].todo, __LINE__);
}
@@ -1072,54 +1072,54 @@ static void test_WriteElementString(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, "value");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "b", NULL, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "b", "uri", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, "prefix", "c", "uri");
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "d", NULL, NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix2", "d", "uri", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "e", "uri", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "f", "uri2", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, NULL, "g", "uri3", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix", "h", NULL, NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "prefix_i", "i", NULL, NULL);
- ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#lx.\n", hr);
hr = write_element_string(writer, "", "j", "uri", NULL);
- ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a><b>value</b><b />"
@@ -1142,24 +1142,24 @@ static void test_WriteElementString(void)
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr);
hr = write_element_string(writer, element_string_tests[i].prefix, element_string_tests[i].local,
element_string_tests[i].uri, element_string_tests[i].value);
- ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr);
if (SUCCEEDED(element_string_tests[i].hr))
{
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__);
}
@@ -1177,24 +1177,24 @@ static void test_WriteEndElement(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<a><b /></a>");
@@ -1213,47 +1213,47 @@ static void test_writeenddocument(void)
char *ptr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
/* WriteEndDocument resets it to initial state */
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = GetHGlobalFromStream(stream, &hglobal);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ptr = GlobalLock(hglobal);
ok(ptr == NULL, "got %p\n", ptr);
/* we still need to flush manually, WriteEndDocument doesn't do that */
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<a><b /></a>");
@@ -1271,35 +1271,35 @@ static void test_WriteComment(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, closeW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<!--a--><b><!--a--><!----><!--- ->-->");
@@ -1318,32 +1318,32 @@ static void test_WriteCData(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, closeW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCData(writer, close2W);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b>"
@@ -1367,48 +1367,48 @@ static void test_WriteRaw(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteRaw(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, rawW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteRaw(writer, rawW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:<!--a<:-->a<:<a>a</a>");
@@ -1424,7 +1424,7 @@ static void test_writer_state(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* initial state */
check_writer_state(writer, E_UNEXPECTED);
@@ -1433,7 +1433,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1442,7 +1442,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1451,7 +1451,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1460,7 +1460,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1469,7 +1469,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteCData(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1478,7 +1478,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteName(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1487,7 +1487,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteNmToken(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1496,7 +1496,7 @@ static void test_writer_state(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteString(writer, aW);
- ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
check_writer_state(writer, WR_E_INVALIDACTION);
IStream_Release(stream);
@@ -1514,7 +1514,7 @@ static void test_indentation(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
@@ -1522,22 +1522,22 @@ static void test_indentation(void)
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteComment(writer, commentW);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -1551,19 +1551,19 @@ static void test_indentation(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -1678,7 +1678,7 @@ static void test_WriteAttributeString(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
@@ -1687,26 +1687,26 @@ static void test_WriteAttributeString(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "e", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local,
attribute_tests[i].uri, attribute_tests[i].value);
todo_wine_if(attribute_tests[i].todo_hr)
- ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr);
+ ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#lx, expected %#lx.\n", i, hr, attribute_tests[i].hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, attribute_tests[i].output_partial, attribute_tests[i].todo_partial, __LINE__);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
check_output(stream, attribute_tests[i].output, attribute_tests[i].todo, __LINE__);
IStream_Release(stream);
@@ -1716,41 +1716,41 @@ static void test_WriteAttributeString(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, "p", "a", "outeruri");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "prefix", "local", "uri", "b");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, NULL, "a", NULL, "b");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "p", "attr", NULL, "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = write_attribute_string(writer, "prefix", "local", NULL, "b");
todo_wine
- ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr);
+ ok(hr == WR_E_DUPLICATEATTRIBUTE, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, NULL, "attr2", "outeruri", "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = write_attribute_string(writer, "pr", "attr3", "outeruri", "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT_TODO(stream,
"<p:a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" p:attr=\"value\" xmlns:p=\"outeruri\">"
@@ -1763,22 +1763,22 @@ static void test_WriteAttributeString(void)
stream = writer_set_output(writer);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "e", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_attribute_string(writer, "prefix", "attr", NULL, "value");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<e xmlns:prefix=\"uri\" prefix:attr=\"value\" />");
@@ -1796,7 +1796,7 @@ static void test_WriteFullEndElement(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* standalone element */
stream = writer_set_output(writer);
@@ -1805,19 +1805,19 @@ static void test_WriteFullEndElement(void)
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a></a>");
@@ -1830,22 +1830,22 @@ static void test_WriteFullEndElement(void)
writer_set_property(writer, XmlWriterProperty_Indent);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -1864,7 +1864,7 @@ static void test_WriteCharEntity(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* without indentation */
stream = writer_set_output(writer);
@@ -1872,22 +1872,22 @@ static void test_WriteCharEntity(void)
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteCharEntity(writer, 0x100);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndDocument(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>Ā<a /></a>");
@@ -1903,39 +1903,39 @@ static void test_WriteString(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
- ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration);
hr = write_string(writer, "a");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, "");
- ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);
+ ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, "");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, "a");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* WriteString automatically escapes markup characters */
hr = write_string(writer, "<&\">=");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b>a<&\">=");
@@ -1944,22 +1944,22 @@ static void test_WriteString(void)
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = write_string(writer, NULL);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b");
hr = write_string(writer, "");
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<b>");
@@ -1969,43 +1969,43 @@ static void test_WriteString(void)
/* With indentation */
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create a writer, hr %#lx.\n", hr);
stream = writer_set_output(writer);
writer_set_property(writer, XmlWriterProperty_Indent);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_string(writer, "text");
- ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
" <b>text");
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
" <b>text</b>");
hr = IXmlWriter_WriteFullEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2017,29 +2017,29 @@ static void test_WriteString(void)
stream = writer_set_output(writer);
hr = write_start_element(writer, NULL, "a", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_start_element(writer, NULL, "b", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
" <b />");
hr = write_start_element(writer, NULL, "c", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_attribute_string(writer, NULL, "attr", NULL, "value");
- ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2047,10 +2047,10 @@ static void test_WriteString(void)
" <c attr=\"value\"");
hr = write_string(writer, "text");
- ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2058,10 +2058,10 @@ static void test_WriteString(void)
" <c attr=\"value\">text");
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2069,16 +2069,16 @@ static void test_WriteString(void)
" <c attr=\"value\">text</c>");
hr = write_start_element(writer, NULL, "d", NULL);
- ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr);
hr = write_string(writer, "");
- ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr);
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2087,10 +2087,10 @@ static void test_WriteString(void)
" <d></d>");
hr = IXmlWriter_WriteEndElement(writer);
- ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream,
"<a>\r\n"
@@ -2163,23 +2163,23 @@ static void test_WriteDocType(void)
HRESULT hr;
hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL);
- ok(hr == S_OK, "Failed to create writer instance, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create writer instance, hr %#lx.\n", hr);
stream = writer_set_output(writer);
hr = IXmlWriter_WriteDocType(writer, NULL, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IXmlWriter_WriteDocType(writer, emptyW, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* Name validation. */
hr = IXmlWriter_WriteDocType(writer, nameW, NULL, NULL, NULL);
- ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#x.\n", hr);
+ ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr);
/* Pubid validation. */
hr = IXmlWriter_WriteDocType(writer, aW, pubidW, NULL, NULL);
- ok(hr == WC_E_PUBLICID, "Unexpected hr %#x.\n", hr);
+ ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
@@ -2189,16 +2189,16 @@ static void test_WriteDocType(void)
hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid,
doctype_tests[i].subset);
- ok(hr == S_OK, "%u: failed to write doctype, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "%u: failed to write doctype, hr %#lx.\n", i, hr);
hr = IXmlWriter_Flush(writer);
- ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
CHECK_OUTPUT(stream, doctype_tests[i].output);
hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid,
doctype_tests[i].subset);
- ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#x.\n", hr);
+ ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
IStream_Release(stream);
}
--
2.34.1
2
1
[PATCH 1/2] dwrite/tests: Add some tests for Segoe UI font family. (Resend)
by Dmitry Timoshkov 07 Feb '22
by Dmitry Timoshkov 07 Feb '22
07 Feb '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/dwrite/tests/layout.c | 139 +++++++++++++++++++++++++++++++++++++
1 file changed, 139 insertions(+)
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 3fe149927ca..c242155cce3 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -6489,6 +6489,144 @@ if (SUCCEEDED(hr))
IDWriteFactory_Release(factory);
}
+#define get_font_name(a, b, c) get_font_name_(a, b, c, __LINE__)
+static void get_font_name_(IDWriteFont *font, WCHAR *name, UINT32 size, int line)
+{
+ HRESULT hr;
+ IDWriteFontFamily *family;
+ IDWriteLocalizedStrings *names;
+ UINT32 index;
+ BOOL exists;
+
+ hr = IDWriteFont_GetFontFamily(font, &family);
+ ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr);
+
+ hr = IDWriteFontFamily_GetFamilyNames(family, &names);
+ ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr);
+
+ hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists);
+ ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr);
+ ok_(__FILE__, line)(index != UINT_MAX && exists, "name was not found\n");
+ hr = IDWriteLocalizedStrings_GetString(names, index, name, size);
+ ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr);
+
+ IDWriteLocalizedStrings_Release(names);
+ IDWriteFontFamily_Release(family);
+}
+
+static void test_SegoeUI(void)
+{
+ static const WCHAR *families[] = { L"Tahoma", L"Segoe UI", NULL };
+ static const WCHAR text[] = { 0x25d4, 0 };
+ HRESULT hr;
+ IDWriteFactory2 *factory;
+ IDWriteFontCollection *collection;
+ IDWriteFontFamily *family;
+ IDWriteFont *font;
+ IDWriteFontFallback *fallback;
+ UINT32 index, count, i, mappedlength;
+ WCHAR name[256];
+ BOOL exists, found;
+ FLOAT scale;
+
+ hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory);
+ if (hr != S_OK)
+ {
+ win_skip("IDWriteFactory2 is not supported\n");
+ return;
+ }
+
+ hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE);
+ ok(hr == S_OK, "got %#x\n", hr);
+
+ hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", &index, &exists);
+ ok(hr == S_OK, "got %#x\n", hr);
+ if (!exists)
+ {
+ skip("Segoe UI is not installed\n");
+ IDWriteFontCollection_Release(collection);
+ IDWriteFactory2_Release(factory);
+ return;
+ }
+ ok(index != UINT_MAX && exists, "Segoe UI was not found\n");
+
+ hr = IDWriteFontCollection_GetFontFamily(collection, index, &family);
+ ok(hr == S_OK, "got %#x\n", hr);
+
+ count = IDWriteFontFamily_GetFontCount(family);
+ trace("family Segoe UI has %u fonts\n", count);
+
+ found = FALSE;
+
+ for (i = 0; i < count; i++)
+ {
+ hr = IDWriteFontFamily_GetFont(family, i, &font);
+ ok(hr == S_OK, "got %#x\n", hr);
+
+ get_font_name(font, name, ARRAY_SIZE(name));
+ if (!wcscmp(name, L"Segoe UI Symbol"))
+ found = TRUE;
+
+ hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists);
+ ok(hr == S_OK, "got %#x\n", hr);
+ ok(!exists, "%u: %s has character 0x25d4\n", i, wine_dbgstr_w(name));
+
+ IDWriteFont_Release(font);
+ }
+
+ ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n");
+
+ IDWriteFontFamily_Release(family);
+
+ hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback);
+ ok(hr == S_OK, "got %#x\n", hr);
+
+ g_source = text;
+
+ hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, L"Segoe UI", DWRITE_FONT_WEIGHT_NORMAL,
+ DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
+ ok(hr == S_OK, "got %#x\n", hr);
+ ok(mappedlength == 1, "got %u\n", mappedlength);
+ ok(scale == 1.0f, "got %f\n", scale);
+
+ get_font_name(font, name, ARRAY_SIZE(name));
+todo_wine
+ ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name));
+
+ hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists);
+ ok(hr == S_OK, "got %#x\n", hr);
+todo_wine
+ ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name));
+
+ IDWriteFont_Release(font);
+
+ for (i = 0; i < ARRAY_SIZE(families); i++)
+ {
+ hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL,
+ DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
+todo_wine_if(families[i] == NULL)
+ ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr);
+ if (hr != S_OK) continue;
+ ok(mappedlength == 1, "got %u\n", mappedlength);
+ ok(scale == 1.0f, "got %f\n", scale);
+
+ get_font_name(font, name, ARRAY_SIZE(name));
+todo_wine
+ ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name));
+
+ hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists);
+ ok(hr == S_OK, "got %#x\n", hr);
+todo_wine
+ ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name));
+
+ IDWriteFont_Release(font);
+ }
+
+ IDWriteFontFallback_Release(fallback);
+ IDWriteFontCollection_Release(collection);
+ IDWriteFactory2_Release(factory);
+}
+
START_TEST(layout)
{
IDWriteFactory *factory;
@@ -6544,6 +6682,7 @@ START_TEST(layout)
test_text_format_axes();
test_layout_range_length();
test_HitTestTextRange();
+ test_SegoeUI();
IDWriteFactory_Release(factory);
}
--
2.34.1
2
7
07 Feb '22
All the notification codes (printed as an id) have negative base value
(SBN_, UDN_, HDN_, BCN_, TBN_, TTN_, RBN_, TRBN_, PGN_, TVN_, LVN_, TCN_,
CBEN_, IPN_, MCN_, DTN_), and printing them as decimal helps to quickly
identify the corresponding notification value in cases when an id in
the message sequence doesn't match. Custom ids in the message sequences
have small numbers (0, 1, 2, ...), so they also get printed correctly.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/comctl32/tests/msg.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h
index 7337c724a5c..8ba2efddb0a 100644
--- a/dlls/comctl32/tests/msg.h
+++ b/dlls/comctl32/tests/msg.h
@@ -261,14 +261,14 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
failcount++;
dump++;
ok_(file, line) (FALSE,
- "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n",
+ "%s: in msg 0x%04x expecting id %d got %d\n",
context, expected->message, expected->id, actual->id);
}
}
else
{
ok_(file, line) (expected->id == actual->id,
- "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n",
+ "%s: in msg 0x%04x expecting id %d got %d\n",
context, expected->message, expected->id, actual->id);
if (expected->id != actual->id) dump++;
}
--
2.34.1
2
3
The test gets spurious GetScrollInfo SB_HORZ failures if some other
windows were created before using CW_USEDEFAULT positions, for instance
the window from test_capture_4.
This happened on some Win10 VMs, and was thought to be fixed with
9b5346df86bf1a85336ed03a67a630970ce08e9f, but it then broke the test on
some other VMs. This is hopefully a better fix, and it reverts the
previous one too.
Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52507
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/user32/tests/win.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 8ec6d8af064..8614a048c4d 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -2256,7 +2256,7 @@ static void test_mdi(void)
mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window",
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX |
WS_MAXIMIZEBOX /*| WS_VISIBLE*/,
- 200, 100, CW_USEDEFAULT, CW_USEDEFAULT,
+ 100, 100, CW_USEDEFAULT, CW_USEDEFAULT,
GetDesktopWindow(), 0,
GetModuleHandleA(NULL), NULL);
assert(mdi_hwndMain);
@@ -12644,6 +12644,10 @@ START_TEST(win)
our_pid = GetWindowThreadProcessId(hwndMain, NULL);
+ /* This test is sensitive to other windows created with
+ * CW_USEDEFAULT position, execute it early too */
+ test_mdi();
+
/* Add the tests below this line */
test_child_window_from_point();
test_window_from_point(argv[0]);
@@ -12665,7 +12669,6 @@ START_TEST(win)
test_parent_owner();
test_enum_thread_windows();
- test_mdi();
test_icons();
test_SetWindowPos(hwndMain, hwndMain2);
test_SetMenu(hwndMain);
--
2.34.1
2
1
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/rtworkq/tests/Makefile.in | 1 -
dlls/rtworkq/tests/rtworkq.c | 32 ++++++++++++++++----------------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in
index 7a2f6db51c7..8354cd810d1 100644
--- a/dlls/rtworkq/tests/Makefile.in
+++ b/dlls/rtworkq/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = rtworkq.dll
IMPORTS = rtworkq ole32
diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c
index 627e024d761..2ff74d57b84 100644
--- a/dlls/rtworkq/tests/rtworkq.c
+++ b/dlls/rtworkq/tests/rtworkq.c
@@ -33,72 +33,72 @@ static void test_platform_init(void)
/* Startup initializes MTA. */
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr);
+ ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr);
hr = RtwqStartup();
- ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr);
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier);
hr = RtwqShutdown();
- ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr);
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr);
+ ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr);
/* Try with STA initialized before startup. */
hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
- ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr);
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE,
"Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier);
hr = RtwqStartup();
- ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr);
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE,
"Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier);
hr = RtwqShutdown();
- ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr);
CoUninitialize();
/* Startup -> init main STA -> uninitialize -> shutdown */
hr = RtwqStartup();
- ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr);
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier);
hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
- ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr);
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE,
"Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier);
CoUninitialize();
hr = CoGetApartmentType(&apttype, &qualifier);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier);
hr = RtwqShutdown();
- ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr);
}
START_TEST(rtworkq)
--
2.34.1
1
0
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/dinput/tests/Makefile.in | 1 -
dlls/dinput/tests/dinput.c | 1110 ++++++++++++++++++++++-----------
dlls/dinput/tests/dinput8.c | 728 ---------------------
3 files changed, 730 insertions(+), 1109 deletions(-)
delete mode 100644 dlls/dinput/tests/dinput8.c
diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in
index 00295fed60f..b34afde882a 100644
--- a/dlls/dinput/tests/Makefile.in
+++ b/dlls/dinput/tests/Makefile.in
@@ -9,7 +9,6 @@ SOURCES = \
device.c \
device8.c \
dinput.c \
- dinput8.c \
driver_hid.c \
driver_hid.spec \
force_feedback.c \
diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 10da888fdd4..795a9ed39c6 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -30,37 +30,53 @@
HINSTANCE hInstance;
-enum directinput_versions
-{
- DIRECTINPUT_VERSION_300 = 0x0300,
- DIRECTINPUT_VERSION_500 = 0x0500,
- DIRECTINPUT_VERSION_50A = 0x050A,
- DIRECTINPUT_VERSION_5B2 = 0x05B2,
- DIRECTINPUT_VERSION_602 = 0x0602,
- DIRECTINPUT_VERSION_61A = 0x061A,
- DIRECTINPUT_VERSION_700 = 0x0700,
-};
-
-static const DWORD directinput_version_list[] =
-{
- DIRECTINPUT_VERSION_300,
- DIRECTINPUT_VERSION_500,
- DIRECTINPUT_VERSION_50A,
- DIRECTINPUT_VERSION_5B2,
- DIRECTINPUT_VERSION_602,
- DIRECTINPUT_VERSION_61A,
- DIRECTINPUT_VERSION_700,
-};
-
static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN);
+static const DWORD dinput_versions[] =
+{
+ 0x0300,
+ 0x0500,
+ 0x050A,
+ 0x05B2,
+ 0x0602,
+ 0x061A,
+ 0x0700,
+ 0x0800,
+};
+
+static REFIID dinput7_interfaces[] =
+{
+ &IID_IDirectInputA,
+ &IID_IDirectInputW,
+ &IID_IDirectInput2A,
+ &IID_IDirectInput2W,
+ &IID_IDirectInput7A,
+ &IID_IDirectInput7W,
+};
+
+static REFIID dinput8_interfaces[] =
+{
+ &IID_IDirectInput8A,
+ &IID_IDirectInput8W,
+ &IID_IDirectInputJoyConfig8,
+};
+
+static HRESULT direct_input_create( DWORD version, IDirectInputA **out )
+{
+ HRESULT hr;
+ if (version < 0x800) hr = DirectInputCreateA( hInstance, version, out, NULL );
+ else hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8A, (void **)out, NULL );
+ if (FAILED(hr)) win_skip( "Failed to instantiate a IDirectInput instance, hr %#x\n", hr );
+ return hr;
+}
+
static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
{
ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context);
return DIENUM_STOP;
}
-static void test_preinitialization(void)
+static void test_CoCreateInstance( DWORD version )
{
static const struct
{
@@ -83,7 +99,6 @@ static void test_preinitialization(void)
LPDIENUMDEVICESCALLBACKA lpCallback;
DWORD dwFlags;
HRESULT expected_hr;
- int todo;
} enum_devices_tests[] =
{
{0, NULL, 0, DIERR_INVALIDPARAM},
@@ -96,122 +111,159 @@ static void test_preinitialization(void)
{0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM},
};
- IDirectInputA *pDI;
+ IDirectInputDeviceA *device;
+ IDirectInputA *dinput;
HRESULT hr;
+ LONG ref;
int i;
- IDirectInputDeviceA *pDID;
- hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI);
+ if (version < 0x800) hr = CoCreateInstance( &CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IDirectInputA, (void **)&dinput );
+ else hr = CoCreateInstance( &CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IDirectInput8A, (void **)&dinput );
if (FAILED(hr))
{
- skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
+ win_skip( "Failed to instantiate a IDirectInput instance, hr %#x\n", hr );
return;
}
for (i = 0; i < ARRAY_SIZE(create_device_tests); i++)
{
- if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef;
- hr = IDirectInput_CreateDevice(pDI, create_device_tests[i].rguid,
- create_device_tests[i].pdev ? &pDID : NULL,
- NULL);
- ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput_CreateDevice returned 0x%08x\n", i, hr);
- if (create_device_tests[i].pdev)
- ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID);
+ winetest_push_context( "%u", i );
+ if (create_device_tests[i].pdev) device = (void *)0xdeadbeef;
+ hr = IDirectInput_CreateDevice( dinput, create_device_tests[i].rguid,
+ create_device_tests[i].pdev ? &device : NULL, NULL );
+ ok( hr == create_device_tests[i].expected_hr, "CreateDevice returned %#x\n", hr );
+ if (create_device_tests[i].pdev) ok( device == NULL, "got device %p\n", device );
+ winetest_pop_context();
}
for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++)
{
- hr = IDirectInput_EnumDevices(pDI, enum_devices_tests[i].dwDevType,
- enum_devices_tests[i].lpCallback,
- NULL,
- enum_devices_tests[i].dwFlags);
- todo_wine_if(enum_devices_tests[i].todo)
- ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr);
+ winetest_push_context( "%u", i );
+ hr = IDirectInput_EnumDevices( dinput, enum_devices_tests[i].dwDevType,
+ enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags );
+ ok( hr == enum_devices_tests[i].expected_hr, "EnumDevice returned %#x\n", hr );
+ winetest_pop_context();
}
- hr = IDirectInput_GetDeviceStatus(pDI, NULL);
- ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+ hr = IDirectInput_GetDeviceStatus( dinput, NULL );
+ ok( hr == E_POINTER, "GetDeviceStatus returned %#x\n", hr );
- hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+ hr = IDirectInput_GetDeviceStatus( dinput, &GUID_Unknown );
+ ok( hr == DIERR_NOTINITIALIZED, "GetDeviceStatus returned %#x\n", hr );
- hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+ hr = IDirectInput_GetDeviceStatus( dinput, &GUID_SysMouse );
+ ok( hr == DIERR_NOTINITIALIZED, "GetDeviceStatus returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, NULL, 0);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, NULL, 0 );
+ ok( hr == DIERR_NOTINITIALIZED, "RunControlPanel returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, NULL, ~0u );
+ ok( hr == DIERR_INVALIDPARAM, "RunControlPanel returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
- ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, 0 );
+ ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
- ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, ~0u );
+ ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
- IDirectInput_Release(pDI);
+ ref = IDirectInput_Release( dinput );
+ ok( ref == 0, "Release returned %d\n", ref );
}
-static void test_DirectInputCreateEx(void)
+static void test_DirectInputCreate( DWORD version )
{
- static const struct
+ IUnknown *unknown;
+ struct
{
- BOOL hinst;
- DWORD dwVersion;
- REFIID riid;
- BOOL ppdi;
+ HMODULE instance;
+ DWORD version;
+ REFIID iid;
+ IUnknown **out;
+ IUnknown *expect_out;
HRESULT expected_hr;
- IUnknown *expected_ppdi;
- } invalid_param_list[] =
+ } create_tests[] =
{
- {FALSE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {FALSE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {FALSE, 0, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, 0, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL},
- {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL},
- {TRUE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {TRUE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {TRUE, 0, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, 0, &IID_IDirectInputA, TRUE, DIERR_NOTINITIALIZED, NULL},
- {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_BETADIRECTINPUTVERSION, NULL},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_OLDDIRECTINPUTVERSION, NULL},
+ {NULL, 0, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, 0, NULL, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version, NULL, &unknown, NULL, version == 0x300 ? DI_OK : DIERR_INVALIDPARAM},
+ {NULL, version - 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version - 1, NULL, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version + 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version + 1, NULL, &unknown, NULL, DIERR_INVALIDPARAM},
+ {hInstance, 0, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, 0, NULL, &unknown, NULL, DIERR_NOTINITIALIZED},
+ {hInstance, version, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, NULL, &unknown, NULL, version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
+ {hInstance, version + 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version + 1, NULL, &unknown, NULL, version < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
};
-
- static REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A,
- &IID_IDirectInput8W, &IID_IDirectInputDeviceA,
- &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A,
- &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A,
- &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A,
- &IID_IDirectInputDevice8W, &IID_IDirectInputEffect};
-
- static REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
- &IID_IDirectInput2A, &IID_IDirectInput2W,
- &IID_IDirectInput7A, &IID_IDirectInput7W};
-
- int i, j;
- IUnknown *pUnk;
HRESULT hr;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(create_tests); i++)
+ {
+ winetest_push_context( "%u", i );
+ unknown = (void *)0xdeadbeef;
+ hr = DirectInputCreateW( create_tests[i].instance, create_tests[i].version, (IDirectInputW **)create_tests[i].out, NULL );
+ todo_wine_if(i == 3 && version == 0x300)
+ ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#x\n", hr );
+ if (SUCCEEDED(hr)) IUnknown_Release( unknown );
+ else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown );
+ winetest_pop_context();
+ }
+}
+
+static void test_DirectInputCreateEx( DWORD version )
+{
+ IUnknown *unknown;
+ struct
+ {
+ HMODULE instance;
+ DWORD version;
+ REFIID iid;
+ IUnknown **out;
+ IUnknown *expect_out;
+ HRESULT expected_hr;
+ } create_tests[] =
+ {
+ {NULL, 0, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, 0, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, version, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version, &IID_IDirectInputA, &unknown, NULL, version == 0x300 ? DI_OK : DIERR_INVALIDPARAM},
+ {NULL, version - 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, version - 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version - 1, &IID_IDirectInputA, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version + 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, version + 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {NULL, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version + 1, &IID_IDirectInputA, &unknown, NULL, DIERR_INVALIDPARAM},
+ {hInstance, 0, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, 0, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_NOTINITIALIZED},
+ {hInstance, version, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, version, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, version - 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, &IID_IDirectInputA, &unknown, NULL, version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
+ {hInstance, version + 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, version + 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+ {hInstance, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version + 1, &IID_IDirectInputA, &unknown, NULL, version < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
+ };
+ HRESULT hr;
+ int i;
if (!pDirectInputCreateEx)
{
@@ -219,391 +271,485 @@ static void test_DirectInputCreateEx(void)
return;
}
- for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++)
+ for (i = 0; i < ARRAY_SIZE(create_tests); i++)
{
- if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef;
- hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL,
- invalid_param_list[i].dwVersion,
- invalid_param_list[i].riid,
- invalid_param_list[i].ppdi ? (void **)&pUnk : NULL,
- NULL);
- ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr);
- if (invalid_param_list[i].ppdi)
- ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk);
+ winetest_push_context( "%u", i );
+ unknown = (void *)0xdeadbeef;
+ hr = pDirectInputCreateEx( create_tests[i].instance, create_tests[i].version, create_tests[i].iid,
+ (void **)create_tests[i].out, NULL );
+ todo_wine_if( version == 0x300 && i == 7 )
+ ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#x\n", hr );
+ if (SUCCEEDED(hr)) IUnknown_Release( unknown );
+ else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown );
+ winetest_pop_context();
}
- for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
+ for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++)
{
- pUnk = (void *)0xdeadbeef;
- hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL);
- ok(hr == DIERR_NOINTERFACE, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr);
- ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk);
+ winetest_push_context( "%u", i );
+ unknown = (void *)0xdeadbeef;
+ hr = pDirectInputCreateEx( hInstance, version, dinput8_interfaces[i], (void **)&unknown, NULL );
+ ok( hr == DIERR_NOINTERFACE, "DirectInputCreateEx returned %#x\n", hr );
+ ok( unknown == (void *)0xdeadbeef, "got IUnknown %p\n", unknown );
+ winetest_pop_context();
}
- for (i = 0; i < ARRAY_SIZE(iid_list); i++)
+ for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++)
{
- pUnk = NULL;
- hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL);
- ok(hr == DI_OK, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr);
- ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
- if (pUnk)
- IUnknown_Release(pUnk);
- }
-
- /* Examine combinations of requested interfaces and version numbers. */
- for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++)
- {
- for (j = 0; j < ARRAY_SIZE(iid_list); j++)
- {
- pUnk = NULL;
- hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL);
- ok(hr == DI_OK, "[%d/%d] DirectInputCreateEx returned 0x%08x\n", i, j, hr);
- ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
- if (pUnk)
- IUnknown_Release(pUnk);
- }
+ winetest_push_context( "%u", i );
+ unknown = NULL;
+ hr = pDirectInputCreateEx( hInstance, version, dinput7_interfaces[i], (void **)&unknown, NULL );
+ if (version < 0x800) ok( hr == DI_OK, "DirectInputCreateEx returned %#x\n", hr );
+ else ok( hr == DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreateEx returned %#x\n", hr );
+ if (version < 0x800) ok( unknown != NULL, "got IUnknown NULL\n" );
+ else ok( unknown == NULL, "got IUnknown %p\n", unknown );
+ if (unknown) IUnknown_Release( unknown );
+ winetest_pop_context();
}
}
-static void test_QueryInterface(void)
+static void test_DirectInput8Create( DWORD version )
{
- static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW,
- &IID_IDirectInput2A, &IID_IDirectInput2W,
- &IID_IDirectInput7A, &IID_IDirectInput7W};
-
- static REFIID no_interface_list[] =
+ IUnknown *unknown;
+ struct
{
- &IID_IDirectInput8A,
- &IID_IDirectInput8W,
- &IID_IDirectInputDeviceA,
- &IID_IDirectInputDeviceW,
- &IID_IDirectInputDevice2A,
- &IID_IDirectInputDevice2W,
- &IID_IDirectInputDevice7A,
- &IID_IDirectInputDevice7W,
- &IID_IDirectInputDevice8A,
- &IID_IDirectInputDevice8W,
- &IID_IDirectInputEffect,
+ HMODULE instance;
+ DWORD version;
+ REFIID iid;
+ IUnknown **out;
+ IUnknown *expect_out;
+ HRESULT expected_hr;
+ } create_tests[] =
+ {
+ {NULL, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {NULL, 0, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, 0, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {NULL, version, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version - 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {NULL, version - 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version - 1, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM},
+ {NULL, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version + 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {NULL, version + 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {NULL, version + 1, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM},
+ {hInstance, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {hInstance, 0, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, 0, &IID_IDirectInput8A, &unknown, NULL, DIERR_NOTINITIALIZED},
+ {hInstance, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {hInstance, version, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {hInstance, version - 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version - 1, &IID_IDirectInput8A, &unknown, NULL, DIERR_BETADIRECTINPUTVERSION},
+ {hInstance, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version + 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE},
+ {hInstance, version + 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER},
+ {hInstance, version + 1, &IID_IDirectInput8A, &unknown, NULL, version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
};
-
- IDirectInputA *pDI;
HRESULT hr;
- IUnknown *pUnk, *iface, *tmp_iface;
int i;
- hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
- if (FAILED(hr))
+ for (i = 0; i < ARRAY_SIZE(create_tests); i++)
{
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
+ winetest_push_context( "%u", i );
+ unknown = (void *)0xdeadbeef;
+ hr = DirectInput8Create( create_tests[i].instance, create_tests[i].version, create_tests[i].iid,
+ (void **)create_tests[i].out, NULL );
+ ok( hr == create_tests[i].expected_hr, "DirectInput8Create returned %#x\n", hr );
+ if (SUCCEEDED(hr)) IUnknown_Release( unknown );
+ else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown );
+ winetest_pop_context();
}
- hr = IDirectInput_QueryInterface(pDI, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr);
-
- pUnk = (void *)0xdeadbeef;
- hr = IDirectInput_QueryInterface(pDI, NULL, (void **)&pUnk);
- ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr);
- ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk);
-
- hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL);
- ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr);
-
- for (i = 0; i < ARRAY_SIZE(iid_list); i++)
+ for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++)
{
- pUnk = NULL;
- hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk);
- ok(hr == S_OK, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr);
- ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
- if (pUnk) IUnknown_Release(pUnk);
+ winetest_push_context( "%u", i );
+ unknown = (void *)0xdeadbeef;
+ hr = DirectInput8Create( hInstance, version, dinput7_interfaces[i], (void **)&unknown, NULL );
+ ok( hr == DIERR_NOINTERFACE, "DirectInput8Create returned %#x\n", hr );
+ ok( unknown == NULL, "got IUnknown %p\n", unknown );
+ winetest_pop_context();
}
- for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
+ for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++)
{
- pUnk = (void *)0xdeadbeef;
- hr = IDirectInput_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk);
- ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr);
- ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
+ winetest_push_context( "%u", i );
+ unknown = NULL;
+ hr = DirectInput8Create( hInstance, version, dinput8_interfaces[i], (void **)&unknown, NULL );
+ if (i == 2) ok( hr == DIERR_NOINTERFACE, "DirectInput8Create returned %#x\n", hr );
+ else if (version == 0x800) ok( hr == DI_OK, "DirectInput8Create returned %#x\n", hr );
+ else ok( hr == DIERR_BETADIRECTINPUTVERSION, "DirectInput8Create returned %#x\n", hr );
+ if (i == 2) ok( unknown == NULL, "got IUnknown %p\n", unknown );
+ else if (version == 0x800) ok( unknown != NULL, "got NULL IUnknown\n" );
+ else ok( unknown == NULL, "got IUnknown %p\n", unknown );
+ if (unknown) IUnknown_Release( unknown );
+ winetest_pop_context();
}
-
- hr = IUnknown_QueryInterface( pDI, &IID_IDirectInputA, (void **)&iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputA) failed: %08x\n", hr );
- hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput2A, (void **)&tmp_iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2A) failed: %08x\n", hr );
- ok( tmp_iface == iface, "IID_IDirectInput2A iface differs from IID_IDirectInputA\n" );
- IUnknown_Release( tmp_iface );
- hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput7A, (void **)&tmp_iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7A) failed: %08x\n", hr );
- ok( tmp_iface == iface, "IID_IDirectInput7A iface differs from IID_IDirectInputA\n" );
- IUnknown_Release( tmp_iface );
- IUnknown_Release( iface );
-
- hr = IUnknown_QueryInterface( pDI, &IID_IUnknown, (void **)&iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IUnknown) failed: %08x\n", hr );
- hr = IUnknown_QueryInterface( pDI, &IID_IDirectInputW, (void **)&tmp_iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputW) failed: %08x\n", hr );
- ok( tmp_iface == iface, "IID_IDirectInputW iface differs from IID_IUnknown\n" );
- IUnknown_Release( tmp_iface );
- hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput2W, (void **)&tmp_iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2W) failed: %08x\n", hr );
- ok( tmp_iface == iface, "IID_IDirectInput2W iface differs from IID_IUnknown\n" );
- IUnknown_Release( tmp_iface );
- hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput7W, (void **)&tmp_iface );
- ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7W) failed: %08x\n", hr );
- ok( tmp_iface == iface, "IID_IDirectInput7W iface differs from IID_IUnknown\n" );
- IUnknown_Release( tmp_iface );
- IUnknown_Release( iface );
-
- IDirectInput_Release(pDI);
}
-static void test_CreateDevice(void)
+static void test_QueryInterface( DWORD version )
{
- IDirectInputA *pDI;
+ IUnknown *iface, *tmp_iface;
+ IDirectInputA *dinput;
HRESULT hr;
- IDirectInputDeviceA *pDID;
+ ULONG ref;
+ int i;
- hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
- if (FAILED(hr))
+ if (FAILED(hr = direct_input_create( version, &dinput ))) return;
+
+ hr = IDirectInput_QueryInterface( dinput, NULL, NULL );
+ ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr );
+
+ iface = (void *)0xdeadbeef;
+ hr = IDirectInput_QueryInterface( dinput, NULL, (void **)&iface );
+ ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr );
+ ok( iface == (void *)0xdeadbeef, "Output interface pointer is %p\n", iface );
+
+ hr = IDirectInput_QueryInterface( dinput, &IID_IUnknown, NULL );
+ ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr );
+
+ hr = IDirectInput_QueryInterface( dinput, &IID_IUnknown, (void **)&iface );
+ ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr );
+ ok( iface != NULL, "got iface NULL\n" );
+ ref = IUnknown_Release( iface );
+ ok( ref == 1, "Release returned %u\n", ref );
+
+ for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++)
{
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
+ winetest_push_context("%u", i);
+ iface = (void *)0xdeadbeef;
+ hr = IDirectInput_QueryInterface( dinput, dinput7_interfaces[i], (void **)&iface );
+ if (version >= 0x800)
+ {
+ ok( hr == E_NOINTERFACE, "QueryInterface returned 0x%08x\n", hr );
+ ok( iface == NULL, "got iface %p\n", iface );
+ }
+ else
+ {
+ ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr );
+ ok( iface != NULL, "got iface NULL\n" );
+ ref = IUnknown_Release( iface );
+ ok( ref == 1, "Release returned %u\n", ref );
+ }
+ winetest_pop_context();
}
- hr = IDirectInput_CreateDevice(pDI, NULL, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+ for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++)
+ {
+ winetest_push_context("%u", i);
+ iface = (void *)0xdeadbeef;
+ hr = IDirectInput_QueryInterface( dinput, dinput8_interfaces[i], (void **)&iface );
+ if (version < 0x800)
+ {
+ todo_wine_if(i == 2)
+ ok( hr == E_NOINTERFACE, "QueryInterface returned 0x%08x\n", hr );
+ todo_wine_if(i == 2)
+ ok( iface == NULL, "got iface %p\n", iface );
+ }
+ else
+ {
+ ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr );
+ ok( iface != NULL, "got iface NULL\n" );
+ ref = IUnknown_Release( iface );
+ ok( ref == 1, "Release returned %u\n", ref );
+ }
+ winetest_pop_context();
+ }
- pDID = (void *)0xdeadbeef;
- hr = IDirectInput_CreateDevice(pDI, NULL, &pDID, NULL);
- ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
- ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
+ if (version < 0x800)
+ {
+ hr = IUnknown_QueryInterface( dinput, &IID_IDirectInputA, (void **)&iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputA) failed: %08x\n", hr );
+ hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput2A, (void **)&tmp_iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2A) failed: %08x\n", hr );
+ ok( tmp_iface == iface, "IID_IDirectInput2A iface differs from IID_IDirectInputA\n" );
+ IUnknown_Release( tmp_iface );
+ hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput7A, (void **)&tmp_iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7A) failed: %08x\n", hr );
+ ok( tmp_iface == iface, "IID_IDirectInput7A iface differs from IID_IDirectInputA\n" );
+ IUnknown_Release( tmp_iface );
+ IUnknown_Release( iface );
- hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+ hr = IUnknown_QueryInterface( dinput, &IID_IUnknown, (void **)&iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IUnknown) failed: %08x\n", hr );
+ hr = IUnknown_QueryInterface( dinput, &IID_IDirectInputW, (void **)&tmp_iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputW) failed: %08x\n", hr );
+ ok( tmp_iface == iface, "IID_IDirectInputW iface differs from IID_IUnknown\n" );
+ IUnknown_Release( tmp_iface );
+ hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput2W, (void **)&tmp_iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2W) failed: %08x\n", hr );
+ ok( tmp_iface == iface, "IID_IDirectInput2W iface differs from IID_IUnknown\n" );
+ IUnknown_Release( tmp_iface );
+ hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput7W, (void **)&tmp_iface );
+ ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7W) failed: %08x\n", hr );
+ ok( tmp_iface == iface, "IID_IDirectInput7W iface differs from IID_IUnknown\n" );
+ IUnknown_Release( tmp_iface );
+ IUnknown_Release( iface );
+ }
- pDID = (void *)0xdeadbeef;
- hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL);
- ok(hr == DIERR_DEVICENOTREG, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
- ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
+ ref = IDirectInput_Release( dinput );
+ todo_wine_if( version < 0x800 )
+ ok( ref == 0, "Release returned %u\n", ref );
+}
- hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+static void test_CreateDevice( DWORD version )
+{
+ IDirectInputDeviceA *device;
+ IDirectInputA *dinput;
+ HRESULT hr;
+ ULONG ref;
- hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL);
- ok(hr == DI_OK, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+ if (FAILED(hr = direct_input_create( version, &dinput ))) return;
- IDirectInputDevice_Release(pDID);
- IDirectInput_Release(pDI);
+ hr = IDirectInput_CreateDevice( dinput, NULL, NULL, NULL );
+ ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+
+ device = (void *)0xdeadbeef;
+ hr = IDirectInput_CreateDevice( dinput, NULL, &device, NULL );
+ ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+ ok( device == NULL, "Output interface pointer is %p\n", device );
+
+ hr = IDirectInput_CreateDevice( dinput, &GUID_Unknown, NULL, NULL );
+ ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+
+ device = (void *)0xdeadbeef;
+ hr = IDirectInput_CreateDevice( dinput, &GUID_Unknown, &device, NULL );
+ ok( hr == DIERR_DEVICENOTREG, "CreateDevice returned 0x%08x\n", hr );
+ ok( device == NULL, "Output interface pointer is %p\n", device );
+
+ hr = IDirectInput_CreateDevice( dinput, &GUID_SysMouse, NULL, NULL );
+ ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+
+ hr = IDirectInput_CreateDevice( dinput, &GUID_SysMouse, &device, NULL );
+ ok( hr == DI_OK, "CreateDevice returned 0x%08x\n", hr );
+
+ ref = IDirectInputDevice_Release( device );
+ ok( ref == 0, "Release returned %u\n", ref );
+ ref = IDirectInput_Release( dinput );
+ ok( ref == 0, "Release returned %u\n", ref );
}
struct enum_devices_test
{
unsigned int device_count;
BOOL return_value;
+ DWORD version;
};
+DEFINE_GUID( pidvid_product_guid, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D' );
+
static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context)
{
+ BYTE type = GET_DIDEVICE_TYPE( instance->dwDevType );
struct enum_devices_test *enum_test = context;
- if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD ||
- (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) {
- const char *device = ((instance->dwDevType & 0xff) ==
- DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
- ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct),
- "%s guidInstance (%s) does not match guidProduct (%s)\n",
- device, wine_dbgstr_guid(&instance->guidInstance),
- wine_dbgstr_guid(&instance->guidProduct));
+ if (winetest_debug > 1)
+ {
+ trace( "---- Device Information ----\n"
+ "Product Name : %s\n"
+ "Instance Name : %s\n"
+ "devType : 0x%08x\n"
+ "GUID Product : %s\n"
+ "GUID Instance : %s\n"
+ "HID Page : 0x%04x\n"
+ "HID Usage : 0x%04x\n",
+ instance->tszProductName, instance->tszInstanceName, instance->dwDevType,
+ wine_dbgstr_guid( &instance->guidProduct ),
+ wine_dbgstr_guid( &instance->guidInstance ), instance->wUsagePage, instance->wUsage );
}
- if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD)
- ok(IsEqualGUID(&instance->guidProduct, &GUID_SysKeyboard),
- "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n",
- wine_dbgstr_guid(&instance->guidProduct),
- wine_dbgstr_guid(&GUID_SysMouse));
- else if ((instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE)
- ok(IsEqualGUID(&instance->guidProduct, &GUID_SysMouse),
- "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n",
- wine_dbgstr_guid(&instance->guidProduct),
- wine_dbgstr_guid(&GUID_SysMouse));
- else {
- /* Non-keyboard/mouse devices use the "PIDVID" guidProduct */
- static const GUID pidvid_product_guid = { /* device_pidvid-0000-0000-0000-504944564944 "PIDVID" */
- 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44}
- };
+ if (enum_test->version >= 0x800)
+ {
+ if (type == DI8DEVTYPE_KEYBOARD || type == DI8DEVTYPE_MOUSE)
+ {
+ const char *device = (type == DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
+ ok( IsEqualGUID( &instance->guidInstance, &instance->guidProduct ),
+ "%s guidInstance (%s) does not match guidProduct (%s)\n", device,
+ wine_dbgstr_guid( &instance->guidInstance ), wine_dbgstr_guid( &instance->guidProduct ) );
+ }
+ }
+ else
+ {
+ if (type == DIDEVTYPE_KEYBOARD || type == DIDEVTYPE_MOUSE)
+ {
+ const char *device = (type == DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
+ ok( IsEqualGUID( &instance->guidInstance, &instance->guidProduct ),
+ "%s guidInstance (%s) does not match guidProduct (%s)\n", device,
+ wine_dbgstr_guid( &instance->guidInstance ), wine_dbgstr_guid( &instance->guidProduct ) );
+ }
- ok(instance->guidProduct.Data2 == pidvid_product_guid.Data2,
- "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2);
- ok(instance->guidProduct.Data3 == pidvid_product_guid.Data3,
- "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3);
- ok(!memcmp(instance->guidProduct.Data4, pidvid_product_guid.Data4, sizeof(pidvid_product_guid.Data4)),
- "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid(&instance->guidProduct));
+ if (type == DIDEVTYPE_KEYBOARD)
+ ok( IsEqualGUID( &instance->guidProduct, &GUID_SysKeyboard ),
+ "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n",
+ wine_dbgstr_guid( &instance->guidProduct ), wine_dbgstr_guid( &GUID_SysMouse ) );
+ else if (type == DIDEVTYPE_MOUSE)
+ ok( IsEqualGUID( &instance->guidProduct, &GUID_SysMouse ),
+ "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n",
+ wine_dbgstr_guid( &instance->guidProduct ), wine_dbgstr_guid( &GUID_SysMouse ) );
+ else
+ {
+ ok( instance->guidProduct.Data2 == pidvid_product_guid.Data2,
+ "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2 );
+ ok( instance->guidProduct.Data3 == pidvid_product_guid.Data3,
+ "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3 );
+ ok( !memcmp( instance->guidProduct.Data4, pidvid_product_guid.Data4,
+ sizeof(pidvid_product_guid.Data4) ),
+ "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid( &instance->guidProduct ) );
+ }
}
enum_test->device_count++;
return enum_test->return_value;
}
-static void test_EnumDevices(void)
+static void test_EnumDevices( DWORD version )
{
- IDirectInputA *pDI;
+ struct enum_devices_test enum_test = {.version = version}, enum_test_return = {.version = version};
+ IDirectInputA *dinput;
HRESULT hr;
- struct enum_devices_test enum_test, enum_test_return;
+ ULONG ref;
- hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
+ if (FAILED(hr = direct_input_create( version, &dinput ))) return;
- hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0, NULL, NULL, 0 );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
- hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0, NULL, NULL, ~0u );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
/* Test crashes on Wine. */
if (0)
{
- hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, NULL, ~0u );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
}
- hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, NULL, NULL, 0 );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
- hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, NULL, NULL, ~0u );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
- hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, enum_devices_callback, NULL, 0 );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
- hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, enum_devices_callback, NULL, ~0u );
+ ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
enum_test.device_count = 0;
enum_test.return_value = DIENUM_CONTINUE;
- hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
- ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test, 0 );
+ ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr );
ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count);
/* Enumeration only stops with an explicit DIENUM_STOP. */
enum_test_return.device_count = 0;
enum_test_return.return_value = 42;
- hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0);
- ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test_return, 0 );
+ ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr );
ok(enum_test_return.device_count == enum_test.device_count,
"Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count);
enum_test.device_count = 0;
enum_test.return_value = DIENUM_STOP;
- hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
- ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+ hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test, 0 );
+ ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr );
ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count);
- IDirectInput_Release(pDI);
+ ref = IDirectInput_Release( dinput );
+ ok( ref == 0, "Release returned %u\n", ref );
}
-static void test_GetDeviceStatus(void)
+static void test_GetDeviceStatus( DWORD version )
{
- IDirectInputA *pDI;
+ IDirectInputA *dinput;
HRESULT hr;
+ ULONG ref;
- hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
+ if (FAILED(hr = direct_input_create( version, &dinput ))) return;
- hr = IDirectInput_GetDeviceStatus(pDI, NULL);
- ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+ hr = IDirectInput_GetDeviceStatus( dinput, NULL );
+ ok( hr == E_POINTER, "GetDeviceStatus returned %#x\n", hr );
- hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
+ hr = IDirectInput_GetDeviceStatus( dinput, &GUID_Unknown );
todo_wine
- ok(hr == DIERR_DEVICENOTREG, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+ ok( hr == DIERR_DEVICENOTREG, "GetDeviceStatus returned %#x\n", hr );
- hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse);
- ok(hr == DI_OK, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+ hr = IDirectInput_GetDeviceStatus( dinput, &GUID_SysMouse );
+ ok( hr == DI_OK, "GetDeviceStatus returned %#x\n", hr );
- IDirectInput_Release(pDI);
+ ref = IDirectInput_Release( dinput );
+ ok( ref == 0, "Release returned %u\n", ref );
}
-static void test_Initialize(void)
+static void test_Initialize( DWORD version )
{
- IDirectInputA *pDI;
+ IDirectInputA *dinput;
HRESULT hr;
- int i;
+ ULONG ref;
- hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
+ if (FAILED(hr = direct_input_create( version, &dinput ))) return;
- hr = IDirectInput_Initialize(pDI, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr);
+ hr = IDirectInput_Initialize( dinput, NULL, 0 );
+ ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr );
- hr = IDirectInput_Initialize(pDI, NULL, DIRECTINPUT_VERSION);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr);
+ hr = IDirectInput_Initialize( dinput, NULL, version );
+ if (version == 0x300) todo_wine ok( hr == S_OK, "Initialize returned %#x\n", hr );
+ else ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr );
- hr = IDirectInput_Initialize(pDI, hInstance, 0);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr);
+ hr = IDirectInput_Initialize( dinput, hInstance, 0 );
+ ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr );
- /* Invalid DirectInput versions less than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */
- hr = IDirectInput_Initialize(pDI, hInstance, 0x0123);
- ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr);
+ hr = IDirectInput_Initialize( dinput, hInstance, version - 1 );
+ ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr );
- /* Invalid DirectInput versions greater than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */
- hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe);
- ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr);
-
- for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++)
- {
- hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]);
- ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr);
- }
+ hr = IDirectInput_Initialize( dinput, hInstance, version + 1 );
+ if (version >= 0x700) ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr );
+ else ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr );
/* Parameters are still validated after successful initialization. */
- hr = IDirectInput_Initialize(pDI, hInstance, 0);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr);
+ hr = IDirectInput_Initialize( dinput, hInstance, 0 );
+ ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr );
- IDirectInput_Release(pDI);
+ ref = IDirectInput_Release( dinput );
+ ok( ref == 0, "Release returned %u\n", ref );
}
-static void test_RunControlPanel(void)
+static void test_RunControlPanel( DWORD version )
{
- IDirectInputA *pDI;
+ IDirectInputA *dinput;
HRESULT hr;
+ ULONG ref;
- hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
+ if (FAILED(hr = direct_input_create( version, &dinput ))) return;
if (winetest_interactive)
{
- hr = IDirectInput_RunControlPanel(pDI, NULL, 0);
- ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, NULL, 0 );
+ ok( hr == S_OK, "RunControlPanel returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, GetDesktopWindow(), 0);
- ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, GetDesktopWindow(), 0 );
+ ok( hr == S_OK, "RunControlPanel returned %#x\n", hr );
}
- hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, NULL, ~0u );
+ ok( hr == DIERR_INVALIDPARAM, "RunControlPanel returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
- ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, 0 );
+ ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
- hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
- ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+ hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, ~0u );
+ ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
- IDirectInput_Release(pDI);
+ ref = IDirectInput_Release( dinput );
+ ok( ref == 0, "Release returned %u\n", ref );
}
static void test_DirectInputJoyConfig8(void)
@@ -644,7 +790,7 @@ static void test_DirectInputJoyConfig8(void)
if (SUCCEEDED(hr))
{
hr = IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL);
- ok (SUCCEEDED(hr), "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr);
+ ok( SUCCEEDED(hr), "CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr );
IDirectInputDevice_Release(pDID);
}
}
@@ -653,23 +799,227 @@ static void test_DirectInputJoyConfig8(void)
IDirectInput_Release(pDI);
}
+struct enum_semantics_test
+{
+ unsigned int device_count;
+ DWORD first_remaining;
+ BOOL mouse;
+ BOOL keyboard;
+ DIACTIONFORMATA *action_format;
+ const char *username;
+};
+
+static DIACTIONA actionMapping[] = {
+ /* axis */
+ {0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, {"Steer.\0"}},
+ /* button */
+ {1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, {"Upshift.\0"}},
+ /* keyboard key */
+ {2, DIKEYBOARD_SPACE, 0, {"Missile.\0"}},
+ /* mouse button */
+ {3, DIMOUSE_BUTTON0, 0, {"Select\0"}},
+ /* mouse axis */
+ {4, DIMOUSE_YAXIS, 0, {"Y Axis\0"}}};
+/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS
+ * one can find out that the regular ansi string termination is not respected by
+ * EnumDevicesBySemantics. Adding a double termination, making it a valid wide string termination,
+ * made the test succeed. Therefore it looks like ansi version of EnumDevicesBySemantics forwards
+ * the string to the wide variant without conversation. */
+
+static BOOL CALLBACK enum_semantics_callback( const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid,
+ DWORD dwFlags, DWORD dwRemaining, void *context )
+{
+ struct enum_semantics_test *data = context;
+
+ if (context == NULL) return DIENUM_STOP;
+
+ if (!data->device_count)
+ {
+ data->first_remaining = dwRemaining;
+ }
+ ok( dwRemaining == data->first_remaining - data->device_count,
+ "enum semantics remaining devices is wrong, expected %d, had %d\n",
+ data->first_remaining - data->device_count, dwRemaining );
+ data->device_count++;
+
+ if (IsEqualGUID( &lpddi->guidInstance, &GUID_SysKeyboard )) data->keyboard = TRUE;
+
+ if (IsEqualGUID( &lpddi->guidInstance, &GUID_SysMouse )) data->mouse = TRUE;
+
+ return DIENUM_CONTINUE;
+}
+
+static BOOL CALLBACK set_action_map_callback( const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid,
+ DWORD dwFlags, DWORD dwRemaining, void *context )
+{
+ HRESULT hr;
+ struct enum_semantics_test *data = context;
+
+ /* Building and setting an action map */
+ /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */
+ hr = IDirectInputDevice8_BuildActionMap( lpdid, data->action_format, NULL, DIDBAM_INITIALIZE );
+ ok( SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr );
+
+ hr = IDirectInputDevice8_SetActionMap( lpdid, data->action_format, data->username, 0 );
+ ok( SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr );
+
+ return DIENUM_CONTINUE;
+}
+
+static void test_EnumDevicesBySemantics(void)
+{
+ DIACTIONFORMATA action_format;
+ const GUID ACTION_MAPPING_GUID = {0x1, 0x2, 0x3, {0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb}};
+ struct enum_semantics_test data = {0, 0, FALSE, FALSE, &action_format, NULL};
+ IDirectInput8A *dinput;
+ int device_total = 0;
+ HRESULT hr;
+
+ hr = DirectInput8Create( hInstance, 0x800, &IID_IDirectInput8A, (void **)&dinput, NULL );
+ if (FAILED(hr))
+ {
+ win_skip( "Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr );
+ return;
+ }
+
+ memset( &action_format, 0, sizeof(action_format) );
+ action_format.dwSize = sizeof(action_format);
+ action_format.dwActionSize = sizeof(DIACTIONA);
+ action_format.dwNumActions = ARRAY_SIZE(actionMapping);
+ action_format.dwDataSize = 4 * action_format.dwNumActions;
+ action_format.rgoAction = actionMapping;
+ action_format.guidActionMap = ACTION_MAPPING_GUID;
+ action_format.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */
+ action_format.dwBufferSize = 32;
+
+ /* Test enumerating all attached and installed devices */
+ data.keyboard = FALSE;
+ data.mouse = FALSE;
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+ &data, DIEDBSFL_ATTACHEDONLY );
+ ok( data.device_count > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr );
+ ok( data.keyboard, "EnumDevicesBySemantics should enumerate the keyboard\n" );
+ ok( data.mouse, "EnumDevicesBySemantics should enumerate the mouse\n" );
+
+ /* Enumerate Force feedback devices. We should get no mouse nor keyboard */
+ data.keyboard = FALSE;
+ data.mouse = FALSE;
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+ &data, DIEDBSFL_FORCEFEEDBACK );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( !data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n" );
+ ok( !data.mouse, "Mouse should not be enumerated when asking for forcefeedback\n" );
+
+ /* Enumerate available devices. That is devices not owned by any user.
+ Before setting the action map for all devices we still have them available. */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+ &data, DIEDBSFL_AVAILABLEDEVICES );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count > 0,
+ "There should be devices available before action mapping available=%d\n", data.device_count );
+
+ /* Keep the device total */
+ device_total = data.device_count;
+
+ /* There should be no devices for any user. No device should be enumerated with DIEDBSFL_THISUSER.
+ MSDN defines that all unowned devices are also enumerated but this doesn't seem to be happening. */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Sh4d0w M4g3", &action_format,
+ enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count == 0, "No devices should be assigned for this user assigned=%d\n", data.device_count );
+
+ /* This enumeration builds and sets the action map for all devices with a NULL username */
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, set_action_map_callback,
+ &data, DIEDBSFL_ATTACHEDONLY );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr );
+
+ /* After a successful action mapping we should have no devices available */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+ &data, DIEDBSFL_AVAILABLEDEVICES );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count == 0, "No device should be available after action mapping available=%d\n",
+ data.device_count );
+
+ /* Now we'll give all the devices to a specific user */
+ data.username = "Sh4d0w M4g3";
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, set_action_map_callback,
+ &data, DIEDBSFL_ATTACHEDONLY );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr );
+
+ /* Testing with the default user, DIEDBSFL_THISUSER has no effect */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format,
+ enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count == device_total, "THISUSER has no effect with NULL username owned=%d, expected=%d\n",
+ data.device_count, device_total );
+
+ /* Using an empty user string is the same as passing NULL, DIEDBSFL_THISUSER has no effect */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, "", &action_format, enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count == device_total, "THISUSER has no effect with \"\" as username owned=%d, expected=%d\n",
+ data.device_count, device_total );
+
+ /* Testing with a user with no ownership of the devices */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Ninja Brian", &action_format,
+ enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count == 0, "This user should own no devices owned=%d\n", data.device_count );
+
+ /* Sh4d0w M4g3 has ownership of all devices */
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Sh4d0w M4g3", &action_format,
+ enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+ ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+ ok( data.device_count == device_total, "This user should own %d devices owned=%d\n",
+ device_total, data.device_count );
+
+ /* The call fails with a zeroed GUID */
+ memset( &action_format.guidActionMap, 0, sizeof(GUID) );
+ data.device_count = 0;
+ hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, NULL, 0 );
+ todo_wine
+ ok( FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr );
+
+ IDirectInput8_Release( dinput );
+}
+
START_TEST(dinput)
{
HMODULE dinput_mod = GetModuleHandleA("dinput.dll");
+ DWORD i;
hInstance = GetModuleHandleA(NULL);
pDirectInputCreateEx = (void *)GetProcAddress(dinput_mod, "DirectInputCreateEx");
- CoInitialize(NULL);
- test_preinitialization();
- test_DirectInputCreateEx();
- test_QueryInterface();
- test_CreateDevice();
- test_EnumDevices();
- test_GetDeviceStatus();
- test_Initialize();
- test_RunControlPanel();
- test_DirectInputJoyConfig8();
+ CoInitialize( NULL );
+ test_CoCreateInstance( 0x700 );
+ test_CoCreateInstance( 0x800 );
CoUninitialize();
+
+ for (i = 0; i < ARRAY_SIZE(dinput_versions); i++)
+ {
+ winetest_push_context( "%#x", dinput_versions[i] );
+ test_DirectInputCreate( dinput_versions[i] );
+ test_DirectInputCreateEx( dinput_versions[i] );
+ test_DirectInput8Create( dinput_versions[i] );
+ test_QueryInterface( dinput_versions[i] );
+ test_CreateDevice( dinput_versions[i] );
+ test_EnumDevices( dinput_versions[i] );
+ test_GetDeviceStatus( dinput_versions[i] );
+ test_RunControlPanel( dinput_versions[i] );
+ test_Initialize( dinput_versions[i] );
+ winetest_pop_context();
+ }
+
+ test_DirectInputJoyConfig8();
+ test_EnumDevicesBySemantics();
}
diff --git a/dlls/dinput/tests/dinput8.c b/dlls/dinput/tests/dinput8.c
deleted file mode 100644
index 81aeb8191f6..00000000000
--- a/dlls/dinput/tests/dinput8.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * Copyright (c) 2011 Andrew Nguyen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define DIRECTINPUT_VERSION 0x0800
-
-#define COBJMACROS
-#include <windows.h>
-#include <objidl.h>
-
-#include <dinput.h>
-#include <dinputd.h>
-
-#include "wine/test.h"
-
-static HINSTANCE hInstance;
-
-static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
-{
- ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context);
- return DIENUM_STOP;
-}
-
-static void test_preinitialization(void)
-{
- static const struct
- {
- REFGUID rguid;
- BOOL pdev;
- HRESULT expected_hr;
- } create_device_tests[] =
- {
- {NULL, FALSE, E_POINTER},
- {NULL, TRUE, E_POINTER},
- {&GUID_Unknown, FALSE, E_POINTER},
- {&GUID_Unknown, TRUE, DIERR_NOTINITIALIZED},
- {&GUID_SysMouse, FALSE, E_POINTER},
- {&GUID_SysMouse, TRUE, DIERR_NOTINITIALIZED},
- };
-
- static const struct
- {
- DWORD dwDevType;
- LPDIENUMDEVICESCALLBACKA lpCallback;
- DWORD dwFlags;
- HRESULT expected_hr;
- int todo;
- } enum_devices_tests[] =
- {
- {0, NULL, 0, DIERR_INVALIDPARAM},
- {0, NULL, ~0u, DIERR_INVALIDPARAM},
- {0, dummy_callback, 0, DIERR_NOTINITIALIZED},
- {0, dummy_callback, ~0u, DIERR_INVALIDPARAM},
- {0xdeadbeef, NULL, 0, DIERR_INVALIDPARAM},
- {0xdeadbeef, NULL, ~0u, DIERR_INVALIDPARAM},
- {0xdeadbeef, dummy_callback, 0, DIERR_INVALIDPARAM},
- {0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM},
- };
-
- IDirectInput8A *pDI;
- HRESULT hr;
- int i;
- IDirectInputDevice8A *pDID;
-
- hr = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (void **)&pDI);
- if (FAILED(hr))
- {
- skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- for (i = 0; i < ARRAY_SIZE(create_device_tests); i++)
- {
- if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef;
- hr = IDirectInput8_CreateDevice(pDI, create_device_tests[i].rguid,
- create_device_tests[i].pdev ? &pDID : NULL,
- NULL);
- ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput8_CreateDevice returned 0x%08x\n", i, hr);
- if (create_device_tests[i].pdev)
- ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID);
- }
-
- for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++)
- {
- hr = IDirectInput8_EnumDevices(pDI, enum_devices_tests[i].dwDevType,
- enum_devices_tests[i].lpCallback,
- NULL,
- enum_devices_tests[i].dwFlags);
- todo_wine_if(enum_devices_tests[i].todo)
- ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr);
- }
-
- hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
- ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
- hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
- hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_SysMouse);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, NULL, 0);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
- ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
- ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- IDirectInput8_Release(pDI);
-}
-
-static void test_DirectInput8Create(void)
-{
- static const struct
- {
- BOOL hinst;
- DWORD dwVersion;
- REFIID riid;
- BOOL ppdi;
- HRESULT expected_hr;
- } invalid_param_list[] =
- {
- {FALSE, 0, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, 0, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {FALSE, 0, &IID_IDirectInput8A, FALSE, E_POINTER},
- {FALSE, 0, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM},
- {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInput8A, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, FALSE, E_POINTER},
- {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM},
- {TRUE, 0, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, 0, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {TRUE, 0, &IID_IDirectInput8A, FALSE, E_POINTER},
- {TRUE, 0, &IID_IDirectInput8A, TRUE, DIERR_NOTINITIALIZED},
- {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInput8A, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, TRUE, DIERR_BETADIRECTINPUTVERSION},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, FALSE, E_POINTER},
- {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE, DIERR_OLDDIRECTINPUTVERSION},
- };
-
- static REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
- &IID_IDirectInput2A, &IID_IDirectInput2W,
- &IID_IDirectInput7A, &IID_IDirectInput7W,
- &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW,
- &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W,
- &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W,
- &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W,
- &IID_IDirectInputEffect};
-
- static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W};
-
- int i;
- IUnknown *pUnk;
- HRESULT hr;
-
- for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++)
- {
- if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef;
- hr = DirectInput8Create(invalid_param_list[i].hinst ? hInstance : NULL,
- invalid_param_list[i].dwVersion,
- invalid_param_list[i].riid,
- invalid_param_list[i].ppdi ? (void **)&pUnk : NULL,
- NULL);
- ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInput8Create returned 0x%08x\n", i, hr);
- if (invalid_param_list[i].ppdi)
- ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
- }
-
- for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
- {
- pUnk = (void *)0xdeadbeef;
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL);
- ok(hr == DIERR_NOINTERFACE, "[%d] DirectInput8Create returned 0x%08x\n", i, hr);
- ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
- }
-
- for (i = 0; i < ARRAY_SIZE(iid_list); i++)
- {
- pUnk = NULL;
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL);
- ok(hr == DI_OK, "[%d] DirectInput8Create returned 0x%08x\n", i, hr);
- ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
- if (pUnk)
- IUnknown_Release(pUnk);
- }
-}
-
-static void test_QueryInterface(void)
-{
- static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W, &IID_IDirectInputJoyConfig8};
-
- static REFIID no_interface_list[] =
- {
- &IID_IDirectInputA,
- &IID_IDirectInputW,
- &IID_IDirectInput2A,
- &IID_IDirectInput2W,
- &IID_IDirectInput7A,
- &IID_IDirectInput7W,
- &IID_IDirectInputDeviceA,
- &IID_IDirectInputDeviceW,
- &IID_IDirectInputDevice2A,
- &IID_IDirectInputDevice2W,
- &IID_IDirectInputDevice7A,
- &IID_IDirectInputDevice7W,
- &IID_IDirectInputDevice8A,
- &IID_IDirectInputDevice8W,
- &IID_IDirectInputEffect,
- };
-
- IDirectInput8A *pDI;
- HRESULT hr;
- IUnknown *pUnk;
- int i;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- hr = IDirectInput8_QueryInterface(pDI, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr);
-
- pUnk = (void *)0xdeadbeef;
- hr = IDirectInput8_QueryInterface(pDI, NULL, (void **)&pUnk);
- ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr);
- ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk);
-
- hr = IDirectInput8_QueryInterface(pDI, &IID_IUnknown, NULL);
- ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr);
-
- for (i = 0; i < ARRAY_SIZE(iid_list); i++)
- {
- pUnk = NULL;
- hr = IDirectInput8_QueryInterface(pDI, iid_list[i], (void **)&pUnk);
- ok(hr == S_OK, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr);
- ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
- if (pUnk)
- {
- int j;
- for (j = 0; j < ARRAY_SIZE(iid_list); j++)
- {
- IUnknown *pUnk1 = NULL;
- hr = IDirectInput8_QueryInterface(pUnk, iid_list[j], (void **)&pUnk1);
- ok(hr == S_OK, "[%d] IDirectInput8_QueryInterface(pUnk) returned 0x%08x\n", j, hr);
- ok(pUnk1 != NULL, "[%d] Output interface pointer is NULL\n", i);
- if (pUnk1) IUnknown_Release(pUnk1);
- }
- IUnknown_Release(pUnk);
- }
- }
-
- for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
- {
- pUnk = (void *)0xdeadbeef;
- hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk);
-
- ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr);
- ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
- }
-
- IDirectInput8_Release(pDI);
-}
-
-static void test_CreateDevice(void)
-{
- IDirectInput8A *pDI;
- HRESULT hr;
- IDirectInputDevice8A *pDID;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- hr = IDirectInput8_CreateDevice(pDI, NULL, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
- pDID = (void *)0xdeadbeef;
- hr = IDirectInput8_CreateDevice(pDI, NULL, &pDID, NULL);
- ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
- ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
-
- hr = IDirectInput8_CreateDevice(pDI, &GUID_Unknown, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
- pDID = (void *)0xdeadbeef;
- hr = IDirectInput8_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL);
- ok(hr == DIERR_DEVICENOTREG, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
- ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
-
- hr = IDirectInput8_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL);
- ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
- hr = IDirectInput8_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL);
- ok(hr == DI_OK, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
- IDirectInputDevice_Release(pDID);
- IDirectInput8_Release(pDI);
-}
-
-struct enum_devices_test
-{
- unsigned int device_count;
- BOOL return_value;
-};
-
-static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context)
-{
- struct enum_devices_test *enum_test = context;
-
- trace("---- Device Information ----\n"
- "Product Name : %s\n"
- "Instance Name : %s\n"
- "devType : 0x%08x\n"
- "GUID Product : %s\n"
- "GUID Instance : %s\n"
- "HID Page : 0x%04x\n"
- "HID Usage : 0x%04x\n",
- instance->tszProductName,
- instance->tszInstanceName,
- instance->dwDevType,
- wine_dbgstr_guid(&instance->guidProduct),
- wine_dbgstr_guid(&instance->guidInstance),
- instance->wUsagePage,
- instance->wUsage);
-
- if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD ||
- (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) {
- const char *device = ((instance->dwDevType & 0xff) ==
- DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
- ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct),
- "%s guidInstance (%s) does not match guidProduct (%s)\n",
- device, wine_dbgstr_guid(&instance->guidInstance),
- wine_dbgstr_guid(&instance->guidProduct));
- }
-
- enum_test->device_count++;
- return enum_test->return_value;
-}
-
-static void test_EnumDevices(void)
-{
- IDirectInput8A *pDI;
- HRESULT hr;
- struct enum_devices_test enum_test, enum_test_return;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- hr = IDirectInput8_EnumDevices(pDI, 0, NULL, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
- hr = IDirectInput8_EnumDevices(pDI, 0, NULL, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
- /* Test crashes on Wine. */
- if (0)
- {
- hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
- }
-
- hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
- hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
- hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
- hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
- enum_test.device_count = 0;
- enum_test.return_value = DIENUM_CONTINUE;
- hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
- ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
- ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count);
-
- /* Enumeration only stops with an explicit DIENUM_STOP. */
- enum_test_return.device_count = 0;
- enum_test_return.return_value = 42;
- hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0);
- ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
- ok(enum_test_return.device_count == enum_test.device_count,
- "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count);
-
- enum_test.device_count = 0;
- enum_test.return_value = DIENUM_STOP;
- hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
- ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
- ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count);
-
- IDirectInput8_Release(pDI);
-}
-
-struct enum_semantics_test
-{
- unsigned int device_count;
- DWORD first_remaining;
- BOOL mouse;
- BOOL keyboard;
- DIACTIONFORMATA *lpdiaf;
- const char* username;
-};
-
-static DIACTIONA actionMapping[]=
-{
- /* axis */
- { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer.\0" } },
- /* button */
- { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift.\0" } },
- /* keyboard key */
- { 2, DIKEYBOARD_SPACE, 0, { "Missile.\0" } },
- /* mouse button */
- { 3, DIMOUSE_BUTTON0, 0, { "Select\0" } },
- /* mouse axis */
- { 4, DIMOUSE_YAXIS, 0, { "Y Axis\0" } }
-};
-/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS
- * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics.
- * Adding a double termination, making it a valid wide string termination, made the test succeed.
- * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to
- * the wide variant without conversation. */
-
-static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context)
-{
- struct enum_semantics_test *data = context;
-
- if (context == NULL) return DIENUM_STOP;
-
- if (!data->device_count) {
- data->first_remaining = dwRemaining;
- }
- ok (dwRemaining == data->first_remaining - data->device_count,
- "enum semantics remaining devices is wrong, expected %d, had %d\n",
- data->first_remaining - data->device_count, dwRemaining);
- data->device_count++;
-
- if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) data->keyboard = TRUE;
-
- if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) data->mouse = TRUE;
-
- return DIENUM_CONTINUE;
-}
-
-static BOOL CALLBACK set_action_map_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context)
-{
- HRESULT hr;
- struct enum_semantics_test *data = context;
-
- /* Building and setting an action map */
- /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */
- hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_INITIALIZE);
- ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr);
-
- hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, data->username, 0);
- ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr);
-
- return DIENUM_CONTINUE;
-}
-
-static void test_EnumDevicesBySemantics(void)
-{
- IDirectInput8A *pDI;
- HRESULT hr;
- DIACTIONFORMATA diaf;
- const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } };
- struct enum_semantics_test data = { 0, 0, FALSE, FALSE, &diaf, NULL };
- int device_total = 0;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- memset (&diaf, 0, sizeof(diaf));
- diaf.dwSize = sizeof(diaf);
- diaf.dwActionSize = sizeof(DIACTIONA);
- diaf.dwNumActions = ARRAY_SIZE(actionMapping);
- diaf.dwDataSize = 4 * diaf.dwNumActions;
- diaf.rgoAction = actionMapping;
- diaf.guidActionMap = ACTION_MAPPING_GUID;
- diaf.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */
- diaf.dwBufferSize = 32;
-
- /* Test enumerating all attached and installed devices */
- data.keyboard = FALSE;
- data.mouse = FALSE;
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_ATTACHEDONLY);
- ok (data.device_count > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr);
- ok (data.keyboard, "EnumDevicesBySemantics should enumerate the keyboard\n");
- ok (data.mouse, "EnumDevicesBySemantics should enumerate the mouse\n");
-
- /* Enumerate Force feedback devices. We should get no mouse nor keyboard */
- data.keyboard = FALSE;
- data.mouse = FALSE;
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_FORCEFEEDBACK);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (!data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n");
- ok (!data.mouse, "Mouse should not be enumerated when asking for forcefeedback\n");
-
- /* Enumerate available devices. That is devices not owned by any user.
- Before setting the action map for all devices we still have them available. */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_AVAILABLEDEVICES);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count > 0, "There should be devices available before action mapping available=%d\n", data.device_count);
-
- /* Keep the device total */
- device_total = data.device_count;
-
- /* There should be no devices for any user. No device should be enumerated with DIEDBSFL_THISUSER.
- MSDN defines that all unowned devices are also enumerated but this doesn't seem to be happening. */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Sh4d0w M4g3", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count == 0, "No devices should be assigned for this user assigned=%d\n", data.device_count);
-
- /* This enumeration builds and sets the action map for all devices with a NULL username */
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, set_action_map_callback, &data, DIEDBSFL_ATTACHEDONLY);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr);
-
- /* After a successful action mapping we should have no devices available */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_AVAILABLEDEVICES);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count == 0, "No device should be available after action mapping available=%d\n", data.device_count);
-
- /* Now we'll give all the devices to a specific user */
- data.username = "Sh4d0w M4g3";
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, set_action_map_callback, &data, DIEDBSFL_ATTACHEDONLY);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr);
-
- /* Testing with the default user, DIEDBSFL_THISUSER has no effect */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count == device_total, "THISUSER has no effect with NULL username owned=%d, expected=%d\n", data.device_count, device_total);
-
- /* Using an empty user string is the same as passing NULL, DIEDBSFL_THISUSER has no effect */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, "", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count == device_total, "THISUSER has no effect with \"\" as username owned=%d, expected=%d\n", data.device_count, device_total);
-
- /* Testing with a user with no ownership of the devices */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Ninja Brian", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count == 0, "This user should own no devices owned=%d\n", data.device_count);
-
- /* Sh4d0w M4g3 has ownership of all devices */
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Sh4d0w M4g3", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
- ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
- ok (data.device_count == device_total, "This user should own %d devices owned=%d\n", device_total, data.device_count);
-
- /* The call fails with a zeroed GUID */
- memset(&diaf.guidActionMap, 0, sizeof(GUID));
- data.device_count = 0;
- hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, NULL, 0);
- todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr);
-
- IDirectInput8_Release(pDI);
-}
-
-static void test_GetDeviceStatus(void)
-{
- IDirectInput8A *pDI;
- HRESULT hr;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
- ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
- hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
- todo_wine
- ok(hr == DIERR_DEVICENOTREG, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
- hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_SysMouse);
- ok(hr == DI_OK, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
- IDirectInput8_Release(pDI);
-}
-
-static void test_RunControlPanel(void)
-{
- IDirectInput8A *pDI;
- HRESULT hr;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- if (winetest_interactive)
- {
- hr = IDirectInput8_RunControlPanel(pDI, NULL, 0);
- ok(hr == S_OK, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, GetDesktopWindow(), 0);
- ok(hr == S_OK, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
- }
-
- hr = IDirectInput8_RunControlPanel(pDI, NULL, ~0u);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
- ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
- ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
- IDirectInput8_Release(pDI);
-}
-
-static void test_Initialize(void)
-{
- IDirectInput8A *pDI;
- HRESULT hr;
-
- hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
- if (FAILED(hr))
- {
- win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
- return;
- }
-
- hr = IDirectInput8_Initialize(pDI, NULL, 0);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- hr = IDirectInput8_Initialize(pDI, NULL, DIRECTINPUT_VERSION);
- ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- hr = IDirectInput8_Initialize(pDI, hInstance, 0);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- /* Invalid DirectInput versions less than DIRECTINPUT_VERSION yield DIERR_BETADIRECTINPUTVERSION. */
- hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION - 1);
- ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- /* Invalid DirectInput versions greater than DIRECTINPUT_VERSION yield DIERR_BETADIRECTINPUTVERSION. */
- hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION + 1);
- ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION);
- ok(hr == DI_OK, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- /* Parameters are still validated after successful initialization. */
- hr = IDirectInput8_Initialize(pDI, hInstance, 0);
- ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
- IDirectInput8_Release(pDI);
-}
-
-START_TEST(dinput8)
-{
- hInstance = GetModuleHandleA(NULL);
-
- CoInitialize(NULL);
- test_preinitialization();
- test_DirectInput8Create();
- test_QueryInterface();
- test_CreateDevice();
- test_EnumDevices();
- test_EnumDevicesBySemantics();
- test_GetDeviceStatus();
- test_RunControlPanel();
- test_Initialize();
- CoUninitialize();
-}
--
2.34.1
1
5
07 Feb '22
Keep it consistent with Windows.
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
dlls/comctl32/treeview.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 6e9f6dd6d1b..84fde215ff8 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3034,13 +3034,11 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr)
rc.left = width;
rc.right = rc.left + width;
- DrawFrameControl(hdc, &rc, DFC_BUTTON,
- DFCS_BUTTONCHECK|DFCS_FLAT);
+ DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO);
rc.left = width * 2;
rc.right = rc.left + width;
- DrawFrameControl(hdc, &rc, DFC_BUTTON,
- DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED);
+ DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO | DFCS_CHECKED);
SelectObject(hdc, hbmOld);
nIndex = ImageList_AddMasked(infoPtr->himlState, hbm,
--
2.32.0
1
0
[PATCH 1/2] comctl32/treeview: Support HiDPI for unthemed item check boxes.
by Zhiyi Zhang 07 Feb '22
by Zhiyi Zhang 07 Feb '22
07 Feb '22
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
dlls/comctl32/treeview.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 1368105f271..6e9f6dd6d1b 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3011,30 +3011,34 @@ static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info)
static void
TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr)
{
+ int nIndex, width, height;
RECT rc;
HBITMAP hbm, hbmOld;
HDC hdc, hdcScreen;
- int nIndex;
if (TREEVIEW_InitThemedCheckboxes(infoPtr))
return;
- infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0);
+ width = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1;
+ height = width;
+ infoPtr->himlState = ImageList_Create(width, height, ILC_COLOR | ILC_MASK, 3, 0);
hdcScreen = GetDC(0);
hdc = CreateCompatibleDC(hdcScreen);
- hbm = CreateCompatibleBitmap(hdcScreen, 48, 16);
+ hbm = CreateCompatibleBitmap(hdcScreen, width * 3, height);
hbmOld = SelectObject(hdc, hbm);
- SetRect(&rc, 0, 0, 48, 16);
+ SetRect(&rc, 0, 0, width * 3, height);
FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1));
- SetRect(&rc, 18, 2, 30, 14);
+ rc.left = width;
+ rc.right = rc.left + width;
DrawFrameControl(hdc, &rc, DFC_BUTTON,
DFCS_BUTTONCHECK|DFCS_FLAT);
- SetRect(&rc, 34, 2, 46, 14);
+ rc.left = width * 2;
+ rc.right = rc.left + width;
DrawFrameControl(hdc, &rc, DFC_BUTTON,
DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED);
@@ -3047,8 +3051,8 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr)
DeleteDC(hdc);
ReleaseDC(0, hdcScreen);
- infoPtr->stateImageWidth = 16;
- infoPtr->stateImageHeight = 16;
+ infoPtr->stateImageWidth = width;
+ infoPtr->stateImageHeight = height;
}
static void
--
2.32.0
1
0
[PATCH 1/2] shell32/tests: Wait for window to close in check_window_exists
by Alex Henrie 07 Feb '22
by Alex Henrie 07 Feb '22
07 Feb '22
This fixes a race condition where the directory is deleted before the
window closes, which causes an error dialog to appear.
Cutting the number of iterations per wait loop in half is necessary so
that doubling the number of wait loops does not result in a timeout when
new tests are added.
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
dlls/shell32/tests/progman_dde.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c
index ef087893016..5d532f9222f 100644
--- a/dlls/shell32/tests/progman_dde.c
+++ b/dlls/shell32/tests/progman_dde.c
@@ -164,7 +164,7 @@ static BOOL check_window_exists(const char *name)
else
strcpy(title, name);
- for (i = 0; i < 20; i++)
+ for (i = 0; i < 10; i++)
{
Sleep(100 * i);
if ((window = FindWindowA("ExplorerWClass", title)) ||
@@ -175,7 +175,17 @@ static BOOL check_window_exists(const char *name)
}
}
- return (window != NULL);
+ if (!window)
+ return FALSE;
+
+ for (i = 0; i < 10; i++)
+ {
+ Sleep(100 * i);
+ if (!IsWindow(window))
+ break;
+ }
+
+ return TRUE;
}
static BOOL check_exists(const char *name)
--
2.35.1
1
1
some more conversions to long types in programs/
A+
---
Eric Pouech (24):
programs/sc: enable compilation with long types
programs/services: enable compilation with long types
programs/spoolsv: enable compilation with long types
programs/start: enable compilation with long types
programs/svchost: enable compilation with long types
programs/termsv: enable compilation with long types
programs/uninstaller: enable compilation with long types
programs/whoami: enable compilation with long types
programs/wineboot: enable compilation with long types
programs/winebrowser: enable compilation with long types
programs/winecfg: enable compilation with long types
programs/wineconsole: enable compilation with long types
programs/winedbg: enable compilation with long types
programs/winedevice: enable compilation with long types
programs/winemenubuilder: enable compilation with long types
programs/winemsibuilder: enable compilation with long types
programs/winetest: enable compilation with long types
programs/winhlp32: enable compilation with long types
programs/winmgmt: enable compilation with long types
programs/winoldap.mod16: enable compilation with long types
programs/wordpad: enable compilation with long types
programs/wuauserv: enable compilation with long types
programs/wusa: enable compilation with long types
programs/xcopy: enable compilation with long types
programs/sc/Makefile.in | 1 -
programs/sc/sc.c | 22 +++----
programs/services/Makefile.in | 1 -
programs/services/rpc.c | 48 +++++++--------
programs/services/services.c | 24 ++++----
programs/services/utils.c | 6 +-
programs/spoolsv/Makefile.in | 1 -
programs/spoolsv/main.c | 2 +-
programs/start/Makefile.in | 1 -
programs/start/start.c | 4 +-
programs/svchost/Makefile.in | 1 -
programs/svchost/svchost.c | 14 ++---
programs/termsv/Makefile.in | 1 -
programs/termsv/main.c | 2 +-
programs/uninstaller/Makefile.in | 1 -
programs/uninstaller/main.c | 8 +--
programs/whoami/Makefile.in | 1 -
programs/whoami/main.c | 4 +-
programs/wineboot/Makefile.in | 1 -
programs/wineboot/shutdown.c | 12 ++--
programs/wineboot/wineboot.c | 38 ++++++------
programs/winebrowser/Makefile.in | 1 -
programs/winebrowser/main.c | 6 +-
programs/winecfg/Makefile.in | 1 -
programs/winecfg/audio.c | 8 +--
programs/winecfg/drive.c | 14 ++---
programs/winecfg/driveui.c | 4 +-
programs/winecfg/main.c | 2 +-
programs/winecfg/winecfg.c | 14 ++---
programs/winecfg/x11drvdlg.c | 2 +-
programs/wineconsole/Makefile.in | 1 -
programs/wineconsole/wineconsole.c | 4 +-
programs/winedbg/Makefile.in | 1 -
programs/winedbg/be_i386.c | 12 ++--
programs/winedbg/be_x86_64.c | 6 +-
programs/winedbg/dbg.y | 2 +-
programs/winedbg/gdbproxy.c | 52 ++++++++--------
programs/winedbg/info.c | 26 ++++----
programs/winedbg/memory.c | 10 +--
programs/winedbg/stack.c | 12 ++--
programs/winedbg/symbol.c | 2 +-
programs/winedbg/tgt_active.c | 44 ++++++-------
programs/winedbg/tgt_minidump.c | 4 +-
programs/winedbg/types.c | 22 +++----
programs/winedbg/winedbg.c | 10 +--
programs/winedevice/Makefile.in | 1 -
programs/winedevice/device.c | 4 +-
programs/winemenubuilder/Makefile.in | 1 -
programs/winemenubuilder/winemenubuilder.c | 72 +++++++++++-----------
programs/winemsibuilder/Makefile.in | 1 -
programs/winemsibuilder/main.c | 6 +-
programs/winetest/Makefile.in | 1 -
programs/winetest/main.c | 6 +-
programs/winhlp32/Makefile.in | 1 -
programs/winhlp32/hlpfile.c | 38 ++++++------
programs/winhlp32/macro.c | 52 ++++++++--------
programs/winhlp32/winhelp.c | 6 +-
programs/winmgmt/Makefile.in | 1 -
programs/winmgmt/main.c | 2 +-
programs/winoldap.mod16/Makefile.in | 1 -
programs/winoldap.mod16/winoldap.c | 2 +-
programs/wordpad/Makefile.in | 1 -
programs/wordpad/olecallback.c | 8 +--
programs/wordpad/wordpad.c | 6 +-
programs/wuauserv/Makefile.in | 1 -
programs/wuauserv/main.c | 2 +-
programs/wusa/Makefile.in | 1 -
programs/wusa/main.c | 2 +-
programs/xcopy/Makefile.in | 1 -
programs/xcopy/xcopy.c | 14 ++---
70 files changed, 330 insertions(+), 354 deletions(-)
1
24
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/comctl32/Makefile.in | 2 +-
dlls/comctl32/animate.c | 80 ++++++++++----------
dlls/comctl32/combo.c | 6 +-
dlls/comctl32/comboex.c | 74 +++++++++---------
dlls/comctl32/commctrl.c | 53 ++++++-------
dlls/comctl32/datetime.c | 19 ++---
dlls/comctl32/dpa.c | 16 ++--
dlls/comctl32/draglist.c | 3 +-
dlls/comctl32/edit.c | 16 ++--
dlls/comctl32/flatsb.c | 7 +-
dlls/comctl32/header.c | 9 +--
dlls/comctl32/hotkey.c | 11 +--
dlls/comctl32/imagelist.c | 33 ++++----
dlls/comctl32/ipaddress.c | 6 +-
dlls/comctl32/listbox.c | 5 +-
dlls/comctl32/listview.c | 70 ++++++++---------
dlls/comctl32/monthcal.c | 27 +++----
dlls/comctl32/nativefont.c | 6 +-
dlls/comctl32/pager.c | 13 ++--
dlls/comctl32/progress.c | 6 +-
dlls/comctl32/propsheet.c | 30 ++++----
dlls/comctl32/rebar.c | 70 ++++++++---------
dlls/comctl32/smoothscroll.c | 4 +-
dlls/comctl32/static.c | 4 +-
dlls/comctl32/status.c | 12 +--
dlls/comctl32/syslink.c | 4 +-
dlls/comctl32/tab.c | 38 ++++------
dlls/comctl32/taskdialog.c | 2 +-
dlls/comctl32/toolbar.c | 143 +++++++++++++++--------------------
dlls/comctl32/tooltips.c | 26 +++----
dlls/comctl32/trackbar.c | 11 ++-
dlls/comctl32/treeview.c | 40 +++++-----
dlls/comctl32/updown.c | 9 +--
33 files changed, 401 insertions(+), 454 deletions(-)
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index 6c27e4c628a..c0272f2d7d4 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_COMCTL32_
+EXTRADEFS = -D_COMCTL32_
MODULE = comctl32.dll
IMPORTLIB = comctl32
IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index f7ac28ae4c1..fff963a6baa 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -508,16 +508,16 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah));
- TRACE("mah.dwMicroSecPerFrame=%d\n", infoPtr->mah.dwMicroSecPerFrame);
- TRACE("mah.dwMaxBytesPerSec=%d\n", infoPtr->mah.dwMaxBytesPerSec);
- TRACE("mah.dwPaddingGranularity=%d\n", infoPtr->mah.dwPaddingGranularity);
- TRACE("mah.dwFlags=%d\n", infoPtr->mah.dwFlags);
- TRACE("mah.dwTotalFrames=%d\n", infoPtr->mah.dwTotalFrames);
- TRACE("mah.dwInitialFrames=%d\n", infoPtr->mah.dwInitialFrames);
- TRACE("mah.dwStreams=%d\n", infoPtr->mah.dwStreams);
- TRACE("mah.dwSuggestedBufferSize=%d\n", infoPtr->mah.dwSuggestedBufferSize);
- TRACE("mah.dwWidth=%d\n", infoPtr->mah.dwWidth);
- TRACE("mah.dwHeight=%d\n", infoPtr->mah.dwHeight);
+ TRACE("mah.dwMicroSecPerFrame=%ld\n", infoPtr->mah.dwMicroSecPerFrame);
+ TRACE("mah.dwMaxBytesPerSec=%ld\n", infoPtr->mah.dwMaxBytesPerSec);
+ TRACE("mah.dwPaddingGranularity=%ld\n", infoPtr->mah.dwPaddingGranularity);
+ TRACE("mah.dwFlags=%ld\n", infoPtr->mah.dwFlags);
+ TRACE("mah.dwTotalFrames=%ld\n", infoPtr->mah.dwTotalFrames);
+ TRACE("mah.dwInitialFrames=%ld\n", infoPtr->mah.dwInitialFrames);
+ TRACE("mah.dwStreams=%ld\n", infoPtr->mah.dwStreams);
+ TRACE("mah.dwSuggestedBufferSize=%ld\n", infoPtr->mah.dwSuggestedBufferSize);
+ TRACE("mah.dwWidth=%ld\n", infoPtr->mah.dwWidth);
+ TRACE("mah.dwHeight=%ld\n", infoPtr->mah.dwHeight);
mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
@@ -543,17 +543,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
HIBYTE(LOWORD(infoPtr->ash.fccHandler)),
LOBYTE(HIWORD(infoPtr->ash.fccHandler)),
HIBYTE(HIWORD(infoPtr->ash.fccHandler)));
- TRACE("ash.dwFlags=%d\n", infoPtr->ash.dwFlags);
+ TRACE("ash.dwFlags=%ld\n", infoPtr->ash.dwFlags);
TRACE("ash.wPriority=%d\n", infoPtr->ash.wPriority);
TRACE("ash.wLanguage=%d\n", infoPtr->ash.wLanguage);
- TRACE("ash.dwInitialFrames=%d\n", infoPtr->ash.dwInitialFrames);
- TRACE("ash.dwScale=%d\n", infoPtr->ash.dwScale);
- TRACE("ash.dwRate=%d\n", infoPtr->ash.dwRate);
- TRACE("ash.dwStart=%d\n", infoPtr->ash.dwStart);
- TRACE("ash.dwLength=%d\n", infoPtr->ash.dwLength);
- TRACE("ash.dwSuggestedBufferSize=%d\n", infoPtr->ash.dwSuggestedBufferSize);
- TRACE("ash.dwQuality=%d\n", infoPtr->ash.dwQuality);
- TRACE("ash.dwSampleSize=%d\n", infoPtr->ash.dwSampleSize);
+ TRACE("ash.dwInitialFrames=%ld\n", infoPtr->ash.dwInitialFrames);
+ TRACE("ash.dwScale=%ld\n", infoPtr->ash.dwScale);
+ TRACE("ash.dwRate=%ld\n", infoPtr->ash.dwRate);
+ TRACE("ash.dwStart=%ld\n", infoPtr->ash.dwStart);
+ TRACE("ash.dwLength=%lu\n", infoPtr->ash.dwLength);
+ TRACE("ash.dwSuggestedBufferSize=%lu\n", infoPtr->ash.dwSuggestedBufferSize);
+ TRACE("ash.dwQuality=%lu\n", infoPtr->ash.dwQuality);
+ TRACE("ash.dwSampleSize=%lu\n", infoPtr->ash.dwSampleSize);
TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left,
infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right);
@@ -573,17 +573,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
mmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize);
- TRACE("bih.biSize=%d\n", infoPtr->inbih->biSize);
- TRACE("bih.biWidth=%d\n", infoPtr->inbih->biWidth);
- TRACE("bih.biHeight=%d\n", infoPtr->inbih->biHeight);
+ TRACE("bih.biSize=%lu\n", infoPtr->inbih->biSize);
+ TRACE("bih.biWidth=%ld\n", infoPtr->inbih->biWidth);
+ TRACE("bih.biHeight=%ld\n", infoPtr->inbih->biHeight);
TRACE("bih.biPlanes=%d\n", infoPtr->inbih->biPlanes);
TRACE("bih.biBitCount=%d\n", infoPtr->inbih->biBitCount);
- TRACE("bih.biCompression=%d\n", infoPtr->inbih->biCompression);
- TRACE("bih.biSizeImage=%d\n", infoPtr->inbih->biSizeImage);
- TRACE("bih.biXPelsPerMeter=%d\n", infoPtr->inbih->biXPelsPerMeter);
- TRACE("bih.biYPelsPerMeter=%d\n", infoPtr->inbih->biYPelsPerMeter);
- TRACE("bih.biClrUsed=%d\n", infoPtr->inbih->biClrUsed);
- TRACE("bih.biClrImportant=%d\n", infoPtr->inbih->biClrImportant);
+ TRACE("bih.biCompression=%lu\n", infoPtr->inbih->biCompression);
+ TRACE("bih.biSizeImage=%lu\n", infoPtr->inbih->biSizeImage);
+ TRACE("bih.biXPelsPerMeter=%lu\n", infoPtr->inbih->biXPelsPerMeter);
+ TRACE("bih.biYPelsPerMeter=%lu\n", infoPtr->inbih->biYPelsPerMeter);
+ TRACE("bih.biClrUsed=%lu\n", infoPtr->inbih->biClrUsed);
+ TRACE("bih.biClrImportant=%lu\n", infoPtr->inbih->biClrImportant);
mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
@@ -625,13 +625,15 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
numFrame++;
mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
}
- if (numFrame != infoPtr->mah.dwTotalFrames) {
- WARN("Found %d frames (/%d)\n", numFrame, infoPtr->mah.dwTotalFrames);
- return FALSE;
+ if (numFrame != infoPtr->mah.dwTotalFrames)
+ {
+ WARN("Found %lu frames (/%lu)\n", numFrame, infoPtr->mah.dwTotalFrames);
+ return FALSE;
}
- if (insize > infoPtr->ash.dwSuggestedBufferSize) {
- WARN("insize=%d suggestedSize=%d\n", insize, infoPtr->ash.dwSuggestedBufferSize);
- infoPtr->ash.dwSuggestedBufferSize = insize;
+ if (insize > infoPtr->ash.dwSuggestedBufferSize)
+ {
+ WARN("insize %lu suggestedSize %lu\n", insize, infoPtr->ash.dwSuggestedBufferSize);
+ infoPtr->ash.dwSuggestedBufferSize = insize;
}
infoPtr->indata = heap_alloc_zero(infoPtr->ash.dwSuggestedBufferSize);
@@ -818,7 +820,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs)
infoPtr->hbmPrevFrame = 0;
infoPtr->dwStyle = lpcs->style;
- TRACE("Animate style=0x%08x, parent=%p\n", infoPtr->dwStyle, infoPtr->hwndNotify);
+ TRACE("Animate style %#lx, parent %p\n", infoPtr->dwStyle, infoPtr->hwndNotify);
InitializeCriticalSection(&infoPtr->cs);
infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs");
@@ -859,8 +861,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc)
static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("%#Ix, styleOld %#lx, styleNew %#lx.\n", wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -875,7 +876,8 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
{
ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %#Ix, lparam %#Ix.\n", hWnd, uMsg, wParam, lParam);
+
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -953,7 +955,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %#x, wp %#Ix, lp %#Ix.\n", uMsg, wParam, lParam);
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c
index 2f3652c64bd..5876c2acbb8 100644
--- a/dlls/comctl32/combo.c
+++ b/dlls/comctl32/combo.c
@@ -1411,7 +1411,7 @@ static void COMBO_Size( HEADCOMBO *lphc )
*/
if( curComboHeight > newComboHeight )
{
- TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n",
+ TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%ld, oldDropTop=%ld\n",
curComboHeight, newComboHeight, lphc->droppedRect.bottom,
lphc->droppedRect.top);
lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight;
@@ -1663,7 +1663,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam
HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 );
HTHEME theme;
- TRACE("[%p]: msg %#x wp %08lx lp %08lx\n", hwnd, message, wParam, lParam );
+ TRACE("[%p]: msg %#x, wp %Ix, lp %Ix\n", hwnd, message, wParam, lParam );
if (!IsWindow(hwnd)) return 0;
@@ -2108,7 +2108,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam
default:
if (message >= WM_USER)
- WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", message - WM_USER, wParam, lParam );
+ WARN("unknown msg WM_USER+%04x, wp %Ix, lp %Ix\n", message - WM_USER, wParam, lParam );
break;
}
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 0f7e46949e4..5dc6b8d4ca0 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -140,7 +140,7 @@ static void COMBOEX_DumpItem (CBE_ITEMDATA const *item)
{
TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n",
item, item->mask, item->pszText, item->cchTextMax, item->iImage);
- TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
+ TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%Ix\n",
item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
if (item->mask & CBEIF_TEXT)
TRACE("item %p - pszText=%s\n", item, debugstr_txt(item->pszText));
@@ -149,12 +149,12 @@ static void COMBOEX_DumpItem (CBE_ITEMDATA const *item)
static void COMBOEX_DumpInput (COMBOBOXEXITEMW const *input)
{
- TRACE("input - mask=%08x, iItem=%ld, pszText=%p, cchTM=%d, iImage=%d\n",
+ TRACE("input - mask=%08x, iItem=%Id, pszText=%p, cchTM=%d, iImage=%d\n",
input->mask, input->iItem, input->pszText, input->cchTextMax,
input->iImage);
if (input->mask & CBEIF_TEXT)
TRACE("input - pszText=<%s>\n", debugstr_txt(input->pszText));
- TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
+ TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%Ix\n",
input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
}
@@ -336,7 +336,7 @@ static void COMBOEX_GetComboFontSize (const COMBOEX_INFO *infoPtr, SIZE *size)
GetTextExtentPointW (mydc, L"A", 1, size);
SelectObject (mydc, ofont);
ReleaseDC (0, mydc);
- TRACE("selected font hwnd=%p, height=%d\n", nfont, size->cy);
+ TRACE("selected font hwnd %p, height %ld\n", nfont, size->cy);
}
@@ -390,7 +390,7 @@ static void COMBOEX_AdjustEditPos (const COMBOEX_INFO *infoPtr)
/* reposition the Edit control based on whether icon exists */
COMBOEX_GetComboFontSize (infoPtr, &mysize);
- TRACE("Combo font x=%d, y=%d\n", mysize.cx, mysize.cy);
+ TRACE("Combo font x %ld, y %ld\n", mysize.cx, mysize.cy);
x = xioff + CBE_STARTOFFSET + 1;
w = rect.right-rect.left - x - GetSystemMetrics(SM_CXVSCROLL) - 1;
h = mysize.cy + 1;
@@ -413,7 +413,7 @@ static void COMBOEX_ReSize (const COMBOEX_INFO *infoPtr)
cy = mysize.cy + CBE_EXTRA;
if (infoPtr->himl && ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo)) {
cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy);
- TRACE("upgraded height due to image: height=%d\n", cy);
+ TRACE("upgraded height due to image: height %ld\n", cy);
}
SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, -1, cy);
if (infoPtr->hwndCombo) {
@@ -509,7 +509,7 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf)
static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index)
{
- TRACE("(index=%ld)\n", index);
+ TRACE("index %Id\n", index);
/* if item number requested does not exist then return failure */
if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR;
@@ -696,7 +696,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style)
{
DWORD dwTemp;
- TRACE("(mask=x%08x, style=0x%08x)\n", mask, style);
+ TRACE("mask %#lx, style %#lx\n", mask, style);
dwTemp = infoPtr->dwExtStyle;
@@ -714,8 +714,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style)
mask = CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT;
if ((infoPtr->dwExtStyle & mask) != (dwTemp & mask)) {
/* if state of EX_NOEDITIMAGE changes, invalidate all */
- TRACE("EX_NOEDITIMAGE state changed to %d\n",
- infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
+ TRACE("EX_NOEDITIMAGE state changed to %#lx\n", infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);
COMBOEX_AdjustEditPos (infoPtr);
if (infoPtr->hwndEdit)
@@ -865,10 +864,10 @@ static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT_PTR index)
return CB_ERR;
}
if (item1->mask & CBEIF_LPARAM) ret = item1->lParam;
- TRACE("returning 0x%08lx\n", ret);
+ TRACE("returning %#Ix\n", ret);
} else {
ret = (DWORD_PTR)item1;
- TRACE("non-valid result from combo, returning 0x%08lx\n", ret);
+ TRACE("non-valid result from combo, returning %#Ix\n", ret);
}
return ret;
}
@@ -882,7 +881,7 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT_PTR index)
if (!(item = COMBOEX_FindItem(infoPtr, index)))
return SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, index, 0);
- TRACE("selecting item %ld text=%s\n", index, debugstr_txt(item->pszText));
+ TRACE("selecting item %Id text=%s\n", index, debugstr_txt(item->pszText));
infoPtr->selected = index;
sel = (INT)SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, index, 0);
@@ -905,7 +904,7 @@ static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT_PTR index, DWOR
}
item1->mask |= CBEIF_LPARAM;
item1->lParam = data;
- TRACE("setting lparam to 0x%08lx\n", data);
+ TRACE("setting lparam to %#Ix\n", data);
return 0;
}
TRACE("non-valid result from combo %p\n", item1);
@@ -932,7 +931,7 @@ static INT COMBOEX_SetItemHeight (COMBOEX_INFO const *infoPtr, INT index, UINT h
- (cbx_crect.bottom-cbx_crect.top);
TRACE("EX window=(%s), client=(%s)\n",
wine_dbgstr_rect(&cbx_wrect), wine_dbgstr_rect(&cbx_crect));
- TRACE("CB window=(%s), EX setting=(0,0)-(%d,%d)\n",
+ TRACE("CB window=(%s), EX setting=(0,0)-(%ld,%d)\n",
wine_dbgstr_rect(&cbx_wrect), cbx_wrect.right-cbx_wrect.left, height);
SetWindowPos (infoPtr->hwndSelf, HWND_TOP, 0, 0,
cbx_wrect.right-cbx_wrect.left, height,
@@ -1157,7 +1156,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam)
*/
oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
- ERR("item %ld not found. Problem!\n", oldItem);
+ ERR("item %Id not found. Problem!\n", oldItem);
break;
}
infoPtr->selected = oldItem;
@@ -1212,7 +1211,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const
NMCOMBOBOXEXW nmcit;
UINT i;
- TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n",
+ TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%Ix\n",
dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
if (dis->itemID >= infoPtr->nb_items) return FALSE;
@@ -1268,7 +1267,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di
dis->CtlType, dis->CtlID);
TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
dis->itemID, dis->itemAction, dis->itemState);
- TRACE("hWnd=%p hDC=%p (%s) itemData=0x%08lx\n",
+ TRACE("hWnd=%p hDC=%p (%s) itemData=%#Ix\n",
dis->hwndItem, dis->hDC, wine_dbgstr_rect(&dis->rcItem), dis->itemData);
/* MSDN says: */
@@ -1556,10 +1555,10 @@ static LRESULT COMBOEX_NCCreate (HWND hwnd)
oldstyle = (DWORD)GetWindowLongW (hwnd, GWL_STYLE);
newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL | WS_BORDER);
- if (newstyle != oldstyle) {
- TRACE("req style %08x, resetting style %08x\n",
- oldstyle, newstyle);
- SetWindowLongW (hwnd, GWL_STYLE, newstyle);
+ if (newstyle != oldstyle)
+ {
+ TRACE("req style %#lx, resetting style %#lx\n", oldstyle, newstyle);
+ SetWindowLongW (hwnd, GWL_STYLE, newstyle);
}
return 1;
}
@@ -1623,7 +1622,7 @@ static LRESULT COMBOEX_WindowPosChanging (const COMBOEX_INFO *infoPtr, WINDOWPOS
wp->x, wp->y, wp->cx, wp->cy, wp->flags);
TRACE("EX window=(%s), client=(%s)\n",
wine_dbgstr_rect(&cbx_wrect), wine_dbgstr_rect(&cbx_crect));
- TRACE("CB window=(%s), EX setting=(0,0)-(%d,%d)\n",
+ TRACE("CB window=(%s), EX setting=(0,0)-(%d,%ld)\n",
wine_dbgstr_rect(&cbx_wrect), width, cb_wrect.bottom-cb_wrect.top);
if (width) SetWindowPos (infoPtr->hwndCombo, HWND_TOP, 0, 0,
@@ -1658,8 +1657,8 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
RECT rect;
LRESULT lret;
- TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n",
- hwnd, uMsg, wParam, lParam, infoPtr);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix, info_ptr=%p\n",
+ hwnd, uMsg, wParam, lParam, infoPtr);
if (uMsg == WM_NCDESTROY)
RemoveWindowSubclass(hwnd, COMBOEX_EditWndProc, EDIT_SUBCLASSID);
@@ -1706,7 +1705,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
InvalidateRect (infoPtr->hwndCombo, 0, 0);
if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
- ERR("item %ld not found. Problem!\n", oldItem);
+ ERR("item %Id not found. Problem!\n", oldItem);
break;
}
infoPtr->selected = oldItem;
@@ -1727,10 +1726,8 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
if (selected != -1) {
cmp_func_t cmptext = get_cmp_func(infoPtr);
item = COMBOEX_FindItem (infoPtr, selected);
- TRACE("handling VK_RETURN, selected = %ld, selected_text=%s\n",
- selected, debugstr_txt(item->pszText));
- TRACE("handling VK_RETURN, edittext=%s\n",
- debugstr_w(edit_text));
+ TRACE("handling VK_RETURN, selected = %Id, selected_text=%s\n", selected, debugstr_txt(item->pszText));
+ TRACE("handling VK_RETURN, edittext=%s\n", debugstr_w(edit_text));
if (cmptext (COMBOEX_GetText(infoPtr, item), edit_text)) {
/* strings not equal -- indicate edit has changed */
selected = -1;
@@ -1817,8 +1814,8 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
POINT pt;
WCHAR edit_text[260];
- TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n",
- hwnd, uMsg, wParam, lParam, infoPtr);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix, info_ptr %p\n",
+ hwnd, uMsg, wParam, lParam, infoPtr);
if (uMsg == WM_NCDESTROY)
RemoveWindowSubclass(hwnd, COMBOEX_ComboWndProc, COMBO_SUBCLASSID);
@@ -1953,8 +1950,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
lastwrk = COMBOEX_GetText(infoPtr, item);
}
- TRACE("handling EN_CHANGE, selected = %ld, selected_text=%s\n",
- selected, debugstr_w(lastwrk));
+ TRACE("handling EN_CHANGE, selected = %Id, selected_text=%s\n", selected, debugstr_w(lastwrk));
TRACE("handling EN_CHANGE, edittext=%s\n",
debugstr_w(edit_text));
@@ -1987,7 +1983,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
- TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr) {
if (uMsg == WM_CREATE)
@@ -2154,10 +2150,10 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
COMCTL32_RefreshSysColors();
return 0;
- default:
- if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",uMsg,wParam,lParam);
- return DefWindowProcW (hwnd, uMsg, wParam, lParam);
+ default:
+ if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
+ ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n",uMsg,wParam,lParam);
+ return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index c707703ccd2..57863928fc7 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -167,7 +167,7 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
+ TRACE("%p, %#lx, %p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
@@ -293,8 +293,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
switch (uMsg) {
case WM_MENUSELECT:
- TRACE("WM_MENUSELECT wParam=0x%lX lParam=0x%lX\n",
- wParam, lParam);
+ TRACE("WM_MENUSELECT wParam %#Ix, lParam %#Ix\n", wParam, lParam);
if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
/* menu was closed */
@@ -323,8 +322,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
break;
case WM_COMMAND :
- TRACE("WM_COMMAND wParam=0x%lX lParam=0x%lX\n",
- wParam, lParam);
+ TRACE("WM_COMMAND wParam %#Ix, lParam %#Ix\n", wParam, lParam);
/* WM_COMMAND is not invalid since it is documented
* in the windows api reference. So don't output
* any FIXME for WM_COMMAND
@@ -374,7 +372,7 @@ ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo)
{
LPINT lpMenuId;
- TRACE("%p, %lx, %p\n", hwnd, uFlags, lpInfo);
+ TRACE("%p, %Ix, %p\n", hwnd, uFlags, lpInfo);
if (lpInfo == NULL)
return FALSE;
@@ -715,7 +713,7 @@ InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls)
if (!lpInitCtrls || lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX))
return FALSE;
- TRACE("(0x%08x)\n", lpInitCtrls->dwICC);
+ TRACE("%#lx\n", lpInitCtrls->dwICC);
return TRUE;
}
@@ -977,9 +975,8 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
pdvi->dwBuildNumber = 2919;
pdvi->dwPlatformID = 6304;
- TRACE("%u.%u.%u.%u\n",
- pdvi->dwMajorVersion, pdvi->dwMinorVersion,
- pdvi->dwBuildNumber, pdvi->dwPlatformID);
+ TRACE("%lu.%lu.%lu.%lu\n", pdvi->dwMajorVersion, pdvi->dwMinorVersion,
+ pdvi->dwBuildNumber, pdvi->dwPlatformID);
return S_OK;
}
@@ -1084,7 +1081,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
LPSUBCLASS_INFO stack;
LPSUBCLASSPROCS proc;
- TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
+ TRACE("%p, %p, %Ix, %Ix\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
if (!hWnd || !pfnSubclass)
return FALSE;
@@ -1171,7 +1168,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
const SUBCLASS_INFO *stack;
const SUBCLASSPROCS *proc;
- TRACE ("(%p, %p, %lx, %p)\n", hWnd, pfnSubclass, uID, pdwRef);
+ TRACE("%p, %p, %Ix, %p\n", hWnd, pfnSubclass, uID, pdwRef);
/* See if we have been called for this window */
stack = GetPropW (hWnd, COMCTL32_wSubclass);
@@ -1214,7 +1211,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u
LPSUBCLASSPROCS proc;
BOOL ret = FALSE;
- TRACE ("(%p, %p, %lx)\n", hWnd, pfnSubclass, uID);
+ TRACE("%p, %p, %Ix.\n", hWnd, pfnSubclass, uID);
/* Find the Subclass to remove */
stack = GetPropW (hWnd, COMCTL32_wSubclass);
@@ -1267,8 +1264,8 @@ static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam
LPSUBCLASS_INFO stack;
LPSUBCLASSPROCS proc;
LRESULT ret;
-
- TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam);
+
+ TRACE("%p, %#x, %#Ix, %#Ix\n", hWnd, uMsg, wParam, lParam);
stack = GetPropW (hWnd, COMCTL32_wSubclass);
if (!stack) {
@@ -1317,8 +1314,8 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
{
LPSUBCLASS_INFO stack;
LRESULT ret;
-
- TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam);
+
+ TRACE("%p, %#x, %#Ix, %#Ix\n", hWnd, uMsg, wParam, lParam);
/* retrieve our little stack from the Properties */
stack = GetPropW (hWnd, COMCTL32_wSubclass);
@@ -1669,7 +1666,7 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD
COLORREF clr;
RECT r;
- FIXME("(%p, %s, %d, %p, 0x%08x, 0x%08x, 0x%08x, %d, %d): semi-stub\n", hdc, debugstr_w(text),
+ FIXME("%p, %s, %d, %p, %#lx, %#lx, %#lx, %d, %d: semi-stub\n", hdc, debugstr_w(text),
length, rect, flags, crText, crShadow, offset_x, offset_y);
bkmode = SetBkMode(hdc, TRANSPARENT);
@@ -1972,7 +1969,7 @@ static void MRU_SaveChanged(WINEMRULIST *mp)
{
ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err);
}
- TRACE("saving value for name /%s/ size=%d\n", debugstr_w(realname), witem->size);
+ TRACE("saving value for name /%s/ size %ld\n", debugstr_w(realname), witem->size);
}
}
RegCloseKey(newkey);
@@ -2071,7 +2068,7 @@ INT WINAPI FindMRUData(HANDLE hList, const void *data, DWORD cbData, int *pos)
if (pos && (ret != -1))
*pos = 'a' + i;
- TRACE("%p, %p, %d, %p, returning %d.\n", hList, data, cbData, pos, ret);
+ TRACE("%p, %p, %ld, %p, returning %d.\n", hList, data, cbData, pos, ret);
return ret;
}
@@ -2131,7 +2128,7 @@ INT WINAPI AddMRUData(HANDLE hList, const void *data, DWORD cbData)
mp->wineFlags |= WMRUF_CHANGED;
mp->realMRU[0] = replace + 'a';
- TRACE("(%p, %p, %d) adding data, /%c/ now most current\n", hList, data, cbData, replace+'a');
+ TRACE("%p, %p, %ld adding data, /%c/ now most current\n", hList, data, cbData, replace+'a');
if (!(mp->extview.fFlags & MRU_CACHEWRITE))
{
@@ -2268,7 +2265,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp)
KEY_READ | KEY_WRITE, 0, &newkey, &dwdisp)))
{
/* error - what to do ??? */
- ERR("(%u %u %x %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
+ ERR("%lu, %u, %x, %p, %s, %p: Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, err);
return 0;
}
@@ -2286,7 +2283,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp)
else
datasize /= sizeof(WCHAR);
- TRACE("MRU list = %s, datasize = %d\n", debugstr_w(mp->realMRU), datasize);
+ TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize);
mp->cursize = datasize - 1;
/* datasize now has number of items in the MRUList */
@@ -2314,7 +2311,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp)
else
mp->cursize = 0;
- TRACE("(%u %u %x %p %s %p): Current Size = %d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
+ TRACE("%lu, %u, %x, %p, %s, %p: Current Size = %ld\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, mp->cursize);
return mp;
}
@@ -2412,7 +2409,7 @@ INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS
witem = mp->array[desired];
datasize = min(witem->size, nBufferSize);
memcpy(buffer, &witem->datastart, datasize);
- TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize);
+ TRACE("(%p, %d, %p, %ld): returning len %d\n", hList, nItemPos, buffer, nBufferSize, datasize);
return datasize;
}
@@ -2446,7 +2443,7 @@ INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS
((char *)buffer)[ datasize - 1 ] = '\0';
datasize = lenA - 1;
}
- TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize);
+ TRACE("(%p, %d, %p, %ld): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize);
return datasize;
}
@@ -2606,7 +2603,7 @@ static LRESULT DoNotify(const struct NOTIFYDATA *notify, UINT code, NMHDR *hdr)
NMHDR *lpNmh = NULL;
UINT idFrom = 0;
- TRACE("%p, %p, %d, %p, %#x.\n", notify->hwndFrom, notify->hwndTo, code, hdr, notify->dwParam5);
+ TRACE("%p, %p, %d, %p, %#lx.\n", notify->hwndFrom, notify->hwndTo, code, hdr, notify->dwParam5);
if (!notify->hwndTo)
return 0;
@@ -2676,7 +2673,7 @@ LRESULT WINAPI SendNotifyEx(HWND hwndTo, HWND hwndFrom, UINT code, NMHDR *hdr, D
struct NOTIFYDATA notify;
HWND hwndNotify;
- TRACE("(%p %p %d %p %#x)\n", hwndFrom, hwndTo, code, hdr, dwParam5);
+ TRACE("%p, %p, %d, %p, %#lx\n", hwndFrom, hwndTo, code, hdr, dwParam5);
hwndNotify = hwndTo;
if (!hwndTo)
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index f8827d4e26c..f142ea8ede5 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -1455,7 +1455,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height)
infoPtr->rcClient.bottom = height;
infoPtr->rcClient.right = width;
- TRACE("Height=%d, Width=%d\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right);
+ TRACE("Height %ld, Width %ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right);
infoPtr->rcDraw = infoPtr->rcClient;
@@ -1489,8 +1489,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height)
static LRESULT
DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
/* block DTS_SHOWNONE change */
if ((lpss->styleNew ^ lpss->styleOld) & DTS_SHOWNONE)
@@ -1507,8 +1506,7 @@ DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *l
static LRESULT
DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -1595,7 +1593,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size)
size->cx += 12;
size->cy += 4;
- TRACE("cx=%d cy=%d\n", size->cx, size->cy);
+ TRACE("cx %ld, cy %ld\n", size->cx, size->cy);
return TRUE;
}
@@ -1710,7 +1708,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0));
- TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam);
+ TRACE("%x, %Ix, %Ix\n", uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcW( hwnd, uMsg, wParam, lParam );
@@ -1839,10 +1837,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return CB_ERR;
default:
- if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
- return DefWindowProcW (hwnd, uMsg, wParam, lParam);
+ if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
+ return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index 6dce9575b59..b8d23f6cafa 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -110,7 +110,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
if (errCode != S_OK)
return errCode;
- TRACE ("dwSize=%u dwData2=%u dwItems=%u\n",
+ TRACE ("dwSize=%lu dwData2=%lu dwItems=%lu\n",
streamData.dwSize, streamData.dwData2, streamData.dwItems);
if (ulRead < sizeof(STREAMDATA) ||
@@ -152,7 +152,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
/* store the handle to the dpa */
*phDpa = hDpa;
- TRACE ("new hDpa=%p, errorcode=%x\n", hDpa, errCode);
+ TRACE ("new hDpa=%p, errorcode %lx\n", hDpa, errCode);
return errCode;
}
@@ -271,8 +271,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags,
INT nResult, i;
INT nIndex;
- TRACE("(%p %p %08x %p %p %08lx)\n",
- hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
+ TRACE("%p, %p, %#lx, %p, %p, %#Ix\n", hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
if (IsBadWritePtr (hdpa1, sizeof(*hdpa1)))
return FALSE;
@@ -526,7 +525,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew)
*/
LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex)
{
- TRACE("(%p %ld)\n", hdpa, nIndex);
+ TRACE("%p, %Id\n", hdpa, nIndex);
if (!hdpa)
return NULL;
@@ -535,7 +534,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex)
return NULL;
}
if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) {
- WARN("not enough pointers in array (%ld vs %d).\n",nIndex,hdpa->nItemCount);
+ WARN("not enough pointers in array (%Id vs %d).\n",nIndex,hdpa->nItemCount);
return NULL;
}
@@ -815,7 +814,7 @@ BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
if (!hdpa || !pfnCompare)
return FALSE;
- TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam);
+ TRACE("%p, %p, %#Ix\n", hdpa, pfnCompare, lParam);
if ((hdpa->nItemCount > 1) && (hdpa->ptrs))
DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1,
@@ -848,8 +847,7 @@ INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart,
if (!hdpa || !pfnCompare || !pFind)
return -1;
- TRACE("(%p %p %d %p 0x%08lx 0x%08x)\n",
- hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
+ TRACE("%p, %p, %d, %p, %#Ix, %#x\n", hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
if (uOptions & DPAS_SORTED) {
/* array is sorted --> use binary search */
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index ed52e5e9068..183e4e82beb 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -292,8 +292,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
INT nIndex;
DWORD dwScrollTime;
- TRACE("(%p %d x %d %s)\n",
- hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
+ TRACE("%p, %ld x %ld, %s\n", hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
ScreenToClient (hwndLB, &pt);
GetClientRect (hwndLB, &rcClient);
diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c
index d9354a107b1..f89e11c9203 100644
--- a/dlls/comctl32/edit.c
+++ b/dlls/comctl32/edit.c
@@ -349,7 +349,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD
NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa);
if (FAILED(hr))
{
- WARN("ScriptStringAnalyse failed (%x)\n",hr);
+ WARN("ScriptStringAnalyse failed, hr %#lx.\n", hr);
line_def->ssa = NULL;
}
@@ -2355,7 +2355,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es)
/* The text buffer handle belongs to the app */
es->hlocapp = es->hloc32W;
- TRACE("Returning %p, LocalSize() = %ld\n", es->hlocapp, LocalSize(es->hlocapp));
+ TRACE("Returning %p, LocalSize() = %Id\n", es->hlocapp, LocalSize(es->hlocapp));
return es->hlocapp;
}
@@ -3896,7 +3896,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES
} else if (GWL_EXSTYLE == which) {
; /* FIXME - what is needed here */
} else {
- WARN ("Invalid style change %ld\n",which);
+ WARN ("Invalid style change %#Ix.\n", which);
}
return 0;
@@ -4045,7 +4045,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos)
INT fw = es->format_rect.right - es->format_rect.left;
ret = es->text_width ? es->x_offset * 100 / (es->text_width - fw) : 0;
}
- TRACE("EM_GETTHUMB: returning %ld\n", ret);
+ TRACE("EM_GETTHUMB: returning %Id\n", ret);
return ret;
}
case EM_LINESCROLL:
@@ -4168,7 +4168,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos)
INT vlc = get_vertical_line_count(es);
ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0;
}
- TRACE("EM_GETTHUMB: returning %ld\n", ret);
+ TRACE("EM_GETTHUMB: returning %Id\n", ret);
return ret;
}
case EM_LINESCROLL:
@@ -4401,7 +4401,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs)
EDITSTATE *es;
UINT alloc_size;
- TRACE("Creating edit control, style = %08x\n", lpcs->style);
+ TRACE("Creating edit control, style = %#lx\n", lpcs->style);
if (!(es = heap_alloc_zero(sizeof(*es))))
return FALSE;
@@ -4600,7 +4600,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
LRESULT result = 0;
RECT *rect;
- TRACE("hwnd=%p msg=%#x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd %p, msg %#x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam);
if (!es && msg != WM_NCCREATE)
return DefWindowProcW(hwnd, msg, wParam, lParam);
@@ -5108,7 +5108,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
if (IsWindow(hwnd) && es && msg != EM_GETHANDLE)
EDIT_UnlockBuffer(es, FALSE);
- TRACE("hwnd=%p msg=%x -- 0x%08lx\n", hwnd, msg, result);
+ TRACE("hwnd=%p msg=%x -- %#Ix\n", hwnd, msg, result);
return result;
}
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index 66e25c307fa..1cedca98a6c 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -227,7 +227,7 @@ FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)
static LRESULT
FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam);
+ TRACE("[%p] wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam);
return 0;
}
@@ -235,7 +235,7 @@ FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT
FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam);
+ TRACE("[%p] wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam);
return 0;
}
@@ -256,8 +256,7 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 8bb39261dd1..be4c5616bb7 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -2094,8 +2094,7 @@ static LRESULT HEADER_SetRedraw(HEADER_INFO *infoPtr, WPARAM wParam, LPARAM lPar
static INT HEADER_StyleChanged(HEADER_INFO *infoPtr, WPARAM wStyleType,
const STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -2128,7 +2127,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
HEADER_INFO *infoPtr = (HEADER_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, msg, wParam, lParam);
+
if (!infoPtr && (msg != WM_CREATE))
return DefWindowProcW (hwnd, msg, wParam, lParam);
switch (msg) {
@@ -2266,8 +2266,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default:
if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg))
- ERR("unknown msg %04x wp=%04lx lp=%08lx\n",
- msg, wParam, lParam );
+ ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n", msg, wParam, lParam );
return DefWindowProcW(hwnd, msg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index 7808660e7f5..f27b71e3124 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -290,7 +290,7 @@ HOTKEY_KeyDown (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags)
if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED)
return 0;
- TRACE("() Key: %d\n", key);
+ TRACE("() Key: %ld\n", key);
wOldHotKey = infoPtr->HotKey;
bOldMod = infoPtr->CurrMod;
@@ -350,7 +350,7 @@ HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key)
if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED)
return 0;
- TRACE("() Key: %d\n", key);
+ TRACE("() Key: %ld\n", key);
bOldMod = infoPtr->CurrMod;
@@ -511,7 +511,9 @@ static LRESULT WINAPI
HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
HOTKEY_INFO *infoPtr = (HOTKEY_INFO *)GetWindowLongPtrW (hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+
+ TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
+
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -577,8 +579,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
return 0;
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 155d4b2a956..22d8d8c40e0 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -342,13 +342,13 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount)
imagelist_get_bitmap_size(himl, nNewCount, &sz);
- TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, sz.cy, nNewCount);
+ TRACE("Create expanded bitmaps : himl=%p x=%ld y=%ld count=%d\n", himl, sz.cx, sz.cy, nNewCount);
hdcBitmap = CreateCompatibleDC (0);
hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount);
if (hbmNewBitmap == 0)
- ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, sz.cy);
+ ERR("creating new image bitmap (x=%ld y=%ld)!\n", sz.cx, sz.cy);
if (himl->cCurImage)
{
@@ -527,7 +527,8 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask)
HBITMAP hMaskBitmap;
COLORREF bkColor;
- TRACE("himl=%p hbitmap=%p clrmask=%x\n", himl, hBitmap, clrMask);
+ TRACE("himl %p, hbitmap %p, clrmask %#lx\n", himl, hBitmap, clrMask);
+
if (!is_valid(himl))
return -1;
@@ -2209,7 +2210,7 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi)
if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader)))
return NULL;
- TRACE("width %u, height %u, planes %u, bpp %u\n",
+ TRACE("width %lu, height %lu, planes %u, bpp %u\n",
bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight,
bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount);
@@ -2793,7 +2794,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
BOOL WINAPI
ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
{
- FIXME("(%p 0x%x 0x%x):empty stub!\n", himl, i, dwFilter);
+ FIXME("%p, %d, %#lx:empty stub!\n", himl, i, dwFilter);
return FALSE;
}
@@ -2818,7 +2819,7 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
DWORD WINAPI
ImageList_SetFlags(HIMAGELIST himl, DWORD flags)
{
- FIXME("(%p %08x):empty stub\n", himl, flags);
+ FIXME("(%p %#lx):empty stub\n", himl, flags);
return 0;
}
@@ -3043,7 +3044,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm)
if (!result)
goto failed;
- TRACE("width %u, height %u, planes %u, bpp %u\n",
+ TRACE("width %lu, height %lu, planes %u, bpp %u\n",
bmih->biWidth, bmih->biHeight,
bmih->biPlanes, bmih->biBitCount);
@@ -3063,7 +3064,7 @@ failed:
*/
HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm)
{
- FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm);
+ FIXME("%p %#lx %p: semi-stub\n", himl, flags, pstm);
return ImageList_Write(himl, pstm) ? S_OK : E_FAIL;
}
@@ -3140,7 +3141,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count)
char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)];
BITMAPINFO *bmi = (BITMAPINFO *)buffer;
- TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n",
+ TRACE("Creating DIBSection %ld x %ld, %d Bits per Pixel\n",
sz.cx, sz.cy, himl->uBitsPixel);
memset( buffer, 0, sizeof(buffer) );
@@ -3272,7 +3273,7 @@ static ULONG WINAPI ImageListImpl_AddRef(IImageList2 *iface)
HIMAGELIST imgl = impl_from_IImageList2(iface);
ULONG ref = InterlockedIncrement(&imgl->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("%p, refcount %lu\n", iface, ref);
return ref;
}
@@ -3281,7 +3282,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface)
HIMAGELIST This = impl_from_IImageList2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("%p, refcount %lu\n", iface, ref);
if (ref == 0)
{
@@ -3673,7 +3674,7 @@ static HRESULT WINAPI ImageListImpl_Resize(IImageList2 *iface, INT cx, INT cy)
static HRESULT WINAPI ImageListImpl_GetOriginalSize(IImageList2 *iface, INT image, DWORD flags, INT *cx, INT *cy)
{
- FIXME("(%p)->(%d %x %p %p): stub\n", iface, image, flags, cx, cy);
+ FIXME("(%p)->(%d %lx %p %p): stub\n", iface, image, flags, cx, cy);
return E_NOTIMPL;
}
@@ -3697,13 +3698,13 @@ static HRESULT WINAPI ImageListImpl_GetCallback(IImageList2 *iface, REFIID riid,
static HRESULT WINAPI ImageListImpl_ForceImagePresent(IImageList2 *iface, INT image, DWORD flags)
{
- FIXME("(%p)->(%d %x): stub\n", iface, image, flags);
+ FIXME("(%p)->(%d %lx): stub\n", iface, image, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI ImageListImpl_DiscardImages(IImageList2 *iface, INT first_image, INT last_image, DWORD flags)
{
- FIXME("(%p)->(%d %d %x): stub\n", iface, first_image, last_image, flags);
+ FIXME("(%p)->(%d %d %lx): stub\n", iface, first_image, last_image, flags);
return E_NOTIMPL;
}
@@ -3727,14 +3728,14 @@ static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT c
static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags)
{
- FIXME("(%p)->(%d %p %p %p %x): stub\n", iface, i, image, mask, unk, flags);
+ FIXME("(%p)->(%d %p %p %p %lx): stub\n", iface, i, image, mask, unk, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI ImageListImpl_ReplaceFromImageList(IImageList2 *iface, INT i, IImageList *imagelist, INT src,
IUnknown *unk, DWORD flags)
{
- FIXME("(%p)->(%d %p %d %p %x): stub\n", iface, i, imagelist, src, unk, flags);
+ FIXME("(%p)->(%d %p %d %p %lx): stub\n", iface, i, imagelist, src, unk, flags);
return E_NOTIMPL;
}
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index f24fb4a9335..146a5a5ae1f 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -509,7 +509,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
INT index, len = 0, startsel, endsel;
IPPART_INFO *part;
- TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg 0x%x, wparam %#Ix, lparam %#Ix\n", hwnd, uMsg, wParam, lParam);
if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0)
{
@@ -592,7 +592,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0);
- TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg 0x%x, wparam %#Ix, lparam %#Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -654,7 +654,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
return 0;
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 1edb233f104..08bc4db4362 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2683,7 +2683,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
}
if (descr->style & LBS_COMBOBOX) lphc = descr->lphc;
- TRACE("[%p]: msg %#x wp %08lx lp %08lx\n", descr->self, msg, wParam, lParam );
+ TRACE("[%p]: msg %#x, wp %Ix, lp %Ix\n", descr->self, msg, wParam, lParam );
switch(msg)
{
@@ -3143,8 +3143,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
default:
if ((msg >= WM_USER) && (msg < 0xc000))
- WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n",
- hwnd, msg, wParam, lParam );
+ WARN("[%p]: unknown msg %04x, wp %Ix, lp %Ix\n", hwnd, msg, wParam, lParam );
}
return DefWindowProcW( hwnd, msg, wParam, lParam );
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 4176fb72c63..cd7fec28e27 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -407,13 +407,13 @@ typedef struct tagLISTVIEW_INFO
/* Dump the LISTVIEW_INFO structure to the debug channel */
#define LISTVIEW_DUMP(iP) do { \
- TRACE("hwndSelf=%p, clrBk=0x%06x, clrText=0x%06x, clrTextBk=0x%06x, ItemHeight=%d, ItemWidth=%d, Style=0x%08x\n", \
+ TRACE("hwndSelf=%p, clrBk=%#lx, clrText=%#lx, clrTextBk=%#lx, ItemHeight=%d, ItemWidth=%d, Style=%#lx\n", \
iP->hwndSelf, iP->clrBk, iP->clrText, iP->clrTextBk, \
iP->nItemHeight, iP->nItemWidth, iP->dwStyle); \
- TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08x, Focus=%d\n", \
+ TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=%#lx, Focus=%d\n", \
iP->hwndSelf, iP->himlNormal, iP->himlSmall, iP->himlState, \
iP->nFocusedItem, iP->nHotItem, iP->dwLvExStyle, iP->bFocus ); \
- TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%d, icSz.cy=%d, icSp.cx=%d, icSp.cy=%d, notifyFmt=%d\n", \
+ TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \
iP->hwndSelf, iP->ntmHeight, iP->iconSize.cx, iP->iconSize.cy, \
iP->iconSpacing.cx, iP->iconSpacing.cy, iP->notifyFormat); \
TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, wine_dbgstr_rect(&iP->rcList)); \
@@ -607,7 +607,7 @@ static const char* debugnmlistview(const NMLISTVIEW *plvnm)
{
if (!plvnm) return "(null)";
return wine_dbg_sprintf("iItem=%d, iSubItem=%d, uNewState=0x%x,"
- " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld",
+ " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%Id",
plvnm->iItem, plvnm->iSubItem, plvnm->uNewState, plvnm->uOldState,
plvnm->uChanged, wine_dbgstr_point(&plvnm->ptAction), plvnm->lParam);
}
@@ -637,7 +637,7 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW)
if (len == -1) goto end;
buf += len; size -= len;
if (lpLVItem->mask & LVIF_PARAM)
- len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam);
+ len = snprintf(buf, size, "lParam=%Ix, ", lpLVItem->lParam);
else len = 0;
if (len == -1) goto end;
buf += len; size -= len;
@@ -829,7 +829,7 @@ static LRESULT notify_hdr(const LISTVIEW_INFO *infoPtr, INT code, LPNMHDR pnmh)
pnmh->code = code;
result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh);
- TRACE(" <= %ld\n", result);
+ TRACE(" <= %Id\n", result);
return result;
}
@@ -2930,7 +2930,7 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr)
{
INT nItemWidth = 0;
- TRACE("uView=%d\n", infoPtr->uView);
+ TRACE("view %ld\n", infoPtr->uView);
if (infoPtr->uView == LV_VIEW_ICON)
nItemWidth = infoPtr->iconSpacing.cx;
@@ -2990,7 +2990,7 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr)
{
INT nItemHeight;
- TRACE("uView=%d\n", infoPtr->uView);
+ TRACE("view %ld\n", infoPtr->uView);
if (infoPtr->uView == LV_VIEW_ICON)
nItemHeight = infoPtr->iconSpacing.cy;
@@ -5972,8 +5972,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0);
BOOL save = TRUE;
- TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n",
- hwnd, uMsg, wParam, lParam, isW);
+ TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix, isW %d\n", hwnd, uMsg, wParam, lParam, isW);
switch (uMsg)
{
@@ -6127,7 +6126,7 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW)
sz.cy = rect.bottom - rect.top + 2;
rect.left -= 2;
rect.top -= 1;
- TRACE("moving edit=(%d,%d)-(%d,%d)\n", rect.left, rect.top, sz.cx, sz.cy);
+ TRACE("moving edit (%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, sz.cx, sz.cy);
MoveWindow(infoPtr->hwndEdit, rect.left, rect.top, sz.cx, sz.cy, FALSE);
ShowWindow(infoPtr->hwndEdit, SW_NORMAL);
SetFocus(infoPtr->hwndEdit);
@@ -7067,8 +7066,8 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT
break;
default:
- WARN("Unknown value: %d\n", lprc->left);
- return FALSE;
+ WARN("Unknown value: %ld\n", lprc->left);
+ return FALSE;
}
if (infoPtr->uView == LV_VIEW_DETAILS)
@@ -7112,7 +7111,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRE
if (!lprc) return FALSE;
- TRACE("(item=%d, subitem=%d, type=%d)\n", item, lprc->top, lprc->left);
+ TRACE("item %d, subitem %ld, type %ld\n", item, lprc->top, lprc->left);
+
/* Subitem of '0' means item itself, and this works for all control view modes */
if (lprc->top == 0)
return LISTVIEW_GetItemRect(infoPtr, item, lprc);
@@ -7157,8 +7157,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRE
break;
default:
- ERR("Unknown bounds=%d\n", lprc->left);
- return FALSE;
+ ERR("Unknown bounds %ld\n", lprc->left);
+ return FALSE;
}
OffsetRect(&rect, origin.x, y);
@@ -8006,7 +8006,7 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy)
*/
static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color)
{
- TRACE("(color=%x)\n", color);
+ TRACE("color %lx\n", color);
if(infoPtr->clrBk != color) {
if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush);
@@ -8540,7 +8540,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD mas
{
DWORD old_ex_style = infoPtr->dwLvExStyle;
- TRACE("mask=0x%08x, ex_style=0x%08x\n", mask, ex_style);
+ TRACE("mask %#lx, ex_style %#lx\n", mask, ex_style);
/* set new style */
if (mask)
@@ -8721,7 +8721,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy)
if (cy != 0)
infoPtr->iconSpacing.cy = cy;
- TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n",
+ TRACE("old=(%d,%d), new=(%ld,%ld), iconSize=(%ld,%ld), ntmH=%d\n",
LOWORD(oldspacing), HIWORD(oldspacing), infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy,
infoPtr->iconSize.cx, infoPtr->iconSize.cy,
infoPtr->ntmHeight);
@@ -8820,7 +8820,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG
*/
static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFlags)
{
- TRACE("(nItems=%d, dwFlags=%x)\n", nItems, dwFlags);
+ TRACE("nItems %d, flags %#lx\n", nItems, dwFlags);
if (infoPtr->dwStyle & LVS_OWNERDATA)
{
@@ -9093,7 +9093,7 @@ static INT LISTVIEW_SetSelectionMark(LISTVIEW_INFO *infoPtr, INT nIndex)
*/
static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF color)
{
- TRACE("(color=%x)\n", color);
+ TRACE("color %#lx\n", color);
infoPtr->clrTextBk = color;
return TRUE;
@@ -9113,7 +9113,7 @@ static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF color)
*/
static BOOL LISTVIEW_SetTextColor (LISTVIEW_INFO *infoPtr, COLORREF color)
{
- TRACE("(color=%x)\n", color);
+ TRACE("color %#lx\n", color);
infoPtr->clrText = color;
return TRUE;
@@ -9218,7 +9218,7 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView)
LISTVIEW_UpdateScroll(infoPtr);
LISTVIEW_InvalidateList(infoPtr);
- TRACE("nView=%d\n", nView);
+ TRACE("nView %ld\n", nView);
return 1;
}
@@ -9276,7 +9276,7 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare,
struct sorting_context context;
int i;
- TRACE("(pfnCompare=%p, lParamSort=%lx)\n", pfnCompare, lParamSort);
+ TRACE("pfnCompare %p, lParamSort %Ix\n", pfnCompare, lParamSort);
if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE;
@@ -9531,7 +9531,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("(lpcs=%p, style=0x%08x)\n", lpcs, lpcs->style);
+ TRACE("lpcs %p, style %#lx\n", lpcs, lpcs->style);
infoPtr->dwStyle = lpcs->style;
map_style_view(infoPtr);
@@ -9941,7 +9941,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK
INT nItem = -1;
NMLVKEYDOWN nmKeyDown;
- TRACE("(nVirtualKey=%d, lKeyData=%d)\n", nVirtualKey, lKeyData);
+ TRACE("(nVirtualKey=%d, lKeyData=%ld)\n", nVirtualKey, lKeyData);
/* send LVN_KEYDOWN notification */
nmKeyDown.wVKey = nVirtualKey;
@@ -10735,7 +10735,7 @@ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD optio
return 0;
if (options & ~(PRF_ERASEBKGND|PRF_CLIENT))
- FIXME("(hdc=%p options=0x%08x) partial stub\n", hdc, options);
+ FIXME("(hdc=%p options %#lx) partial stub\n", hdc, options);
if (options & PRF_ERASEBKGND)
LISTVIEW_EraseBkgnd(infoPtr, hdc);
@@ -11040,8 +11040,8 @@ static LRESULT LISTVIEW_Size(LISTVIEW_INFO *infoPtr, int Width, int Height)
*/
static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr)
{
- TRACE("uView=%d, rcList(old)=%s\n", infoPtr->uView, wine_dbgstr_rect(&infoPtr->rcList));
-
+ TRACE("uView %ld, rcList(old)=%s\n", infoPtr->uView, wine_dbgstr_rect(&infoPtr->rcList));
+
GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList);
if (infoPtr->uView == LV_VIEW_LIST)
@@ -11114,7 +11114,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType,
UINT uNewView, uOldView;
UINT style;
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n",
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0;
@@ -11217,7 +11217,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType,
static INT LISTVIEW_StyleChanging(WPARAM wStyleType,
STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n",
wStyleType, lpss->styleOld, lpss->styleNew);
/* don't forward LVS_OWNERDATA only if not already set to */
@@ -11294,7 +11294,7 @@ static LRESULT LISTVIEW_SetVersion(LISTVIEW_INFO *infoPtr, DWORD iVersion)
infoPtr->iVersion = iVersion;
- TRACE("new version %d\n", iVersion);
+ TRACE("new version %ld\n", iVersion);
return iOldVersion;
}
@@ -11309,7 +11309,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("(hwnd=%p uMsg=%x wParam=%lx lParam=%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
@@ -11805,7 +11805,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
@@ -11867,7 +11867,7 @@ void LISTVIEW_Unregister(void)
static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("(%p %x %x %lx)\n", infoPtr, HIWORD(wParam), LOWORD(wParam), lParam);
+ TRACE("%p, %x, %x, %Ix\n", infoPtr, HIWORD(wParam), LOWORD(wParam), lParam);
if (!infoPtr->hwndEdit) return 0;
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 70ea604d2c7..4fc984f6f4b 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -671,7 +671,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st)
{
INT range;
- TRACE("flag=%d, st=%p\n", flag, st);
+ TRACE("flags %#lx, st %p\n", flag, st);
switch (flag) {
case GMR_VISIBLE:
@@ -709,7 +709,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st)
break;
}
default:
- WARN("Unknown flag value, got %d\n", flag);
+ WARN("Unknown flag value, got %ld\n", flag);
range = 0;
}
@@ -1296,7 +1296,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color)
enum CachedBrush type;
COLORREF prev;
- TRACE("%p, %d: color %08x\n", infoPtr, index, color);
+ TRACE("%p, %d: color %#lx\n", infoPtr, index, color);
if (index > MCSC_TRAILINGTEXT) return -1;
@@ -2071,8 +2071,7 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
{
MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0);
- TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx)\n",
- hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
switch (uMsg)
{
@@ -2160,7 +2159,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam)
hit = MONTHCAL_HitTest(infoPtr, &ht);
- TRACE("%x at %s\n", hit, wine_dbgstr_point(&ht.pt));
+ TRACE("%lx at %s\n", hit, wine_dbgstr_point(&ht.pt));
switch(hit)
{
@@ -2320,7 +2319,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam)
static LRESULT
MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id)
{
- TRACE("%ld\n", id);
+ TRACE("%Id\n", id);
switch(id) {
case MC_PREVNEXTMONTHTIMER:
@@ -2343,7 +2342,7 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id)
return 0;
}
default:
- ERR("got unknown timer %ld\n", id);
+ ERR("got unknown timer %Id\n", id);
break;
}
@@ -2449,7 +2448,7 @@ MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc)
static LRESULT
MONTHCAL_PrintClient(MONTHCAL_INFO *infoPtr, HDC hdc, DWORD options)
{
- FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options);
+ FIXME("Partial Stub: (hdc %p options %#lx)\n", hdc, options);
if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf))
return 0;
@@ -2705,8 +2704,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr)
static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType,
const STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -2722,8 +2720,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType,
static INT MONTHCAL_StyleChanging(MONTHCAL_INFO *infoPtr, WPARAM wStyleType,
STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
/* block MCS_MULTISELECT change */
if ((lpss->styleNew ^ lpss->styleOld) & MCS_MULTISELECT)
@@ -2874,7 +2871,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
@@ -3015,7 +3012,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
+ ERR( "unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index 2e11a9e665a..ede08d155b6 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -76,8 +76,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(hwnd);
- TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n",
- hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %04x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW( hwnd, uMsg, wParam, lParam );
@@ -102,8 +101,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index b8baa93e15f..7d807c8b2c4 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -219,7 +219,7 @@ PAGER_GetBorder(const PAGER_INFO *infoPtr)
static inline COLORREF
PAGER_GetBkColor(const PAGER_INFO *infoPtr)
{
- TRACE("[%p] returns %06x\n", infoPtr->hwndSelf, infoPtr->clrBk);
+ TRACE("[%p] returns %#lx\n", infoPtr->hwndSelf, infoPtr->clrBk);
return infoPtr->clrBk;
}
@@ -446,7 +446,7 @@ PAGER_SetBkColor (PAGER_INFO* infoPtr, COLORREF clrBk)
COLORREF clrTemp = infoPtr->clrBk;
infoPtr->clrBk = clrBk;
- TRACE("[%p] %06x\n", infoPtr->hwndSelf, infoPtr->clrBk);
+ TRACE("[%p] %#lx\n", infoPtr->hwndSelf, infoPtr->clrBk);
/* the native control seems to do things this way */
SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0,
@@ -776,7 +776,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y)
/* If in one of the buttons the capture and draw buttons */
if (rect)
{
- TRACE("[%p] draw btn (%s), Capture %s, style %08x\n",
+ TRACE("[%p] draw btn (%s), Capture %s, style %#lx\n",
infoPtr->hwndSelf, wine_dbgstr_rect(rect),
(infoPtr->bCapture) ? "TRUE" : "FALSE",
infoPtr->dwStyle);
@@ -943,7 +943,7 @@ PAGER_Timer (PAGER_INFO* infoPtr, INT nTimerId)
else
dir = (infoPtr->dwStyle & PGS_HORZ) ?
PGF_SCROLLRIGHT : PGF_SCROLLDOWN;
- TRACE("[%p] TIMERID1: style=%08x, dir=%d\n",
+ TRACE("[%p] TIMERID1: style=%#lx, dir=%d\n",
infoPtr->hwndSelf, infoPtr->dwStyle, dir);
KillTimer(infoPtr->hwndSelf, TIMERID1);
SetTimer(infoPtr->hwndSelf, TIMERID1, REPEAT_DELAY, 0);
@@ -1012,8 +1012,7 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp
{
DWORD oldStyle = infoPtr->dwStyle;
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -1464,7 +1463,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("(%p, %#x, %#lx, %#lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("%p, %#x, %#Ix, %#Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index fb4c2dc66dd..f8fc2a14eb0 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -532,7 +532,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
static const WCHAR themeClass[] = L"Progress";
HTHEME theme;
- TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd %p, msg %04x, wparam %Ix, lParam %Ix\n", hwnd, message, wParam, lParam);
infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0);
@@ -712,7 +712,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
case PBM_SETSTATE:
if(wParam != PBST_NORMAL)
- FIXME("state %04lx not yet handled\n", wParam);
+ FIXME("state %Ix not yet handled\n", wParam);
return PBST_NORMAL;
case PBM_GETSTATE:
@@ -734,7 +734,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
default:
if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))
- ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam );
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", message, wParam, lParam );
return DefWindowProcW( hwnd, message, wParam, lParam );
}
}
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 556d63f2c75..a512ca9f361 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -321,7 +321,7 @@ static void PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback);
memcpy(&psInfo->ppshheader,lppsh,dwSize);
- TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
+ TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%#lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance,
debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
@@ -365,7 +365,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback);
memcpy(&psInfo->ppshheader,lppsh,dwSize);
- TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n",
+ TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%#lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n",
lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
if (lppsh->dwFlags & INTRNL_ANY_WIZARD)
@@ -765,8 +765,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
rc.right -= rc.left;
rc.bottom -= rc.top;
- TRACE("setting tab %p, rc (0,0)-(%d,%d)\n",
- hwndTabCtrl, rc.right, rc.bottom);
+ TRACE("setting tab %p, rc (0,0)-(%ld,%ld)\n", hwndTabCtrl, rc.right, rc.bottom);
SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -787,8 +786,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
/*
* Resize the property sheet.
*/
- TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n",
- hwndDlg, rc.right, rc.bottom);
+ TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", hwndDlg, rc.right, rc.bottom);
SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
return TRUE;
@@ -820,8 +818,7 @@ static BOOL PROPSHEET_AdjustSizeWizard(HWND hwndDlg, const PropSheetInfo* psInfo
AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE);
/* Resize the property sheet */
- TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n",
- hwndDlg, rc.right, rc.bottom);
+ TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", hwndDlg, rc.right, rc.bottom);
SetWindowPos(hwndDlg, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -1297,7 +1294,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate)
p++;
break;
case 0xffff:
- TRACE("class ordinal 0x%08x\n",*(const DWORD*)p);
+ TRACE("class ordinal %#lx\n",*(const DWORD*)p);
p += 2;
break;
default:
@@ -1313,7 +1310,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate)
p++;
break;
case 0xffff:
- TRACE("text ordinal 0x%08x\n",*(const DWORD*)p);
+ TRACE("text ordinal %#lx\n",*(const DWORD*)p);
p += 2;
break;
default:
@@ -1405,7 +1402,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
if (!pTemplateCopy)
return FALSE;
- TRACE("copying pTemplate %p into pTemplateCopy %p (%d)\n", pTemplate, pTemplateCopy, resSize);
+ TRACE("copying pTemplate %p into pTemplateCopy %p (%ld)\n", pTemplate, pTemplateCopy, resSize);
memcpy(pTemplateCopy, pTemplate, resSize);
if (((MyDLGTEMPLATEEX*)pTemplateCopy)->signature == 0xFFFF)
@@ -1674,7 +1671,7 @@ static BOOL PROPSHEET_Finish(HWND hwndDlg)
msgResult = SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
- TRACE("msg result %ld\n", msgResult);
+ TRACE("msg result %Id\n", msgResult);
if (msgResult != 0)
return FALSE;
@@ -2030,7 +2027,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
* NOTE: The resizing happens every time the page is selected and
* not only when it's created (some applications depend on it). */
PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage);
- TRACE("setting page %p, rc (%s) w=%d, h=%d\n",
+ TRACE("setting page %p, rc (%s) w=%ld, h=%ld\n",
psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc),
rc.right - rc.left, rc.bottom - rc.top);
SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP,
@@ -2136,7 +2133,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText)
PropSheetInfo* psInfo = GetPropW(hwndDlg, PropSheetInfoStr);
WCHAR szTitle[256];
- TRACE("%s (style %08x)\n", debugstr_w(lpszText), dwStyle);
+ TRACE("%s (style %#lx)\n", debugstr_w(lpszText), dwStyle);
if (IS_INTRESOURCE(lpszText)) {
if (!LoadStringW(psInfo->ppshheader.hInstance, LOWORD(lpszText), szTitle, ARRAY_SIZE(szTitle)))
return;
@@ -2458,7 +2455,7 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH);
- TRACE("%d\n", dwFlags);
+ TRACE("%lx\n", dwFlags);
EnableWindow(hwndBack, dwFlags & PSWIZB_BACK);
EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT);
@@ -3444,8 +3441,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam)
static INT_PTR CALLBACK
PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n",
- hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg=0x%04x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
switch (uMsg)
{
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 6a065514e60..61fd30c445f 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -349,7 +349,7 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB)
TRACE("ID=%u, ", pB->wID);
TRACE("size=%u, child=%p", pB->cbSize, pB->hwndChild);
if (pB->fMask & RBBIM_COLORS)
- TRACE(", clrF=0x%06x, clrB=0x%06x", pB->clrFore, pB->clrBack);
+ TRACE(", clrF=%#lx, clrB=%#lx", pB->clrFore, pB->clrBack);
TRACE("\n");
TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(buff, pB->fMask));
@@ -364,7 +364,7 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB)
if (pB->fMask & RBBIM_HEADERSIZE)
TRACE(" xHeader=%u", pB->cxHeader);
if (pB->fMask & RBBIM_LPARAM)
- TRACE(" lParam=0x%08lx", pB->lParam);
+ TRACE(" lParam %Ix", pB->lParam);
TRACE("\n");
}
if (pB->fMask & RBBIM_CHILDSIZE)
@@ -382,14 +382,14 @@ REBAR_DumpBand (const REBAR_INFO *iP)
if(! TRACE_ON(rebar) ) return;
- TRACE("hwnd=%p: color=%08x/%08x, bands=%u, rows=%u, cSize=%d,%d\n",
+ TRACE("hwnd=%p: color=%#lx/%#lx, bands=%u, rows=%u, cSize=%ld,%ld\n",
iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows,
iP->calcSize.cx, iP->calcSize.cy);
- TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, iGrabbedBand=%d\n",
+ TRACE("hwnd=%p: flags=%#x, dragStart=%ld,%ld, dragNow=%ld,%ld, iGrabbedBand=%d\n",
iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y,
iP->dragNow.x, iP->dragNow.y,
iP->iGrabbedBand);
- TRACE("hwnd=%p: style=%08x, notify in Unicode=%s, redraw=%s\n",
+ TRACE("hwnd=%p: style=%#lx, notify in Unicode=%s, redraw=%s\n",
iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE",
(iP->DoRedraw)?"TRUE":"FALSE");
for (i = 0; i < iP->uNumBands; i++) {
@@ -400,7 +400,7 @@ REBAR_DumpBand (const REBAR_INFO *iP)
if (pB->fMask & RBBIM_CHILD)
TRACE(" child=%p", pB->hwndChild);
if (pB->fMask & RBBIM_COLORS)
- TRACE(" clrF=0x%06x clrB=0x%06x", pB->clrFore, pB->clrBack);
+ TRACE(" clrF=%#lx clrB=%#lx", pB->clrFore, pB->clrBack);
TRACE("\n");
TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(buff, pB->fMask));
if (pB->fMask & RBBIM_STYLE)
@@ -413,7 +413,7 @@ REBAR_DumpBand (const REBAR_INFO *iP)
if (pB->fMask & RBBIM_IDEALSIZE)
TRACE(" xIdeal=%u", pB->cxIdeal);
if (pB->fMask & RBBIM_LPARAM)
- TRACE(" lParam=0x%08lx", pB->lParam);
+ TRACE(" lParam %Ix", pB->lParam);
}
TRACE("\n");
if (RBBIM_CHILDSIZE)
@@ -946,7 +946,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr)
INT xedge = 0, yedge = 0;
RECT rcSelf;
- TRACE("new size [%d x %d]\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy);
+ TRACE("new size [%ld x %ld]\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy);
if (infoPtr->dwStyle & CCS_NORESIZE)
return;
@@ -993,8 +993,8 @@ REBAR_ForceResize (REBAR_INFO *infoPtr)
width = rcSelf.right - rcSelf.left;
}
- TRACE("hwnd %p, style=%08x, setting at (%d,%d) for (%d,%d)\n",
- infoPtr->hwndSelf, infoPtr->dwStyle, x, y, width, height);
+ TRACE("hwnd %p, style %#lx, setting at (%d,%d) for (%d,%d)\n", infoPtr->hwndSelf, infoPtr->dwStyle,
+ x, y, width, height);
/* Set flag to ignore next WM_SIZE message and resize the window */
infoPtr->fStatus |= SELF_RESIZE;
@@ -1059,7 +1059,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus)
yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
/* center combo box inside child area */
- TRACE("moving child (Combo(Ex)) %p to (%d,%d) for (%d,%d)\n",
+ TRACE("moving child (Combo(Ex)) %p to (%ld,%d) for (%ld,%d)\n",
lpBand->hwndChild,
lpBand->rcChild.left, yPos,
lpBand->rcChild.right - lpBand->rcChild.left,
@@ -1074,7 +1074,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus)
ERR("DeferWindowPos returned NULL\n");
}
else {
- TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n",
+ TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n",
lpBand->hwndChild,
lpBand->rcChild.left, lpBand->rcChild.top,
lpBand->rcChild.right - lpBand->rcChild.left,
@@ -1390,7 +1390,7 @@ REBAR_Layout(REBAR_INFO *infoPtr)
adjcx = get_rect_cx(infoPtr, &rcAdj);
if (infoPtr->uNumBands == 0) {
- TRACE("No bands - setting size to (0,%d), style: %x\n", adjcx, infoPtr->dwStyle);
+ TRACE("No bands - setting size to (0,%d), style: %#lx\n", adjcx, infoPtr->dwStyle);
infoPtr->calcSize.cx = adjcx;
/* the calcSize.cy won't change for a 0 band rebar */
infoPtr->uNumRows = 0;
@@ -1434,9 +1434,8 @@ REBAR_Layout(REBAR_INFO *infoPtr)
infoPtr->calcSize.cx = adjcx;
infoPtr->calcSize.cy = yPos;
- TRACE("calcsize size=(%d, %d), origheight=(%d,%d)\n",
- infoPtr->calcSize.cx, infoPtr->calcSize.cy,
- oldSize.cx, oldSize.cy);
+ TRACE("calcsize size=(%ld, %ld), origheight=(%ld,%ld)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy,
+ oldSize.cx, oldSize.cy);
REBAR_DumpBand (infoPtr);
REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands);
@@ -1929,7 +1928,7 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc)
else
{
old = SetBkColor (hdc, new);
- TRACE("%s background color=0x%06x, band %s\n",
+ TRACE("%s background color %#lx, band %s\n",
(lpBand->clrBack == CLR_NONE) ? "none" :
((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""),
GetBkColor(hdc), wine_dbgstr_rect(&rcBand));
@@ -2362,7 +2361,7 @@ REBAR_GetBkColor (const REBAR_INFO *infoPtr)
if (clr == CLR_DEFAULT)
clr = infoPtr->clrBtnFace;
- TRACE("background color 0x%06x!\n", clr);
+ TRACE("background color %#lx\n", clr);
return clr;
}
@@ -2434,7 +2433,7 @@ REBAR_GetRowHeight (const REBAR_INFO *infoPtr, INT iRow)
static inline LRESULT
REBAR_GetTextColor (const REBAR_INFO *infoPtr)
{
- TRACE("text color 0x%06x!\n", infoPtr->clrText);
+ TRACE("text color %#lx\n", infoPtr->clrText);
return infoPtr->clrText;
}
@@ -2599,7 +2598,7 @@ REBAR_MaximizeBand (const REBAR_INFO *infoPtr, INT iBand, LPARAM lParam)
extra = REBAR_ShrinkBandsLTR(infoPtr, next_visible(infoPtr, iBand), iRowEnd, extra, TRUE);
lpBand->cxEffective += extraOrig - extra;
lpBand->cx = lpBand->cxEffective;
- TRACE("(%d, %ld): Wanted size %d, obtained %d (shrink %d, %d)\n", iBand, lParam, cxDesired, lpBand->cx, extraOrig, extra);
+ TRACE("(%d, %Id): Wanted size %d, obtained %d (shrink %d, %d)\n", iBand, lParam, cxDesired, lpBand->cx, extraOrig, extra);
REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd);
if (infoPtr->dwStyle & CCS_VERT)
@@ -2784,8 +2783,7 @@ REBAR_SetBarInfo (REBAR_INFO *infoPtr, const REBARINFO *lpInfo)
infoPtr->imageSize.cx = 0;
infoPtr->imageSize.cy = 0;
}
- TRACE("new image cx=%d, cy=%d\n", infoPtr->imageSize.cx,
- infoPtr->imageSize.cy);
+ TRACE("new image cx=%ld, cy=%ld\n", infoPtr->imageSize.cx, infoPtr->imageSize.cy);
}
/* revalidate all bands to reset flags for images in headers of bands */
@@ -2806,7 +2804,7 @@ REBAR_SetBkColor (REBAR_INFO *infoPtr, COLORREF clr)
clrTemp = infoPtr->clrBk;
infoPtr->clrBk = clr;
- TRACE("background color 0x%06x!\n", infoPtr->clrBk);
+ TRACE("background color %#lx\n", infoPtr->clrBk);
return clrTemp;
}
@@ -2835,7 +2833,7 @@ REBAR_SetTextColor (REBAR_INFO *infoPtr, COLORREF clr)
clrTemp = infoPtr->clrText;
infoPtr->clrText = clr;
- TRACE("text color 0x%06x!\n", infoPtr->clrText);
+ TRACE("text color %#lx\n", infoPtr->clrText);
return clrTemp;
}
@@ -3309,12 +3307,12 @@ REBAR_NCHitTest (const REBAR_INFO *infoPtr, LPARAM lParam)
nmmouse.dwItemData = 0;
nmmouse.pt = clpt;
nmmouse.dwHitInfo = 0;
- if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) {
- TRACE("notify changed return value from %ld to %d\n",
- ret, i);
- ret = (LRESULT) i;
+ if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST)))
+ {
+ TRACE("notify changed return value from %Id to %d\n", ret, i);
+ ret = (LRESULT) i;
}
- TRACE("returning %ld, client point %s\n", ret, wine_dbgstr_point(&clpt));
+ TRACE("returning %Id, client point %s\n", ret, wine_dbgstr_point(&clpt));
return ret;
}
@@ -3476,13 +3474,12 @@ REBAR_SetRedraw (REBAR_INFO *infoPtr, BOOL redraw)
static LRESULT
REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("wParam=%lx, lParam=%lx\n", wParam, lParam);
+ TRACE("wParam %Ix, lParam %Ix\n", wParam, lParam);
/* avoid _Layout resize recursion (but it shouldn't be infinite and it seems Windows does recurse) */
if (infoPtr->fStatus & SELF_RESIZE) {
infoPtr->fStatus &= ~SELF_RESIZE;
- TRACE("SELF_RESIZE was set, reset, fStatus=%08x lparam=%08lx\n",
- infoPtr->fStatus, lParam);
+ TRACE("SELF_RESIZE was set, reset, fStatus=%08x lparam %Ix\n", infoPtr->fStatus, lParam);
return 0;
}
@@ -3498,7 +3495,7 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT
REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle)
{
- TRACE("current style=%08x, styleOld=%08x, style being set to=%08x\n",
+ TRACE("current style %#lx, styleOld %#lx, style being set to %#lx\n",
infoPtr->dwStyle, lpStyle->styleOld, lpStyle->styleNew);
if (nType == GWL_STYLE)
{
@@ -3538,8 +3535,8 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n",
- hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
+
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -3745,8 +3742,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c
index e71fac330e3..75eac1211e2 100644
--- a/dlls/comctl32/smoothscroll.c
+++ b/dlls/comctl32/smoothscroll.c
@@ -112,9 +112,7 @@ BOOL WINAPI SmoothScrollWindow( const SMOOTHSCROLLSTRUCT *smooth ) {
);
}
- FIXME("(hwnd=%p,flags=%x,x2=%x): should smooth scroll here.\n",
- smooth->hwnd,flags,smooth->x2
- );
+ FIXME("(hwnd=%p,flags=%lx,x2=%lx): should smooth scroll here.\n", smooth->hwnd, flags, smooth->x2);
/* FIXME: do timer based smooth scrolling */
if ((smooth->x2 & 1) && smooth->scrollfun)
return smooth->scrollfun(
diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c
index d584b470a8c..7a3ac958111 100644
--- a/dlls/comctl32/static.c
+++ b/dlls/comctl32/static.c
@@ -438,7 +438,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam,
if (style < 0L || style > SS_TYPEMASK)
{
- ERR("Unknown style 0x%02x\n", style );
+ ERR("Unknown style %#lx\n", style );
return -1;
}
@@ -613,7 +613,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam,
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style );
break;
default:
- FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam);
+ FIXME("STM_SETIMAGE: Unhandled type %Ix\n", wParam);
break;
}
STATIC_TryPaintFcn( hwnd, full_style );
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index e804c0418f4..5251f3677b0 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -110,7 +110,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr)
margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2);
height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder;
- TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height);
+ TRACE(" textHeight=%ld+%ld, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height);
return height;
}
@@ -542,7 +542,7 @@ STATUSBAR_SetBkColor (STATUS_INFO *infoPtr, COLORREF color)
infoPtr->clrBk = color;
InvalidateRect(infoPtr->Self, NULL, FALSE);
- TRACE("CREF: %08x -> %08x\n", oldBkColor, infoPtr->clrBk);
+ TRACE("CREF: %#lx -> %#lx\n", oldBkColor, infoPtr->clrBk);
return oldBkColor;
}
@@ -1101,7 +1101,7 @@ STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, UINT msg, WPARA
{
NMMOUSE nm;
- TRACE("code %04x, lParam=%lx\n", code, lParam);
+ TRACE("code %04x, lParam %Ix\n", code, lParam);
nm.hdr.hwndFrom = infoPtr->Self;
nm.hdr.idFrom = GetWindowLongPtrW(infoPtr->Self, GWLP_ID);
nm.hdr.code = code;
@@ -1128,7 +1128,8 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
INT nPart = ((INT) wParam) & 0x00ff;
LRESULT res;
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam);
+
if (!infoPtr && msg != WM_CREATE)
return DefWindowProcW (hwnd, msg, wParam, lParam);
@@ -1267,8 +1268,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default:
if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg))
- ERR("unknown msg %04x wp=%04lx lp=%08lx\n",
- msg, wParam, lParam);
+ ERR("unknown msg %04x wp=%Ix lp=%Ix\n", msg, wParam, lParam);
return DefWindowProcW (hwnd, msg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 802a8803e82..011c8bdb8b2 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -1497,7 +1497,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
{
SYSLINK_INFO *infoPtr;
- TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd %p, msg %04x, wparam %Ix, lParam %Ix\n", hwnd, message, wParam, lParam);
infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0);
@@ -1726,7 +1726,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
default:
if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))
{
- ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam );
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", message, wParam, lParam );
}
return DefWindowProcW(hwnd, message, wParam, lParam);
}
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 017719a183d..8e34f8b97b3 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -203,9 +203,9 @@ static void
TAB_DumpItemExternalT(const TCITEMW *pti, UINT iItem, BOOL isW)
{
if (TRACE_ON(tab)) {
- TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n",
+ TRACE("external tab %d, mask=0x%08x, dwState %#lx, dwStateMask %#lx, cchTextMax=0x%08x\n",
iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax);
- TRACE("external tab %d, iImage=%d, lParam=0x%08lx, pszTextW=%s\n",
+ TRACE("external tab %d, iImage=%d, lParam %Ix, pszTextW=%s\n",
iItem, pti->iImage, pti->lParam, isW ? debugstr_w(pti->pszText) : debugstr_a((LPSTR)pti->pszText));
}
}
@@ -216,10 +216,8 @@ TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem)
if (TRACE_ON(tab)) {
TAB_ITEM *ti = TAB_GetItem(infoPtr, iItem);
- TRACE("tab %d, dwState=0x%08x, pszText=%s, iImage=%d\n",
- iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage);
- TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n",
- iItem, ti->rect.left, ti->rect.top);
+ TRACE("tab %d, dwState %#lx, pszText %s, iImage %d\n", iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage);
+ TRACE("tab %d, rect.left=%ld, rect.top(row)=%ld\n", iItem, ti->rect.left, ti->rect.top);
}
}
@@ -929,8 +927,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr
{
LONG *iRightBottom, *iLeftTop;
- TRACE ("hwnd=%p fLarger=%ld (%s)\n", infoPtr->hwnd, fLarger,
- wine_dbgstr_rect(prc));
+ TRACE("hwnd %p, fLarger %Id, (%s)\n", infoPtr->hwnd, fLarger, wine_dbgstr_rect(prc));
if (!prc) return -1;
@@ -1173,11 +1170,10 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
((infoPtr->dwStyle & TCS_BUTTONS) ? 2 : 1) *
infoPtr->uVItemPadding;
- TRACE("tabH=%d, tmH=%d, iconh=%d\n",
- infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
+ TRACE("tabH=%d, tmH %ld, iconh %d\n", infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
}
- TRACE("client right=%d\n", clientRect.right);
+ TRACE("client right %ld\n", clientRect.right);
/* Get the icon width */
if (infoPtr->himl)
@@ -1331,7 +1327,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
curr->rect.right -= curr->rect.left;
curr->rect.left = 0;
- TRACE("r=%d, cl=%d, cl.r=%d, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
+ TRACE("r=%ld, cl=%d, cl.r=%ld, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
curr->rect.right, curItemLeftPos, clientRect.right,
iCount, iRow, infoPtr->uNumRows, remTab, tabPerRow);
@@ -1796,8 +1792,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
if (center_offset_v < 0)
center_offset_v = 0;
-
- TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n",
+
+ TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%ld\n",
debugstr_w(item->pszText), center_offset_h, center_offset_v,
wine_dbgstr_rect(drawRect), (rcText.right-rcText.left));
@@ -1823,8 +1819,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
drawRect->left += cx + infoPtr->uHItemPadding;
}
- TRACE("drawing image=%d, left=%d, top=%d\n",
- item->iImage, rcImage.left, rcImage.top-1);
+ TRACE("drawing image %d, left %ld, top %ld\n", item->iImage, rcImage.left, rcImage.top-1);
ImageList_Draw
(
infoPtr->himl,
@@ -1914,7 +1909,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
}
else
{
- TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n",
+ TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%ld\n",
debugstr_w(item->pszText), center_offset_h, center_offset_v,
wine_dbgstr_rect(drawRect), (rcText.right-rcText.left));
if (item->pszText)
@@ -3240,8 +3235,7 @@ TAB_DeselectAll (TAB_INFO *infoPtr, BOOL excludesel)
static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType,
const STYLESTRUCT *lpss)
{
- TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
- wStyleType, lpss->styleOld, lpss->styleNew);
+ TRACE("style type %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -3258,7 +3252,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- TRACE("hwnd=%p msg=%x wParam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
+
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -3425,8 +3420,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if (uMsg >= WM_USER && uMsg < WM_APP && !COMCTL32_IsReflectedMessage(uMsg))
- WARN("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ WARN("unknown msg %04x wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
break;
}
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c
index 4523695d614..6682b399946 100644
--- a/dlls/comctl32/taskdialog.c
+++ b/dlls/comctl32/taskdialog.c
@@ -1210,7 +1210,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
struct taskdialog_info *dialog_info;
LRESULT result;
- TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd %p, msg 0x%04x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam);
if (msg != WM_INITDIALOG)
dialog_info = GetPropW(hwnd, taskdialog_info_propnameW);
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 2ae70ad4f3e..9b059996b65 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -292,36 +292,29 @@ TOOLBAR_DumpTBButton(const TBBUTTON *tbb, BOOL fUnicode)
static void
TOOLBAR_DumpButton(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *bP, INT btn_num)
{
- if (TRACE_ON(toolbar)){
- TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx\n",
- btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap),
- bP->fsState, bP->fsStyle, bP->dwData, bP->iString);
- TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP)));
- TRACE("button %d id %d, hot=%s, row=%d, rect=(%s)\n",
- btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow,
- wine_dbgstr_rect(&bP->rect));
- }
+ TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%Ix, stringid=%Ix\n",
+ btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), bP->fsState, bP->fsStyle, bP->dwData, bP->iString);
+ TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP)));
+ TRACE("button %d id %d, hot=%s, row=%d, rect=(%s)\n", btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow,
+ wine_dbgstr_rect(&bP->rect));
}
static void
TOOLBAR_DumpToolbar(const TOOLBAR_INFO *iP, INT line)
{
- if (TRACE_ON(toolbar)) {
- INT i;
-
- TRACE("toolbar %p at line %d, exStyle=%08x, buttons=%d, bitmaps=%d, strings=%d, style=%08x\n",
- iP->hwndSelf, line,
- iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps,
- iP->nNumStrings, iP->dwStyle);
- TRACE("toolbar %p at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n",
- iP->hwndSelf, line,
- iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis,
- (iP->bDoRedraw) ? "TRUE" : "FALSE");
- for(i=0; i<iP->nNumButtons; i++) {
- TOOLBAR_DumpButton(iP, &iP->buttons[i], i);
- }
- }
+ INT i;
+
+ if (!TRACE_ON(toolbar))
+ return;
+
+ TRACE("toolbar %p at line %d, exStyle=%#lx, buttons=%d, bitmaps=%d, strings=%d, style=%#lx\n",
+ iP->hwndSelf, line, iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps, iP->nNumStrings, iP->dwStyle);
+ TRACE("toolbar %p at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n",
+ iP->hwndSelf, line, iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis, (iP->bDoRedraw) ? "TRUE" : "FALSE");
+
+ for (i = 0; i < iP->nNumButtons; ++i)
+ TOOLBAR_DumpButton(iP, &iP->buttons[i], i);
}
static inline BOOL
@@ -419,7 +412,7 @@ TOOLBAR_GetBitmapIndex(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr)
if (nmgd.dwMask & TBNF_DI_SETITEM)
btnPtr->iBitmap = nmgd.iImage;
ret = nmgd.iImage;
- TRACE("TBN_GETDISPINFO returned bitmap id %d, mask=%08x, nNumBitmaps=%d\n",
+ TRACE("TBN_GETDISPINFO returned bitmap id %d, mask %#lx, nNumBitmaps %d\n",
ret, nmgd.dwMask, infoPtr->nNumBitmaps);
}
@@ -976,11 +969,10 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc,
rcBitmap.top += infoPtr->szPadding.cy / 2;
- TRACE("iBitmap=%d, start=(%d,%d) w=%d, h=%d\n",
- btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
+ TRACE("iBitmap=%d, start=(%ld,%ld) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
TRACE("Text=%s\n", debugstr_w(lpText));
- TRACE("iListGap=%d, padding = { %d, %d }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy);
+ TRACE("iListGap=%d, padding = { %ld, %ld }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy);
/* calculate text position */
if (lpText)
@@ -1270,7 +1262,7 @@ TOOLBAR_MeasureString(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr,
}
}
- TRACE("string size %d x %d!\n", lpSize->cx, lpSize->cy);
+ TRACE("string size %ld x %ld.\n", lpSize->cx, lpSize->cy);
}
/***********************************************************************
@@ -1320,7 +1312,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
SelectObject (hdc, hOldFont);
ReleaseDC (infoPtr->hwndSelf, hdc);
- TRACE("max string size %d x %d\n", lpSize->cx, lpSize->cy);
+ TRACE("max string size %ld x %ld\n", lpSize->cx, lpSize->cy);
}
/***********************************************************************
@@ -2438,7 +2430,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (!TOOLBAR_GetButtonInfo(infoPtr, &nmtb))
break;
- TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%ld) %s\n",
+ TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%Id) %s\n",
nmtb.tbButton.fsStyle, i,
nmtb.tbButton.idCommand,
nmtb.tbButton.iString,
@@ -2865,7 +2857,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp
info.nID = IDB_HIST_LARGE;
break;
default:
- WARN("unknown bitmap id, %ld\n", lpAddBmp->nID);
+ WARN("unknown bitmap id, %Id\n", lpAddBmp->nID);
return -1;
}
@@ -2951,7 +2943,7 @@ TOOLBAR_AddStringW (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam)
BOOL fFirstString = (infoPtr->nNumStrings == 0);
INT nIndex = infoPtr->nNumStrings;
- TRACE("%p, %lx\n", hInstance, lParam);
+ TRACE("%p, %Ix\n", hInstance, lParam);
if (IS_INTRESOURCE(lParam)) {
WCHAR szString[MAX_RESOURCE_STRING_LENGTH];
@@ -3033,7 +3025,7 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam)
INT nIndex;
INT len;
- TRACE("%p, %lx\n", hInstance, lParam);
+ TRACE("%p, %Ix\n", hInstance, lParam);
if (IS_INTRESOURCE(lParam)) /* load from resources */
return TOOLBAR_AddStringW(infoPtr, hInstance, lParam);
@@ -3064,7 +3056,7 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam)
static LRESULT
TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)
{
- TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle);
+ TRACE("auto sizing, style=%#lx\n", infoPtr->dwStyle);
TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight);
if (!(infoPtr->dwStyle & CCS_NORESIZE))
@@ -3175,7 +3167,7 @@ TOOLBAR_CheckButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam)
nIndex = TOOLBAR_GetButtonIndex (infoPtr, Id, FALSE);
- TRACE("hwnd=%p, btn index=%d, lParam=0x%08lx\n", infoPtr->hwndSelf, nIndex, lParam);
+ TRACE("hwnd %p, btn index %d, lParam %Ix\n", infoPtr->hwndSelf, nIndex, lParam);
if (nIndex == -1)
return FALSE;
@@ -3307,7 +3299,7 @@ TOOLBAR_EnableButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam)
nIndex = TOOLBAR_GetButtonIndex (infoPtr, Id, FALSE);
- TRACE("hwnd=%p, btn id=%d, lParam=0x%08lx\n", infoPtr->hwndSelf, Id, lParam);
+ TRACE("hwnd %p, btn id %d, lParam %Ix\n", infoPtr->hwndSelf, Id, lParam);
if (nIndex == -1)
return FALSE;
@@ -3479,7 +3471,7 @@ TOOLBAR_GetButtonText (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr, BOOL i
static LRESULT
TOOLBAR_GetDisabledImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam)
{
- TRACE("hwnd=%p, wParam=%ld\n", infoPtr->hwndSelf, wParam);
+ TRACE("hwnd %p, wParam %Id\n", infoPtr->hwndSelf, wParam);
/* UNDOCUMENTED: wParam is actually the ID of the image list to return */
return (LRESULT)GETDISIMAGELIST(infoPtr, wParam);
}
@@ -3497,7 +3489,7 @@ TOOLBAR_GetExtendedStyle (const TOOLBAR_INFO *infoPtr)
static LRESULT
TOOLBAR_GetHotImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam)
{
- TRACE("hwnd=%p, wParam=%ld\n", infoPtr->hwndSelf, wParam);
+ TRACE("hwnd %p, wParam %Id\n", infoPtr->hwndSelf, wParam);
/* UNDOCUMENTED: wParam is actually the ID of the image list to return */
return (LRESULT)GETHOTIMAGELIST(infoPtr, wParam);
}
@@ -3519,7 +3511,7 @@ TOOLBAR_GetHotItem (const TOOLBAR_INFO *infoPtr)
static LRESULT
TOOLBAR_GetDefImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam)
{
- TRACE("hwnd=%p, wParam=%ld\n", infoPtr->hwndSelf, wParam);
+ TRACE("hwnd %p, wParam %Id\n", infoPtr->hwndSelf, wParam);
/* UNDOCUMENTED: wParam is actually the ID of the image list to return */
return (LRESULT) GETDEFIMAGELIST(infoPtr, wParam);
}
@@ -3577,9 +3569,8 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
lpSize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left;
lpSize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
- TRACE("maximum size %d x %d\n",
- infoPtr->rcBound.right - infoPtr->rcBound.left,
- infoPtr->rcBound.bottom - infoPtr->rcBound.top);
+ TRACE("maximum size %ld x %ld\n", infoPtr->rcBound.right - infoPtr->rcBound.left,
+ infoPtr->rcBound.bottom - infoPtr->rcBound.top);
return TRUE;
}
@@ -3856,7 +3847,7 @@ TOOLBAR_LoadImages (TOOLBAR_INFO *infoPtr, WPARAM wParam, HINSTANCE hInstance)
tbab.hInst = hInstance;
tbab.nID = wParam;
- TRACE("hwnd = %p, hInst = %p, nID = %lu\n", infoPtr->hwndSelf, tbab.hInst, tbab.nID);
+ TRACE("hwnd = %p, hInst = %p, nID = %Iu\n", infoPtr->hwndSelf, tbab.hInst, tbab.nID);
return TOOLBAR_AddBitmap(infoPtr, 0, &tbab);
}
@@ -4036,7 +4027,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace)
int nOldBitmaps, nNewBitmaps = 0;
HIMAGELIST himlDef = 0;
- TRACE("hInstOld %p nIDOld %lx hInstNew %p nIDNew %lx nButtons %x\n",
+ TRACE("hInstOld %p nIDOld %Ix hInstNew %p nIDNew %Ix nButtons %x\n",
lpReplace->hInstOld, lpReplace->nIDOld, lpReplace->hInstNew, lpReplace->nIDNew,
lpReplace->nButtons);
@@ -4048,7 +4039,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace)
else if (lpReplace->hInstOld != 0 && lpReplace->hInstOld != lpReplace->hInstNew)
FIXME("resources not in the current module not implemented\n");
- TRACE("To be replaced hInstOld %p nIDOld %lx\n", lpReplace->hInstOld, lpReplace->nIDOld);
+ TRACE("To be replaced hInstOld %p nIDOld %Ix\n", lpReplace->hInstOld, lpReplace->nIDOld);
for (i = 0; i < infoPtr->nNumBitmapInfos; i++) {
TBITMAP_INFO *tbi = &infoPtr->bitmaps[i];
TRACE("tbimapinfo %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID);
@@ -4067,7 +4058,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace)
if (nOldButtons == 0)
{
- WARN("No hinst/bitmap found! hInst %p nID %lx\n", lpReplace->hInstOld, lpReplace->nIDOld);
+ WARN("No hinst/bitmap found! hInst %p nID %Ix\n", lpReplace->hInstOld, lpReplace->nIDOld);
return FALSE;
}
@@ -4381,10 +4372,10 @@ TOOLBAR_SetBitmapSize (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
short width = (short)LOWORD(lParam);
short height = (short)HIWORD(lParam);
- TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height);
+ TRACE("hwnd %p, wParam %Id, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height);
if (wParam != 0)
- FIXME("wParam is %ld. Perhaps image list index?\n", wParam);
+ FIXME("wParam is %Id. Perhaps image list index?\n", wParam);
/* 0 width or height is changed to 1 */
if (width == 0)
@@ -4479,7 +4470,7 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam)
if ((cx < 0) || (cy < 0))
{
- ERR("invalid parameter 0x%08x\n", (DWORD)lParam);
+ ERR("invalid parameter %#Ix\n", lParam);
return FALSE;
}
@@ -4586,7 +4577,7 @@ TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags)
{
DWORD old_flags;
- TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags);
+ TRACE("hwnd = %p, mask = %#lx, flags %#lx\n", infoPtr->hwndSelf, mask, flags);
old_flags = infoPtr->dwDTFlags;
infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask);
@@ -4605,7 +4596,7 @@ TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD style)
{
DWORD old_style = infoPtr->dwExStyle;
- TRACE("mask=0x%08x, style=0x%08x\n", mask, style);
+ TRACE("mask %#lx, style %#lx\n", mask, style);
if (mask)
infoPtr->dwExStyle = (old_style & ~mask) | (style & mask);
@@ -4613,8 +4604,7 @@ TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD style)
infoPtr->dwExStyle = style;
if (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)
- FIXME("Unknown Toolbar Extended Style 0x%08x. Please report.\n",
- (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL));
+ FIXME("Unknown Toolbar Extended Style %#lx. Please report.\n", (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL));
if ((old_style ^ infoPtr->dwExStyle) & TBSTYLE_EX_MIXEDBUTTONS)
TOOLBAR_CalcToolbar(infoPtr);
@@ -4794,11 +4784,11 @@ TOOLBAR_SetIndent (TOOLBAR_INFO *infoPtr, INT nIndent)
static LRESULT
TOOLBAR_SetInsertMark (TOOLBAR_INFO *infoPtr, const TBINSERTMARK *lptbim)
{
- TRACE("hwnd = %p, lptbim = { %d, 0x%08x}\n", infoPtr->hwndSelf, lptbim->iButton, lptbim->dwFlags);
+ TRACE("hwnd = %p, lptbim = { %d, %#lx}\n", infoPtr->hwndSelf, lptbim->iButton, lptbim->dwFlags);
if ((lptbim->dwFlags & ~TBIMHT_AFTER) != 0)
{
- FIXME("Unrecognized flag(s): 0x%08x\n", (lptbim->dwFlags & ~TBIMHT_AFTER));
+ FIXME("Unrecognized flag(s): %#lx\n", (lptbim->dwFlags & ~TBIMHT_AFTER));
return 0;
}
@@ -4858,8 +4848,7 @@ TOOLBAR_SetPadding (TOOLBAR_INFO *infoPtr, LPARAM lParam)
oldPad = MAKELONG(infoPtr->szPadding.cx, infoPtr->szPadding.cy);
infoPtr->szPadding.cx = min(LOWORD((DWORD)lParam), GetSystemMetrics(SM_CXEDGE));
infoPtr->szPadding.cy = min(HIWORD((DWORD)lParam), GetSystemMetrics(SM_CYEDGE));
- TRACE("cx=%d, cy=%d\n",
- infoPtr->szPadding.cx, infoPtr->szPadding.cy);
+ TRACE("cx %ld, cy %ld\n", infoPtr->szPadding.cx, infoPtr->szPadding.cy);
return (LRESULT) oldPad;
}
@@ -5041,7 +5030,7 @@ TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style)
{
DWORD dwOldStyle = infoPtr->dwStyle;
- TRACE("new style 0x%08x\n", style);
+ TRACE("new style %#lx\n", style);
if (style & TBSTYLE_LIST)
infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS;
@@ -5111,7 +5100,7 @@ TOOLBAR_GetColorScheme (const TOOLBAR_INFO *infoPtr, LPCOLORSCHEME lParam)
static LRESULT
TOOLBAR_SetColorScheme (TOOLBAR_INFO *infoPtr, const COLORSCHEME *lParam)
{
- TRACE("new colors Hl=%x Shd=%x, old colors Hl=%x Shd=%x\n",
+ TRACE("new colors Hl=%#lx Shd=%#lx, old colors Hl=%#lx Shd=%#lx\n",
lParam->clrBtnHighlight, lParam->clrBtnShadow,
infoPtr->clrBtnHighlight, infoPtr->clrBtnShadow);
@@ -5190,7 +5179,7 @@ TOOLBAR_GetStringW (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPWSTR str)
static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
SIZE * pSize = (SIZE*)lParam;
- FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub\n", hwnd, wParam, pSize->cx, pSize->cy);
+ FIXME("hwnd=%p, wParam=%Ix, size.cx=%ld, size.cy=%ld stub\n", hwnd, wParam, pSize->cx, pSize->cy);
return 0;
}
@@ -5202,8 +5191,7 @@ TOOLBAR_SetHotItem2 (TOOLBAR_INFO *infoPtr, INT nHotItem, LPARAM lParam)
{
INT nOldHotItem = infoPtr->nHotItem;
- TRACE("old item=%d, new item=%d, flags=%08x\n",
- nOldHotItem, nHotItem, (DWORD)lParam);
+ TRACE("old item %d, new item %d, flags %Ix\n", nOldHotItem, nHotItem, lParam);
if (nHotItem < 0 || nHotItem > infoPtr->nNumButtons)
nHotItem = -1;
@@ -5254,8 +5242,7 @@ TOOLBAR_GetIdealSize (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
* lParam pointer to SIZE structure
*
*/
- TRACE("wParam %ld, lParam 0x%08lx -> 0x%08x 0x%08x\n",
- wParam, lParam, lpsize->cx, lpsize->cy);
+ TRACE("wParam %Id, lParam %Ix -> %lx, %lx\n", wParam, lParam, lpsize->cx, lpsize->cy);
switch(wParam) {
case 0:
@@ -5280,17 +5267,16 @@ TOOLBAR_GetIdealSize (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
lpsize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
break;
default:
- FIXME("Unknown wParam %ld\n", wParam);
+ FIXME("Unknown wParam %Id\n", wParam);
return 0;
}
- TRACE("set to -> 0x%08x 0x%08x\n",
- lpsize->cx, lpsize->cy);
+ TRACE("set to -> %lu, %lu\n", lpsize->cx, lpsize->cy);
return 1;
}
static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- FIXME("hwnd=%p wParam %08lx lParam %08lx\n", hwnd, wParam, lParam);
+ FIXME("hwnd %p, wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam);
InvalidateRect(hwnd, NULL, TRUE);
return 1;
@@ -5303,7 +5289,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0);
LOGFONTW logFont;
- TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style);
+ TRACE("hwnd = %p, style = %#lx\n", hwnd, lpcs->style);
infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE);
GetClientRect(hwnd, &infoPtr->client_rect);
@@ -5395,7 +5381,7 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
case CDRF_SKIPDEFAULT:
return TRUE;
default:
- FIXME("[%p] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+ FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
infoPtr->hwndSelf, ntfret);
}
}
@@ -5432,7 +5418,7 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
case CDRF_SKIPDEFAULT:
return TRUE;
default:
- FIXME("[%p] response %d not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n",
+ FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n",
infoPtr->hwndSelf, ntfret);
}
}
@@ -5605,7 +5591,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
nmtb.iItem = btnPtr->idCommand;
nmtb.rcButton = btnPtr->rect;
res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_DROPDOWN);
- TRACE("TBN_DROPDOWN responded with %ld\n", res);
+ TRACE("TBN_DROPDOWN responded with %Id\n", res);
if (res != TBDDRET_TREATPRESSED)
{
@@ -6381,7 +6367,7 @@ TOOLBAR_NotifyFormat(const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
LRESULT format;
- TRACE("wParam = 0x%lx, lParam = 0x%08lx\n", wParam, lParam);
+ TRACE("wParam %Ix, lParam %Ix\n", wParam, lParam);
if (lParam == NF_QUERY)
return NFR_UNICODE;
@@ -6390,8 +6376,7 @@ TOOLBAR_NotifyFormat(const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
format = SendMessageW(infoPtr->hwndNotify,
WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
if ((format != NFR_ANSI) && (format != NFR_UNICODE)) {
- ERR("wrong response to WM_NOTIFYFORMAT (%ld), assuming ANSI\n",
- format);
+ ERR("wrong response to WM_NOTIFYFORMAT (%Id), assuming ANSI\n", format);
format = NFR_ANSI;
}
return format;
@@ -6561,8 +6546,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n",
- hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW( hwnd, uMsg, wParam, lParam );
@@ -6958,8 +6942,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index 2a68beafd7d..95ef8da6794 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -228,7 +228,7 @@ TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd)
LRESULT result;
lpnmttcd->nmcd.dwDrawStage = dwDrawStage;
- TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage,
+ TRACE("Notifying stage %ld, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage,
lpnmttcd->uDrawFlags, lpnmttcd->nmcd.hdr.code);
result = SendMessageW(GetParent(lpnmttcd->nmcd.hdr.hwndFrom), WM_NOTIFY,
@@ -370,7 +370,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too
ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam;
- TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom);
+ TRACE("hdr.idFrom = %Ix\n", ttnmdi.hdr.idFrom);
SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) {
@@ -426,7 +426,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too
ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam;
- TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom);
+ TRACE("hdr.idFrom = %Ix\n", ttnmdi.hdr.idFrom);
SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) {
@@ -616,7 +616,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate)
toolPtr = &infoPtr->tools[nTool];
TOOLTIPS_CalcTipSize (infoPtr, &size);
- TRACE("Show tooltip %d, %s, size %d x %d\n", nTool, debugstr_w(infoPtr->szTipText),
+ TRACE("Show tooltip %d, %s, size %ld x %ld\n", nTool, debugstr_w(infoPtr->szTipText),
size.cx, size.cy);
if (track_activate && (toolPtr->uFlags & TTF_TRACK))
@@ -720,7 +720,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate)
}
}
- TRACE("pos %d - %d\n", rect.left, rect.top);
+ TRACE("pos %ld - %ld\n", rect.left, rect.top);
rect.right = rect.left + size.cx;
rect.bottom = rect.top + size.cy;
@@ -1045,7 +1045,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
if (!ti) return FALSE;
- TRACE("add tool (%p) %p %ld%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId,
+ TRACE("add tool (%p) %p %Id%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId,
(ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
if (ti->cbSize > TTTOOLINFOW_V3_SIZE && isW)
@@ -1285,7 +1285,7 @@ TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolI
TRACE("tool %d\n", nTool);
TOOLTIPS_CalcTipSize (infoPtr, &size);
- TRACE("size %d x %d\n", size.cx, size.cy);
+ TRACE("size %ld x %ld\n", size.cx, size.cy);
return MAKELRESULT(size.cx, size.cy);
}
@@ -1320,7 +1320,7 @@ TOOLTIPS_GetDelayTime (const TOOLTIPS_INFO *infoPtr, DWORD duration)
return infoPtr->nInitialTime;
default:
- WARN("Invalid duration flag %x\n", duration);
+ WARN("Invalid duration flag %lx\n", duration);
break;
}
@@ -1577,7 +1577,7 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime)
break;
default:
- WARN("Invalid duration flag %x\n", duration);
+ WARN("Invalid duration flag %lx\n", duration);
break;
}
@@ -1924,7 +1924,7 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT
TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", infoPtr->hwndSelf, wParam, lParam);
+ FIXME("hwnd %p, wParam %Ix, lParam %Ix\n", infoPtr->hwndSelf, wParam, lParam);
return 0;
}
@@ -2102,7 +2102,8 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
- TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
+
if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -2270,8 +2271,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
- uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index ce6a20c6c63..6643752c043 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -118,7 +118,7 @@ static LRESULT notify_hdr (const TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh)
pnmh->code = code;
result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh);
- TRACE(" <= %ld\n", result);
+ TRACE(" <= %Id\n", result);
return result;
}
@@ -443,7 +443,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint)
LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint);
LONG prevPos = infoPtr->lPos;
- TRACE("clickPoint=%s, dir=%d\n", wine_dbgstr_point(&clickPoint), dir);
+ TRACE("clickPoint=%s, dir=%ld\n", wine_dbgstr_point(&clickPoint), dir);
if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT))
TRACKBAR_PageDown(infoPtr);
@@ -1127,7 +1127,6 @@ static int __cdecl comp_tics (const void *ap, const void *bp)
const DWORD a = *(const DWORD *)ap;
const DWORD b = *(const DWORD *)bp;
- TRACE("(a=%d, b=%d)\n", a, b);
if (a < b) return -1;
if (a > b) return 1;
return 0;
@@ -1407,7 +1406,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax))
return FALSE;
- TRACE("lPos=%d\n", lPos);
+ TRACE("position %ld\n", lPos);
infoPtr->uNumTics++;
infoPtr->tics=ReAlloc( infoPtr->tics,
@@ -1885,7 +1884,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -2064,7 +2063,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 1368105f271..608ce489e33 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -624,7 +624,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage,
NMTVCUSTOMDRAW nmcdhdr;
NMCUSTOMDRAW *nmcd;
- TRACE("drawstage:0x%x hdc:%p\n", dwDrawStage, hdc);
+ TRACE("drawstage %#lx, hdc %p\n", dwDrawStage, hdc);
nmcd = &nmcdhdr.nmcd;
nmcd->dwDrawStage = dwDrawStage;
@@ -671,7 +671,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc,
nmcd->lItemlParam = item->lParam;
nmcdhdr->iLevel = item->iLevel;
- TRACE("drawstage:0x%x hdc:%p item:%lx, itemstate:0x%x, lItemlParam:0x%lx\n",
+ TRACE("drawstage %#lx hdc:%p item:%Ix, itemstate:0x%x, lItemlParam:%Ix\n",
nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
nmcd->uItemState, nmcd->lItemlParam);
@@ -2005,7 +2005,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color)
{
COLORREF prevColor = infoPtr->clrInsertMark;
- TRACE("0x%08x\n", color);
+ TRACE("%#lx\n", color);
infoPtr->clrInsertMark = color;
return (LRESULT)prevColor;
@@ -2079,7 +2079,7 @@ static inline LRESULT
TREEVIEW_GetVisibleCount(const TREEVIEW_INFO *infoPtr)
{
/* Surprise! This does not take integral height into account. */
- TRACE("client=%d, item=%d\n", infoPtr->clientHeight, infoPtr->uItemHeight);
+ TRACE("client=%ld, item=%d\n", infoPtr->clientHeight, infoPtr->uItemHeight);
return infoPtr->clientHeight / infoPtr->uItemHeight;
}
@@ -3113,7 +3113,7 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref)
static LRESULT
TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options)
{
- FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options);
+ FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options);
if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd))
return 0;
@@ -3789,7 +3789,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht)
}
lpht->hItem = item;
- TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags);
+ TRACE("(%ld, %ld) : result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags);
return item;
}
@@ -3866,7 +3866,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static LRESULT
TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("code=0x%x, id=0x%x, handle=0x%lx\n", HIWORD(wParam), LOWORD(wParam), lParam);
+ TRACE("code 0x%x, id=0x%x, handle %Ix\n", HIWORD(wParam), LOWORD(wParam), lParam);
switch (HIWORD(wParam))
{
@@ -4472,7 +4472,7 @@ TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam)
else
GetTextExtentPoint32A(hdc, "", 0, &size);
- TRACE("%d %d %s\n", size.cx, size.cy, debugstr_w(dragItem->pszText));
+ TRACE("%ld, %ld, %s\n", size.cx, size.cy, debugstr_w(dragItem->pszText));
hbmp = CreateCompatibleBitmap(htopdc, size.cx, size.cy);
hOldbmp = SelectObject(hdc, hbmp);
@@ -4804,7 +4804,7 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll)
viscount = TREEVIEW_GetVisibleCount(infoPtr);
- TRACE("%p (%s) %d - %d viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder,
+ TRACE("%p (%s) %ld - %ld viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder,
hasFirstVisible ? infoPtr->firstVisible->visibleOrder : -1, viscount);
if (hasFirstVisible)
@@ -4939,7 +4939,7 @@ TREEVIEW_VScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam)
int nScrollCode = LOWORD(wParam);
- TRACE("wp %lx\n", wParam);
+ TRACE("wp %Ix\n", wParam);
if (!(infoPtr->uInternalStatus & TV_VSCROLL))
return 0;
@@ -5009,7 +5009,7 @@ TREEVIEW_HScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam)
int scrollX = infoPtr->scrollX;
int nScrollCode = LOWORD(wParam);
- TRACE("wp %lx\n", wParam);
+ TRACE("wp %Ix\n", wParam);
if (!(infoPtr->uInternalStatus & TV_HSCROLL))
return FALSE;
@@ -5131,7 +5131,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
TREEVIEW_INFO *infoPtr;
LOGFONTW lf;
- TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE));
+ TRACE("wnd %p, style %#lx\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE));
infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO));
@@ -5323,7 +5323,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam)
TREEVIEW_ITEM *prevItem = infoPtr->selectedItem;
NMTVKEYDOWN nmkeydown;
- TRACE("%lx\n", wParam);
+ TRACE("%Ix\n", wParam);
nmkeydown.wVKey = wParam;
nmkeydown.flags = 0;
@@ -5538,13 +5538,13 @@ TREEVIEW_Notify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (lppgc->dwFlag == PGF_CALCWIDTH) {
lppgc->iWidth = infoPtr->treeWidth;
- TRACE("got PGN_CALCSIZE, returning horz size = %d, client=%d\n",
+ TRACE("got PGN_CALCSIZE, returning horz size = %ld, client= %ld\n",
infoPtr->treeWidth, infoPtr->clientWidth);
}
else {
lppgc->iHeight = infoPtr->treeHeight;
- TRACE("got PGN_CALCSIZE, returning vert size = %d, client=%d\n",
- infoPtr->treeHeight, infoPtr->clientHeight);
+ TRACE("got PGN_CALCSIZE, returning vert size = %ld, client = %ld\n", infoPtr->treeHeight,
+ infoPtr->clientHeight);
}
return 0;
}
@@ -5565,7 +5565,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
}
else
{
- FIXME("WM_SIZE flag %lx %lx not handled\n", wParam, lParam);
+ FIXME("WM_SIZE flag %Ix %Ix not handled\n", wParam, lParam);
}
TREEVIEW_Invalidate(infoPtr, NULL);
@@ -5575,7 +5575,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT
TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("(%lx %lx)\n", wParam, lParam);
+ TRACE("%Ix, %Ix.\n", wParam, lParam);
if (wParam == GWL_STYLE)
{
@@ -5699,7 +5699,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE("hwnd %p msg %04x wp=%08lx lp=%08lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, msg %04x, wp %Ix, lp %Ix\n", hwnd, uMsg, wParam, lParam);
if (infoPtr) TREEVIEW_VerifyTree(infoPtr);
else
@@ -5954,7 +5954,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
/* This mostly catches MFC and Delphi messages. :( */
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
- TRACE("Unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
+ TRACE("Unknown msg %04x wp %Ix lp %Ix\n", uMsg, wParam, lParam);
def:
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index d5625839db3..e07f9e7a9f2 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -576,8 +576,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
{
UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr((HWND)ref_data);
- TRACE("hwnd=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n",
- hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p, uMsg %04x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
switch(uMsg)
{
@@ -892,7 +891,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
HTHEME theme;
- TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd %p, msg %04x, wparam %Id, lparam %Ix\n", hwnd, message, wParam, lParam);
if (!infoPtr && (message != WM_CREATE))
return DefWindowProcW (hwnd, message, wParam, lParam);
@@ -1088,7 +1087,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
return infoPtr->Base;
case UDM_SETBASE:
- TRACE("UpDown Ctrl new base(%ld), hwnd=%p\n", wParam, hwnd);
+ TRACE("UpDown Ctrl new base(%Id), hwnd=%p\n", wParam, hwnd);
if (wParam==10 || wParam==16) {
WPARAM old_base = infoPtr->Base;
infoPtr->Base = wParam;
@@ -1159,7 +1158,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
}
default:
if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))
- ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam);
+ ERR("unknown msg %04x wp=%Ix lp=%Ix\n", message, wParam, lParam);
return DefWindowProcW (hwnd, message, wParam, lParam);
}
--
2.34.1
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/dbgeng/Makefile.in | 1 -
dlls/dbgeng/dbgeng.c | 468 ++++++++++++++++++++--------------------
2 files changed, 234 insertions(+), 235 deletions(-)
diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in
index dc00f025e7c..c2639c5d222 100644
--- a/dlls/dbgeng/Makefile.in
+++ b/dlls/dbgeng/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dbgeng.dll
IMPORTLIB = dbgeng
DELAYIMPORTS = version
diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c
index 5ffde0e3c80..880b6f03b43 100644
--- a/dlls/dbgeng/dbgeng.c
+++ b/dlls/dbgeng/dbgeng.c
@@ -164,7 +164,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target)
{
if (!GetModuleInformation(target->handle, modules[i], &info, sizeof(info)))
{
- WARN("Failed to get module information, error %d.\n", GetLastError());
+ WARN("Failed to get module information, error %ld.\n", GetLastError());
continue;
}
@@ -230,7 +230,7 @@ static void debug_client_detach_target(struct target_process *target)
if (resume)
{
if ((status = NtResumeProcess(target->handle)))
- WARN("Failed to resume process, status %#x.\n", status);
+ WARN("Failed to resume process, status %#lx.\n", status);
}
}
@@ -324,7 +324,7 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface)
struct debug_client *debug_client = impl_from_IDebugClient(iface);
ULONG refcount = InterlockedIncrement(&debug_client->refcount);
- TRACE("%p, %d.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -341,7 +341,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface)
ULONG refcount = InterlockedDecrement(&debug_client->refcount);
struct target_process *cur, *cur2;
- TRACE("%p, %d.\n", debug_client, refcount);
+ TRACE("%p, refcount %lu.\n", debug_client, refcount);
if (!refcount)
{
@@ -361,7 +361,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface)
static HRESULT STDMETHODCALLTYPE debugclient_AttachKernel(IDebugClient7 *iface, ULONG flags, const char *options)
{
- FIXME("%p, %#x, %s stub.\n", iface, flags, debugstr_a(options));
+ FIXME("%p, %#lx, %s stub.\n", iface, flags, debugstr_a(options));
return E_NOTIMPL;
}
@@ -369,7 +369,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachKernel(IDebugClient7 *iface,
static HRESULT STDMETHODCALLTYPE debugclient_GetKernelConnectionOptions(IDebugClient7 *iface, char *buffer,
ULONG buffer_size, ULONG *options_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, options_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, options_size);
return E_NOTIMPL;
}
@@ -384,7 +384,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetKernelConnectionOptions(IDebugCl
static HRESULT STDMETHODCALLTYPE debugclient_StartProcessServer(IDebugClient7 *iface, ULONG flags, const char *options,
void *reserved)
{
- FIXME("%p, %#x, %s, %p stub.\n", iface, flags, debugstr_a(options), reserved);
+ FIXME("%p, %#lx, %s, %p stub.\n", iface, flags, debugstr_a(options), reserved);
return E_NOTIMPL;
}
@@ -407,7 +407,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_DisconnectProcessServer(IDebugClien
static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIds(IDebugClient7 *iface, ULONG64 server,
ULONG *ids, ULONG count, ULONG *actual_count)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(server), ids, count, actual_count);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(server), ids, count, actual_count);
return E_NOTIMPL;
}
@@ -415,7 +415,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIds(IDebugCl
static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIdByExecutableName(IDebugClient7 *iface,
ULONG64 server, const char *exe_name, ULONG flags, ULONG *id)
{
- FIXME("%p, %s, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(exe_name), flags, id);
+ FIXME("%p, %s, %s, %#lx, %p stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(exe_name), flags, id);
return E_NOTIMPL;
}
@@ -424,7 +424,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescription(IDebug
ULONG systemid, ULONG flags, char *exe_name, ULONG exe_name_size, ULONG *actual_exe_name_size,
char *description, ULONG description_size, ULONG *actual_description_size)
{
- FIXME("%p, %s, %u, %#x, %p, %u, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(server), systemid, flags,
+ FIXME("%p, %s, %lu, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(server), systemid, flags,
exe_name, exe_name_size, actual_exe_name_size, description, description_size, actual_description_size);
return E_NOTIMPL;
@@ -435,7 +435,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface,
struct debug_client *debug_client = impl_from_IDebugClient(iface);
struct target_process *process;
- TRACE("%p, %s, %u, %#x.\n", iface, wine_dbgstr_longlong(server), pid, flags);
+ TRACE("%p, %s, %lu, %#lx.\n", iface, wine_dbgstr_longlong(server), pid, flags);
if (server)
{
@@ -457,7 +457,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface,
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient7 *iface, ULONG64 server, char *cmdline,
ULONG flags)
{
- FIXME("%p, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), flags);
+ FIXME("%p, %s, %s, %#lx stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), flags);
return E_NOTIMPL;
}
@@ -465,7 +465,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient7 *iface,
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach(IDebugClient7 *iface, ULONG64 server, char *cmdline,
ULONG create_flags, ULONG pid, ULONG attach_flags)
{
- FIXME("%p, %s, %s, %#x, %u, %#x stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), create_flags,
+ FIXME("%p, %s, %s, %#lx, %lu, %#lx stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), create_flags,
pid, attach_flags);
return E_NOTIMPL;
@@ -480,21 +480,21 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetProcessOptions(IDebugClient7 *if
static HRESULT STDMETHODCALLTYPE debugclient_AddProcessOptions(IDebugClient7 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_RemoveProcessOptions(IDebugClient7 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_SetProcessOptions(IDebugClient7 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
@@ -508,14 +508,14 @@ static HRESULT STDMETHODCALLTYPE debugclient_OpenDumpFile(IDebugClient7 *iface,
static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFile(IDebugClient7 *iface, const char *filename, ULONG qualifier)
{
- FIXME("%p, %s, %u stub.\n", iface, debugstr_a(filename), qualifier);
+ FIXME("%p, %s, %lu stub.\n", iface, debugstr_a(filename), qualifier);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_ConnectSession(IDebugClient7 *iface, ULONG flags, ULONG history_limit)
{
- FIXME("%p, %#x, %u stub.\n", iface, flags, history_limit);
+ FIXME("%p, %#lx, %lu stub.\n", iface, flags, history_limit);
return E_NOTIMPL;
}
@@ -530,7 +530,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_StartServer(IDebugClient7 *iface, c
static HRESULT STDMETHODCALLTYPE debugclient_OutputServers(IDebugClient7 *iface, ULONG output_control,
const char *machine, ULONG flags)
{
- FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(machine), flags);
+ FIXME("%p, %lu, %s, %#lx stub.\n", iface, output_control, debugstr_a(machine), flags);
return E_NOTIMPL;
}
@@ -559,7 +559,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_DetachProcesses(IDebugClient7 *ifac
static HRESULT STDMETHODCALLTYPE debugclient_EndSession(IDebugClient7 *iface, ULONG flags)
{
- FIXME("%p, %#x stub.\n", iface, flags);
+ FIXME("%p, %#lx stub.\n", iface, flags);
return E_NOTIMPL;
}
@@ -573,7 +573,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetExitCode(IDebugClient7 *iface, U
static HRESULT STDMETHODCALLTYPE debugclient_DispatchCallbacks(IDebugClient7 *iface, ULONG timeout)
{
- FIXME("%p, %u stub.\n", iface, timeout);
+ FIXME("%p, %lu stub.\n", iface, timeout);
return E_NOTIMPL;
}
@@ -629,7 +629,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetOutputMask(IDebugClient7 *iface,
static HRESULT STDMETHODCALLTYPE debugclient_SetOutputMask(IDebugClient7 *iface, ULONG mask)
{
- FIXME("%p, %#x stub.\n", iface, mask);
+ FIXME("%p, %#lx stub.\n", iface, mask);
return E_NOTIMPL;
}
@@ -643,7 +643,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetOtherOutputMask(IDebugClient7 *i
static HRESULT STDMETHODCALLTYPE debugclient_SetOtherOutputMask(IDebugClient7 *iface, IDebugClient *client, ULONG mask)
{
- FIXME("%p, %p, %#x stub.\n", iface, client, mask);
+ FIXME("%p, %p, %#lx stub.\n", iface, client, mask);
return E_NOTIMPL;
}
@@ -657,7 +657,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetOutputWidth(IDebugClient7 *iface
static HRESULT STDMETHODCALLTYPE debugclient_SetOutputWidth(IDebugClient7 *iface, ULONG columns)
{
- FIXME("%p, %u stub.\n", iface, columns);
+ FIXME("%p, %lu stub.\n", iface, columns);
return E_NOTIMPL;
}
@@ -665,7 +665,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputWidth(IDebugClient7 *iface
static HRESULT STDMETHODCALLTYPE debugclient_GetOutputLinePrefix(IDebugClient7 *iface, char *buffer, ULONG buffer_size,
ULONG *prefix_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, prefix_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, prefix_size);
return E_NOTIMPL;
}
@@ -680,7 +680,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputLinePrefix(IDebugClient7 *
static HRESULT STDMETHODCALLTYPE debugclient_GetIdentity(IDebugClient7 *iface, char *buffer, ULONG buffer_size,
ULONG *identity_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, identity_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, identity_size);
return E_NOTIMPL;
}
@@ -688,7 +688,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetIdentity(IDebugClient7 *iface, c
static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentity(IDebugClient7 *iface, ULONG output_control, ULONG flags,
const char *format)
{
- FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, debugstr_a(format));
+ FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, flags, debugstr_a(format));
return E_NOTIMPL;
}
@@ -732,13 +732,13 @@ static HRESULT STDMETHODCALLTYPE debugclient_FlushCallbacks(IDebugClient7 *iface
static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFile2(IDebugClient7 *iface, const char *dumpfile, ULONG qualifier,
ULONG flags, const char *comment)
{
- FIXME("%p, %s, %d, 0x%08x, %s.\n", iface, debugstr_a(dumpfile), qualifier, flags, debugstr_a(comment));
+ FIXME("%p, %s, %lu, %#lx, %s.\n", iface, debugstr_a(dumpfile), qualifier, flags, debugstr_a(comment));
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_AddDumpInformationFile(IDebugClient7 *iface, const char *infofile, ULONG type)
{
- FIXME("%p, %s, %d.\n", iface, debugstr_a(infofile), type);
+ FIXME("%p, %s, %lu.\n", iface, debugstr_a(infofile), type);
return E_NOTIMPL;
}
@@ -750,7 +750,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_EndProcessServer(IDebugClient7 *ifa
static HRESULT STDMETHODCALLTYPE debugclient_WaitForProcessServerEnd(IDebugClient7 *iface, ULONG timeout)
{
- FIXME("%p, %d.\n", iface, timeout);
+ FIXME("%p, %lu.\n", iface, timeout);
return E_NOTIMPL;
}
@@ -781,28 +781,28 @@ static HRESULT STDMETHODCALLTYPE debugclient_AbandonCurrentProcess(IDebugClient7
static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIdByExecutableNameWide(IDebugClient7 *iface, ULONG64 server,
const WCHAR *exename, ULONG flags, ULONG *id)
{
- FIXME("%p, %s, %s, 0x%08x, %p.\n", iface, wine_dbgstr_longlong(server), debugstr_w(exename), flags, id);
+ FIXME("%p, %s, %s, %#lx, %p.\n", iface, wine_dbgstr_longlong(server), debugstr_w(exename), flags, id);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescriptionWide(IDebugClient7 *iface, ULONG64 server, ULONG id,
ULONG flags, WCHAR *exename, ULONG size, ULONG *actualsize, WCHAR *description, ULONG desc_size, ULONG *actual_desc_size)
{
- FIXME("%p, %s, %d, 0x%08x, %s, %d, %p, %s, %d, %p.\n", iface, wine_dbgstr_longlong(server), id, flags, debugstr_w(exename), size,
+ FIXME("%p, %s, %lu, %#lx, %s, %lu, %p, %s, %lu, %p.\n", iface, wine_dbgstr_longlong(server), id, flags, debugstr_w(exename), size,
actualsize, debugstr_w(description), desc_size, actual_desc_size );
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessWide(IDebugClient7 *iface, ULONG64 server, WCHAR *commandline, ULONG flags)
{
- FIXME("%p, %s, %s, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags);
+ FIXME("%p, %s, %s, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttachWide(IDebugClient7 *iface, ULONG64 server, WCHAR *commandline,
ULONG flags, ULONG processid, ULONG attachflags)
{
- FIXME("%p, %s, %s, 0x%08x, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags, processid, attachflags);
+ FIXME("%p, %s, %s, %#lx, %lu, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags, processid, attachflags);
return E_NOTIMPL;
}
@@ -815,7 +815,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_OpenDumpFileWide(IDebugClient7 *ifa
static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFileWide(IDebugClient7 *iface, const WCHAR *filename, ULONG64 handle,
ULONG qualifier, ULONG flags, const WCHAR *comment)
{
- FIXME("%p, %s, %s, %d, 0x%08x, %s.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle),
+ FIXME("%p, %s, %s, %lu, %#lx, %s.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle),
qualifier, flags, debugstr_w(comment));
return E_NOTIMPL;
}
@@ -823,7 +823,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFileWide(IDebugClient7 *if
static HRESULT STDMETHODCALLTYPE debugclient_AddDumpInformationFileWide(IDebugClient7 *iface, const WCHAR *filename,
ULONG64 handle, ULONG type)
{
- FIXME("%p, %s, %s, %d.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), type);
+ FIXME("%p, %s, %s, %lu.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), type);
return E_NOTIMPL;
}
@@ -836,27 +836,27 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetNumberDumpFiles(IDebugClient7 *i
static HRESULT STDMETHODCALLTYPE debugclient_GetDumpFile(IDebugClient7 *iface, ULONG index, char *buffer, ULONG buf_size,
ULONG *name_size, ULONG64 *handle, ULONG *type)
{
- FIXME("%p, %d, %p, %d, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type);
+ FIXME("%p, %lu, %p, %lu, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_GetDumpFileWide(IDebugClient7 *iface, ULONG index, WCHAR *buffer, ULONG buf_size,
ULONG *name_size, ULONG64 *handle, ULONG *type)
{
- FIXME("%p, %d, %p, %d, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type);
+ FIXME("%p, %lu, %p, %lu, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_AttachKernelWide(IDebugClient7 *iface, ULONG flags, const WCHAR *options)
{
- FIXME("%p, 0x%08x, %s.\n", iface, flags, debugstr_w(options));
+ FIXME("%p, %#lx, %s.\n", iface, flags, debugstr_w(options));
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_GetKernelConnectionOptionsWide(IDebugClient7 *iface, WCHAR *buffer,
ULONG buf_size, ULONG *size)
{
- FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, size);
+ FIXME("%p, %p, %lu, %p.\n", iface, buffer, buf_size, size);
return E_NOTIMPL;
}
@@ -868,7 +868,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetKernelConnectionOptionsWide(IDeb
static HRESULT STDMETHODCALLTYPE debugclient_StartProcessServerWide(IDebugClient7 *iface, ULONG flags, const WCHAR *options, void *reserved)
{
- FIXME("%p, 0x%08x, %s, %p.\n", iface, flags, debugstr_w(options), reserved);
+ FIXME("%p, %#lx, %s, %p.\n", iface, flags, debugstr_w(options), reserved);
return E_NOTIMPL;
}
@@ -886,7 +886,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_StartServerWide(IDebugClient7 *ifac
static HRESULT STDMETHODCALLTYPE debugclient_OutputServersWide(IDebugClient7 *iface, ULONG control, const WCHAR *machine, ULONG flags)
{
- FIXME("%p, %d, %s, 0x%08x.\n", iface, control, debugstr_w(machine), flags);
+ FIXME("%p, %lu, %s, %#lx.\n", iface, control, debugstr_w(machine), flags);
return E_NOTIMPL;
}
@@ -904,7 +904,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputCallbacksWide(IDebugClient
static HRESULT STDMETHODCALLTYPE debugclient_GetOutputLinePrefixWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size)
{
- FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, size);
+ FIXME("%p, %p, %lu, %p.\n", iface, buffer, buf_size, size);
return E_NOTIMPL;
}
@@ -916,13 +916,13 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputLinePrefixWide(IDebugClien
static HRESULT STDMETHODCALLTYPE debugclient_GetIdentityWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *identity)
{
- FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, identity);
+ FIXME("%p, %p, %lu, %p.\n", iface, buffer, buf_size, identity);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentityWide(IDebugClient7 *iface, ULONG control, ULONG flags, const WCHAR *format)
{
- FIXME("%p, %d, 0x%08x, %s.\n", iface, control, flags, debugstr_w(format));
+ FIXME("%p, %ld, %#lx, %s.\n", iface, control, flags, debugstr_w(format));
return E_NOTIMPL;
}
@@ -941,7 +941,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetEventCallbacksWide(IDebugClient7
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2(IDebugClient7 *iface, ULONG64 server, char *command, void *options,
ULONG buf_size, const char *initial, const char *environment)
{
- FIXME("%p %s, %s, %p, %d, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options,
+ FIXME("%p, %s, %s, %p, %ld, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options,
buf_size, debugstr_a(initial), debugstr_a(environment));
return E_NOTIMPL;
}
@@ -949,7 +949,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2(IDebugClient7 *iface
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2Wide(IDebugClient7 *iface, ULONG64 server, WCHAR *command, void *options,
ULONG size, const WCHAR *initial, const WCHAR *environment)
{
- FIXME("%p %s, %s, %p, %d, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), options,
+ FIXME("%p, %s, %s, %p, %ld, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), options,
size, debugstr_w(initial), debugstr_w(environment));
return E_NOTIMPL;
}
@@ -957,7 +957,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2Wide(IDebugClient7 *i
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2(IDebugClient7 *iface, ULONG64 server, char *command,
void *options, ULONG buf_size, const char *initial, const char *environment, ULONG processid, ULONG flags)
{
- FIXME("%p %s, %s, %p, %d, %s, %s, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options,
+ FIXME("%p, %s, %s, %p, %ld, %s, %s, %ld, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options,
buf_size, debugstr_a(initial), debugstr_a(environment), processid, flags);
return E_NOTIMPL;
}
@@ -965,7 +965,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2(IDebugClien
static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2Wide(IDebugClient7 *iface, ULONG64 server, WCHAR *command,
void *buffer, ULONG buf_size, const WCHAR *initial, const WCHAR *environment, ULONG processid, ULONG flags)
{
- FIXME("%p %s, %s, %p, %d, %s, %s, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), buffer,
+ FIXME("%p %s, %s, %p, %ld, %s, %s, %ld, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), buffer,
buf_size, debugstr_w(initial), debugstr_w(environment), processid, flags);
return E_NOTIMPL;
}
@@ -1002,13 +1002,13 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetNumberOutputCallbacks(IDebugClie
static HRESULT STDMETHODCALLTYPE debugclient_GetNumberEventCallbacks(IDebugClient7 *iface, ULONG flags, ULONG *count)
{
- FIXME("%p, 0x%08x, %p.\n", iface, flags, count);
+ FIXME("%p, %#lx, %p.\n", iface, flags, count);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugclient_GetQuitLockString(IDebugClient7 *iface, char *buffer, ULONG buf_size, ULONG *size)
{
- FIXME("%p, %s, %d, %p.\n", iface, debugstr_a(buffer), buf_size, size);
+ FIXME("%p, %s, %ld, %p.\n", iface, debugstr_a(buffer), buf_size, size);
return E_NOTIMPL;
}
@@ -1020,7 +1020,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetQuitLockString(IDebugClient7 *if
static HRESULT STDMETHODCALLTYPE debugclient_GetQuitLockStringWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size)
{
- FIXME("%p, %s, %d, %p.\n", iface, debugstr_w(buffer), buf_size, size);
+ FIXME("%p, %s, %ld, %p.\n", iface, debugstr_w(buffer), buf_size, size);
return E_NOTIMPL;
}
@@ -1038,7 +1038,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetEventContextCallbacks(IDebugClie
static HRESULT STDMETHODCALLTYPE debugclient_SetClientContext(IDebugClient7 *iface, void *context, ULONG size)
{
- FIXME("%p, %p, %d.\n", iface, context, size);
+ FIXME("%p, %p, %ld.\n", iface, context, size);
return E_NOTIMPL;
}
@@ -1178,7 +1178,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *i
HRESULT hr = S_OK;
SIZE_T length;
- TRACE("%p, %s, %p, %u, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
+ TRACE("%p, %s, %p, %lu, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
if (!(target = debug_client_get_target(debug_client)))
return E_UNEXPECTED;
@@ -1191,7 +1191,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *i
else
{
hr = HRESULT_FROM_WIN32(GetLastError());
- WARN("Failed to read process memory %#x.\n", hr);
+ WARN("Failed to read process memory %#lx.\n", hr);
}
return hr;
@@ -1200,7 +1200,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *i
static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer,
ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
return E_NOTIMPL;
}
@@ -1208,7 +1208,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces *
static HRESULT STDMETHODCALLTYPE debugdataspaces_SearchVirtual(IDebugDataSpaces *iface, ULONG64 offset, ULONG64 length,
void *pattern, ULONG pattern_size, ULONG pattern_granularity, ULONG64 *ret_offset)
{
- FIXME("%p, %s, %s, %p, %u, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(length),
+ FIXME("%p, %s, %s, %p, %lu, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(length),
pattern, pattern_size, pattern_granularity, ret_offset);
return E_NOTIMPL;
@@ -1217,7 +1217,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_SearchVirtual(IDebugDataSpaces
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtualUncached(IDebugDataSpaces *iface, ULONG64 offset,
void *buffer, ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
return E_NOTIMPL;
}
@@ -1225,7 +1225,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtualUncached(IDebugDataS
static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtualUncached(IDebugDataSpaces *iface, ULONG64 offset,
void *buffer, ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
return E_NOTIMPL;
}
@@ -1233,7 +1233,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtualUncached(IDebugData
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPointersVirtual(IDebugDataSpaces *iface, ULONG count,
ULONG64 offset, ULONG64 *pointers)
{
- FIXME("%p, %u, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers);
+ FIXME("%p, %lu, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers);
return E_NOTIMPL;
}
@@ -1241,7 +1241,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPointersVirtual(IDebugDataS
static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePointersVirtual(IDebugDataSpaces *iface, ULONG count,
ULONG64 offset, ULONG64 *pointers)
{
- FIXME("%p, %u, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers);
+ FIXME("%p, %lu, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers);
return E_NOTIMPL;
}
@@ -1249,7 +1249,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePointersVirtual(IDebugData
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPhysical(IDebugDataSpaces *iface, ULONG64 offset, void *buffer,
ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
return E_NOTIMPL;
}
@@ -1257,7 +1257,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPhysical(IDebugDataSpaces *
static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePhysical(IDebugDataSpaces *iface, ULONG64 offset, void *buffer,
ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
return E_NOTIMPL;
}
@@ -1265,7 +1265,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePhysical(IDebugDataSpaces
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadControl(IDebugDataSpaces *iface, ULONG processor, ULONG64 offset,
void *buffer, ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %u, %s, %p, %u, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
+ FIXME("%p, %lu, %s, %p, %lu, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len);
return E_NOTIMPL;
}
@@ -1273,7 +1273,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadControl(IDebugDataSpaces *i
static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteControl(IDebugDataSpaces *iface, ULONG processor, ULONG64 offset,
void *buffer, ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %u, %s, %p, %u, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
+ FIXME("%p, %lu, %s, %p, %lu, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, written);
return E_NOTIMPL;
}
@@ -1281,7 +1281,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteControl(IDebugDataSpaces *
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadIo(IDebugDataSpaces *iface, ULONG type, ULONG bus_number,
ULONG address_space, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %u, %u, %u, %s, %p, %u, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset),
+ FIXME("%p, %lu, %lu, %lu, %s, %p, %lu, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset),
buffer, buffer_size, read_len);
return E_NOTIMPL;
@@ -1290,7 +1290,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadIo(IDebugDataSpaces *iface,
static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteIo(IDebugDataSpaces *iface, ULONG type, ULONG bus_number,
ULONG address_space, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %u, %u, %u, %s, %p, %u, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset),
+ FIXME("%p, %lu, %lu, %lu, %s, %p, %lu, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset),
buffer, buffer_size, written);
return E_NOTIMPL;
@@ -1298,14 +1298,14 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteIo(IDebugDataSpaces *iface
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadMsr(IDebugDataSpaces *iface, ULONG msr, ULONG64 *value)
{
- FIXME("%p, %u, %p stub.\n", iface, msr, value);
+ FIXME("%p, %lu, %p stub.\n", iface, msr, value);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteMsr(IDebugDataSpaces *iface, ULONG msr, ULONG64 value)
{
- FIXME("%p, %u, %s stub.\n", iface, msr, wine_dbgstr_longlong(value));
+ FIXME("%p, %lu, %s stub.\n", iface, msr, wine_dbgstr_longlong(value));
return E_NOTIMPL;
}
@@ -1313,7 +1313,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteMsr(IDebugDataSpaces *ifac
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadBusData(IDebugDataSpaces *iface, ULONG data_type,
ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %u, %u, %u, %u, %p, %u, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer,
+ FIXME("%p, %lu, %lu, %lu, %lu, %p, %lu, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer,
buffer_size, read_len);
return E_NOTIMPL;
@@ -1322,7 +1322,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadBusData(IDebugDataSpaces *i
static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteBusData(IDebugDataSpaces *iface, ULONG data_type,
ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %u, %u, %u, %u, %p, %u, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer,
+ FIXME("%p, %lu, %lu, %lu, %lu, %p, %lu, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer,
buffer_size, written);
return E_NOTIMPL;
@@ -1338,7 +1338,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_CheckLowMemory(IDebugDataSpaces
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadDebuggerData(IDebugDataSpaces *iface, ULONG index, void *buffer,
ULONG buffer_size, ULONG *data_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, data_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, data_size);
return E_NOTIMPL;
}
@@ -1346,7 +1346,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadDebuggerData(IDebugDataSpac
static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadProcessorSystemData(IDebugDataSpaces *iface, ULONG processor,
ULONG index, void *buffer, ULONG buffer_size, ULONG *data_size)
{
- FIXME("%p, %u, %u, %p, %u, %p stub.\n", iface, processor, index, buffer, buffer_size, data_size);
+ FIXME("%p, %lu, %lu, %p, %lu, %p stub.\n", iface, processor, index, buffer, buffer_size, data_size);
return E_NOTIMPL;
}
@@ -1408,21 +1408,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_AddSymbolOptions(IDebugSymbols3 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSymbolOptions(IDebugSymbols3 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols3 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
@@ -1430,7 +1430,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, char *buffer,
ULONG buffer_size, ULONG *name_size, ULONG64 *displacement)
{
- FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size,
+ FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size,
name_size, displacement);
return E_NOTIMPL;
@@ -1447,7 +1447,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByName(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, LONG delta,
char *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement)
{
- FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size,
+ FIXME("%p, %s, %ld, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size,
name_size, displacement);
return E_NOTIMPL;
@@ -1456,7 +1456,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line,
char *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement)
{
- FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size,
+ FIXME("%p, %s, %p, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size,
file_size, displacement);
return E_NOTIMPL;
@@ -1465,7 +1465,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols3 *iface, ULONG line, const char *file,
ULONG64 *offset)
{
- FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_a(file), offset);
+ FIXME("%p, %lu, %s, %p stub.\n", iface, line, debugstr_a(file), offset);
return E_NOTIMPL;
}
@@ -1496,7 +1496,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *i
const struct module_info *info;
struct target_process *target;
- TRACE("%p, %u, %p.\n", iface, index, base);
+ TRACE("%p, %lu, %p.\n", iface, index, base);
if (!(target = debug_client_get_target(debug_client)))
return E_UNEXPECTED;
@@ -1512,7 +1512,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbols3 *iface, const char *name,
ULONG start_index, ULONG *index, ULONG64 *base)
{
- FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(name), start_index, index, base);
+ FIXME("%p, %s, %lu, %p, %p stub.\n", iface, debugstr_a(name), start_index, index, base);
return E_NOTIMPL;
}
@@ -1524,7 +1524,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols3 *
static struct target_process *target;
const struct module_info *info;
- TRACE("%p, %s, %u, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base);
+ TRACE("%p, %s, %lu, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base);
if (!(target = debug_client_get_target(debug_client)))
return E_UNEXPECTED;
@@ -1551,7 +1551,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *ifa
ULONG module_name_buffer_size, ULONG *module_name_size, char *loaded_image_name,
ULONG loaded_image_name_buffer_size, ULONG *loaded_image_size)
{
- FIXME("%p, %u, %s, %p, %u, %p, %p, %u, %p, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base),
+ FIXME("%p, %lu, %s, %p, %lu, %p, %p, %lu, %p, %p, %lu, %p stub.\n", iface, index, wine_dbgstr_longlong(base),
image_name, image_name_buffer_size, image_name_size, module_name, module_name_buffer_size,
module_name_size, loaded_image_name, loaded_image_name_buffer_size, loaded_image_size);
@@ -1566,7 +1566,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols3
struct target_process *target;
unsigned int i;
- TRACE("%p, %u, %p, %u, %p.\n", iface, count, bases, start, params);
+ TRACE("%p, %lu, %p, %lu, %p.\n", iface, count, bases, start, params);
if (!(target = debug_client_get_target(debug_client)))
return E_UNEXPECTED;
@@ -1609,7 +1609,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModule(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeName(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id,
char *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, buffer,
+ FIXME("%p, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, buffer,
buffer_size, name_size);
return E_NOTIMPL;
@@ -1626,7 +1626,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeId(IDebugSymbols3 *iface, U
static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id,
ULONG *size)
{
- FIXME("%p, %s, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, size);
+ FIXME("%p, %s, %lu, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, size);
return E_NOTIMPL;
}
@@ -1634,7 +1634,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols3 *iface,
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffset(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id,
const char *field, ULONG *offset)
{
- FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, debugstr_a(field), offset);
+ FIXME("%p, %s, %lu, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, debugstr_a(field), offset);
return E_NOTIMPL;
}
@@ -1658,7 +1658,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetTypeId(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base,
ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
+ FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
type_id, buffer, buffer_size, read_len);
return E_NOTIMPL;
@@ -1667,7 +1667,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base,
ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
+ FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
type_id, buffer, buffer_size, written);
return E_NOTIMPL;
@@ -1676,7 +1676,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbol
static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbols3 *iface, ULONG output_control,
ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags)
{
- FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset),
+ FIXME("%p, %#lx, %s, %s, %lu, %#lx stub.\n", iface, output_control, wine_dbgstr_longlong(offset),
wine_dbgstr_longlong(base), type_id, flags);
return E_NOTIMPL;
@@ -1685,7 +1685,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbo
static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base,
ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len)
{
- FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
+ FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
type_id, buffer, buffer_size, read_len);
return E_NOTIMPL;
@@ -1694,7 +1694,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbol
static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset,
ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written)
{
- FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
+ FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base),
type_id, buffer, buffer_size, written);
return E_NOTIMPL;
@@ -1703,7 +1703,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbo
static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymbols3 *iface, ULONG output_control,
ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags)
{
- FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset),
+ FIXME("%p, %#lx, %s, %s, %lu, %#lx stub.\n", iface, output_control, wine_dbgstr_longlong(offset),
wine_dbgstr_longlong(base), type_id, flags);
return E_NOTIMPL;
@@ -1712,7 +1712,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymb
static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols3 *iface, ULONG64 *instr_offset,
DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size)
{
- FIXME("%p, %p, %p, %p, %u stub.\n", iface, instr_offset, frame, scope_context, scope_context_size);
+ FIXME("%p, %p, %p, %p, %lu stub.\n", iface, instr_offset, frame, scope_context, scope_context_size);
return E_NOTIMPL;
}
@@ -1720,7 +1720,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols3 *iface, UL
static HRESULT STDMETHODCALLTYPE debugsymbols_SetScope(IDebugSymbols3 *iface, ULONG64 instr_offset,
DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size)
{
- FIXME("%p, %s, %p, %p, %u stub.\n", iface, wine_dbgstr_longlong(instr_offset), frame, scope_context,
+ FIXME("%p, %s, %p, %p, %lu stub.\n", iface, wine_dbgstr_longlong(instr_offset), frame, scope_context,
scope_context_size);
return E_NOTIMPL;
@@ -1736,7 +1736,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ResetScope(IDebugSymbols3 *iface)
static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup(IDebugSymbols3 *iface, ULONG flags,
IDebugSymbolGroup *update, IDebugSymbolGroup **symbols)
{
- FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols);
+ FIXME("%p, %#lx, %p, %p stub.\n", iface, flags, update, symbols);
return E_NOTIMPL;
}
@@ -1759,7 +1759,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatch(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatch(IDebugSymbols3 *iface, ULONG64 handle, char *buffer,
ULONG buffer_size, ULONG *match_size, ULONG64 *offset)
{
- FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset);
+ FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset);
return E_NOTIMPL;
}
@@ -1781,7 +1781,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_Reload(IDebugSymbols3 *iface, cons
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size,
ULONG *path_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size);
return E_NOTIMPL;
}
@@ -1803,7 +1803,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPath(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size,
ULONG *path_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size);
return E_NOTIMPL;
}
@@ -1825,7 +1825,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePath(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size,
ULONG *path_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size);
return E_NOTIMPL;
}
@@ -1833,7 +1833,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols3 *ifac
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElement(IDebugSymbols3 *iface, ULONG index, char *buffer,
ULONG buffer_size, ULONG *element_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, element_size);
return E_NOTIMPL;
}
@@ -1855,7 +1855,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePath(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols3 *iface, ULONG start, const char *file,
ULONG flags, ULONG *found_element, char *buffer, ULONG buffer_size, ULONG *found_size)
{
- FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start, debugstr_a(file), flags, found_element, buffer,
+ FIXME("%p, %lu, %s, %#lx, %p, %p, %lu, %p stub.\n", iface, start, debugstr_a(file), flags, found_element, buffer,
buffer_size, found_size);
return E_NOTIMPL;
@@ -1864,7 +1864,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols3 *ifa
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSymbols3 *iface, const char *file,
ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_a(file), buffer, buffer_lines, file_lines);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, debugstr_a(file), buffer, buffer_lines, file_lines);
return E_NOTIMPL;
}
@@ -1880,7 +1880,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug
DWORD handle;
UINT size;
- TRACE("%p, %u, %s, %s, %p, %u, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer,
+ TRACE("%p, %lu, %s, %s, %p, %lu, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer,
buffer_size, info_size);
if (!(target = debug_client_get_target(debug_client)))
@@ -1934,7 +1934,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3
struct target_process *target;
HRESULT hr;
- TRACE("%p, %u, %u, %s, %p, %u, %p.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size,
+ TRACE("%p, %lu, %lu, %s, %p, %lu, %p.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size,
name_size);
if (!(target = debug_client_get_target(debug_client)))
@@ -1960,10 +1960,10 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3
case DEBUG_MODNAME_LOADED_IMAGE:
case DEBUG_MODNAME_SYMBOL_FILE:
case DEBUG_MODNAME_MAPPED_IMAGE:
- FIXME("Unsupported name info %d.\n", which);
+ FIXME("Unsupported name info %ld.\n", which);
return E_NOTIMPL;
default:
- WARN("Unknown name info %d.\n", which);
+ WARN("Unknown name info %ld.\n", which);
return E_INVALIDARG;
}
@@ -1973,7 +1973,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id,
ULONG64 value, char *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id,
+ FIXME("%p, %s, %lu, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id,
wine_dbgstr_longlong(value), buffer, buffer_size, name_size);
return E_NOTIMPL;
@@ -1982,7 +1982,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id,
ULONG field_index, char *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer,
+ FIXME("%p, %s, %lu, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer,
buffer_size, name_size);
return E_NOTIMPL;
@@ -1997,21 +1997,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeOptions(IDebugSymbols3 *ifa
static HRESULT STDMETHODCALLTYPE debugsymbols_AddTypeOptions(IDebugSymbols3 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveTypeOptions(IDebugSymbols3 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugsymbols_SetTypeOptions(IDebugSymbols3 *iface, ULONG options)
{
- FIXME("%p, %#x stub.\n", iface, options);
+ FIXME("%p, %#lx stub.\n", iface, options);
return E_NOTIMPL;
}
@@ -2019,7 +2019,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetTypeOptions(IDebugSymbols3 *ifa
static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, WCHAR *buffer,
ULONG buffer_size, ULONG *name_size, ULONG64 *displacement)
{
- FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size,
+ FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size,
displacement);
return E_NOTIMPL;
@@ -2036,7 +2036,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByNameWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset,
LONG delta, WCHAR *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement)
{
- FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size,
+ FIXME("%p, %s, %ld, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size,
name_size, displacement);
return E_NOTIMPL;
@@ -2045,7 +2045,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffsetWide(IDebugSymb
static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line,
WCHAR *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement)
{
- FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size,
+ FIXME("%p, %s, %p, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size,
file_size, displacement);
return E_NOTIMPL;
@@ -2054,7 +2054,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffsetWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLineWide(IDebugSymbols3 *iface, ULONG line, const WCHAR *file,
ULONG64 *offset)
{
- FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_w(file), offset);
+ FIXME("%p, %lu, %s, %p stub.\n", iface, line, debugstr_w(file), offset);
return E_NOTIMPL;
}
@@ -2062,7 +2062,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLineWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleNameWide(IDebugSymbols3 *iface, const WCHAR *name,
ULONG start_index, ULONG *index, ULONG64 *base)
{
- FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_w(name), start_index, index, base);
+ FIXME("%p, %s, %lu, %p, %p stub.\n", iface, debugstr_w(name), start_index, index, base);
return E_NOTIMPL;
}
@@ -2078,7 +2078,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModuleWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id,
WCHAR *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, buffer, buffer_size,
+ FIXME("%p, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, buffer, buffer_size,
name_size);
return E_NOTIMPL;
@@ -2095,7 +2095,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeIdWide(IDebugSymbols3 *ifac
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffsetWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id,
const WCHAR *field, ULONG *offset)
{
- FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, debugstr_w(field), offset);
+ FIXME("%p, %s, %lu, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, debugstr_w(field), offset);
return E_NOTIMPL;
}
@@ -2111,7 +2111,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeIdWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup2(IDebugSymbols3 *iface, ULONG flags,
PDEBUG_SYMBOL_GROUP2 update, PDEBUG_SYMBOL_GROUP2 *symbols)
{
- FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols);
+ FIXME("%p, %#lx, %p, %p stub.\n", iface, flags, update, symbols);
return E_NOTIMPL;
}
@@ -2134,7 +2134,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatchWide(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatchWide(IDebugSymbols3 *iface, ULONG64 handle,
WCHAR *buffer, ULONG buffer_size, ULONG *match_size, ULONG64 *offset)
{
- FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset);
+ FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset);
return E_NOTIMPL;
}
@@ -2149,7 +2149,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReloadWide(IDebugSymbols3 *iface,
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size,
ULONG *path_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size);
return E_NOTIMPL;
}
@@ -2171,7 +2171,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPathWide(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size,
ULONG *path_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size);
return E_NOTIMPL;
}
@@ -2193,7 +2193,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePathWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size,
ULONG *path_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size);
return E_NOTIMPL;
}
@@ -2201,7 +2201,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathWide(IDebugSymbols3 *
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElementWide(IDebugSymbols3 *iface, ULONG index,
WCHAR *buffer, ULONG buffer_size, ULONG *element_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, element_size);
return E_NOTIMPL;
}
@@ -2223,7 +2223,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePathWide(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFileWide(IDebugSymbols3 *iface, ULONG start_element,
const WCHAR *file, ULONG flags, ULONG *found_element, WCHAR *buffer, ULONG buffer_size, ULONG *found_size)
{
- FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start_element, debugstr_w(file), flags, found_element,
+ FIXME("%p, %lu, %s, %#lx, %p, %p, %lu, %p stub.\n", iface, start_element, debugstr_w(file), flags, found_element,
buffer, buffer_size, found_size);
return E_NOTIMPL;
@@ -2232,7 +2232,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFileWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsetsWide(IDebugSymbols3 *iface, const WCHAR *file,
ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines)
{
- FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_w(file), buffer, buffer_lines, file_lines);
+ FIXME("%p, %s, %p, %lu, %p stub.\n", iface, debugstr_w(file), buffer, buffer_lines, file_lines);
return E_NOTIMPL;
}
@@ -2240,7 +2240,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsetsWide(IDebu
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformationWide(IDebugSymbols3 *iface, ULONG index,
ULONG64 base, const WCHAR *item, void *buffer, ULONG buffer_size, ULONG *version_info_size)
{
- FIXME("%p, %u, %s, %s, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_w(item), buffer,
+ FIXME("%p, %lu, %s, %s, %p, %lu, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_w(item), buffer,
buffer_size, version_info_size);
return E_NOTIMPL;
@@ -2249,7 +2249,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformationWide(ID
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameStringWide(IDebugSymbols3 *iface, ULONG which, ULONG index,
ULONG64 base, WCHAR *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %u, %u, %s, %p, %u, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size,
+ FIXME("%p, %lu, %lu, %s, %p, %lu, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size,
name_size);
return E_NOTIMPL;
@@ -2258,7 +2258,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameStringWide(IDebugSymb
static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id,
ULONG64 value, WCHAR *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id,
+ FIXME("%p, %s, %lu, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id,
wine_dbgstr_longlong(value), buffer, buffer_size, name_size);
return E_NOTIMPL;
@@ -2267,7 +2267,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantNameWide(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id,
ULONG field_index, WCHAR *buffer, ULONG buffer_size, ULONG *name_size)
{
- FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer,
+ FIXME("%p, %s, %lu, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer,
buffer_size, name_size);
return E_NOTIMPL;
@@ -2275,7 +2275,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldNameWide(IDebugSymbols3 *i
static HRESULT STDMETHODCALLTYPE debugsymbols_IsManagedModule(IDebugSymbols3 *iface, ULONG index, ULONG64 base)
{
- FIXME("%p, %u, %s stub.\n", iface, index, wine_dbgstr_longlong(base));
+ FIXME("%p, %lu, %s stub.\n", iface, index, wine_dbgstr_longlong(base));
return E_NOTIMPL;
}
@@ -2283,7 +2283,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_IsManagedModule(IDebugSymbols3 *if
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2(IDebugSymbols3 *iface, const char *name,
ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base)
{
- FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_a(name), start_index, flags, index, base);
+ FIXME("%p, %s, %lu, %#lx, %p, %p stub.\n", iface, debugstr_a(name), start_index, flags, index, base);
return E_NOTIMPL;
}
@@ -2291,7 +2291,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2(IDebugSymbo
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2Wide(IDebugSymbols3 *iface, const WCHAR *name,
ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base)
{
- FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_w(name), start_index, flags, index, base);
+ FIXME("%p, %s, %lu, %#lx, %p, %p stub.\n", iface, debugstr_w(name), start_index, flags, index, base);
return E_NOTIMPL;
}
@@ -2299,7 +2299,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2Wide(IDebugS
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset2(IDebugSymbols3 *iface, ULONG64 offset,
ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base)
{
- FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, flags, index, base);
+ FIXME("%p, %s, %lu, %#lx, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, flags, index, base);
return E_NOTIMPL;
}
@@ -2307,7 +2307,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset2(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModule(IDebugSymbols3 *iface, ULONG64 base, ULONG size,
const char *image_path, const char *module_name, ULONG flags)
{
- FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_a(image_path),
+ FIXME("%p, %s, %lu, %s, %s, %#lx stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_a(image_path),
debugstr_a(module_name), flags);
return E_NOTIMPL;
@@ -2316,7 +2316,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModule(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModuleWide(IDebugSymbols3 *iface, ULONG64 base, ULONG size,
const WCHAR *image_path, const WCHAR *module_name, ULONG flags)
{
- FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_w(image_path),
+ FIXME("%p, %s, %lu, %s, %s, %#lx stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_w(image_path),
debugstr_w(module_name), flags);
return E_NOTIMPL;
@@ -2338,7 +2338,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetCurrentScopeFrameIndex(IDebugSy
static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFrameByIndex(IDebugSymbols3 *iface, ULONG index)
{
- FIXME("%p, %u stub.\n", iface, index);
+ FIXME("%p, %lu stub.\n", iface, index);
return E_NOTIMPL;
}
@@ -2346,7 +2346,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFrameByIndex(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromJitDebugInfo(IDebugSymbols3 *iface, ULONG output_control,
ULONG64 info_offset)
{
- FIXME("%p, %u, %s stub.\n", iface, output_control, wine_dbgstr_longlong(info_offset));
+ FIXME("%p, %lu, %s stub.\n", iface, output_control, wine_dbgstr_longlong(info_offset));
return E_NOTIMPL;
}
@@ -2361,7 +2361,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromStoredEvent(IDebugSymb
static HRESULT STDMETHODCALLTYPE debugsymbols_OutputSymbolByOffset(IDebugSymbols3 *iface, ULONG output_control,
ULONG flags, ULONG64 offset)
{
- FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, wine_dbgstr_longlong(offset));
+ FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, flags, wine_dbgstr_longlong(offset));
return E_NOTIMPL;
}
@@ -2369,7 +2369,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputSymbolByOffset(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFunctionEntryByOffset(IDebugSymbols3 *iface, ULONG64 offset,
ULONG flags, void *buffer, ULONG buffer_size, ULONG *needed_size)
{
- FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size,
+ FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size,
needed_size);
return E_NOTIMPL;
@@ -2378,7 +2378,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFunctionEntryByOffset(IDebugSym
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffset(IDebugSymbols3 *iface, ULONG64 module,
ULONG container_type_id, const char *field, ULONG *field_type_id, ULONG *offset)
{
- FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_a(field),
+ FIXME("%p, %s, %lu, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_a(field),
field_type_id, offset);
return E_NOTIMPL;
@@ -2387,7 +2387,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffset(IDebugSymbol
static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffsetWide(IDebugSymbols3 *iface, ULONG64 module,
ULONG container_type_id, const WCHAR *field, ULONG *field_type_id, ULONG *offset)
{
- FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_w(field),
+ FIXME("%p, %s, %lu, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_w(field),
field_type_id, offset);
return E_NOTIMPL;
@@ -2396,7 +2396,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffsetWide(IDebugSy
static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbol(IDebugSymbols3 *iface, ULONG64 offset, ULONG size,
const char *name, ULONG flags, DEBUG_MODULE_AND_ID *id)
{
- FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_a(name), flags, id);
+ FIXME("%p, %s, %lu, %s, %#lx, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_a(name), flags, id);
return E_NOTIMPL;
}
@@ -2404,7 +2404,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbol(IDebugSymbols3
static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbolWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG size,
const WCHAR *name, ULONG flags, DEBUG_MODULE_AND_ID *id)
{
- FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_w(name), flags, id);
+ FIXME("%p, %s, %lu, %s, %#lx, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_w(name), flags, id);
return E_NOTIMPL;
}
@@ -2419,7 +2419,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSyntheticSymbol(IDebugSymbol
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset,
ULONG flags, DEBUG_MODULE_AND_ID *ids, LONG64 *displacements, ULONG count, ULONG *entries)
{
- FIXME("%p, %s, %#x, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, ids, displacements, count,
+ FIXME("%p, %s, %#lx, %p, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, ids, displacements, count,
entries);
return E_NOTIMPL;
@@ -2428,7 +2428,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByOffset(IDebugSym
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByName(IDebugSymbols3 *iface, const char *symbol,
ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries)
{
- FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(symbol), flags, ids, count, entries);
+ FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_a(symbol), flags, ids, count, entries);
return E_NOTIMPL;
}
@@ -2436,7 +2436,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByName(IDebugSymbo
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByNameWide(IDebugSymbols3 *iface, const WCHAR *symbol,
ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries)
{
- FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(symbol), flags, ids, count, entries);
+ FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_w(symbol), flags, ids, count, entries);
return E_NOTIMPL;
}
@@ -2460,7 +2460,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryInformation(IDebugSy
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryString(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id,
ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size)
{
- FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size);
+ FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, id, which, buffer, buffer_size, string_size);
return E_NOTIMPL;
}
@@ -2468,7 +2468,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryString(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryStringWide(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id,
ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size)
{
- FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size);
+ FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, id, which, buffer, buffer_size, string_size);
return E_NOTIMPL;
}
@@ -2476,7 +2476,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryStringWide(IDebugSym
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryOffsetRegions(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id,
ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG regions_count, ULONG *regions_avail)
{
- FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, id, flags, regions, regions_count, regions_avail);
+ FIXME("%p, %p, %#lx, %p, %lu, %p stub.\n", iface, id, flags, regions, regions_count, regions_avail);
return E_NOTIMPL;
}
@@ -2484,7 +2484,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryOffsetRegions(IDebug
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryBySymbolEntry(IDebugSymbols3 *iface,
DEBUG_MODULE_AND_ID *from_id, ULONG flags, DEBUG_MODULE_AND_ID *to_id)
{
- FIXME("%p, %p, %#x, %p stub.\n", iface, from_id, flags, to_id);
+ FIXME("%p, %p, %#lx, %p stub.\n", iface, from_id, flags, to_id);
return E_NOTIMPL;
}
@@ -2492,7 +2492,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryBySymbolEntry(IDebug
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset,
ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail)
{
- FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, entries, count, entries_avail);
+ FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, entries, count, entries_avail);
return E_NOTIMPL;
}
@@ -2500,7 +2500,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByOffset(IDebugSym
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLine(IDebugSymbols3 *iface, ULONG line,
const char *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail)
{
- FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(file), flags, entries, count, entries_avail);
+ FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_a(file), flags, entries, count, entries_avail);
return E_NOTIMPL;
}
@@ -2508,7 +2508,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLine(IDebugSymbo
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLineWide(IDebugSymbols3 *iface, ULONG line,
const WCHAR *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail)
{
- FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(file), flags, entries, count, entries_avail);
+ FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_w(file), flags, entries, count, entries_avail);
return E_NOTIMPL;
}
@@ -2516,7 +2516,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLineWide(IDebugS
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryString(IDebugSymbols3 *iface,
DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size)
{
- FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size);
+ FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size);
return E_NOTIMPL;
}
@@ -2524,7 +2524,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryString(IDebugSymbols
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryStringWide(IDebugSymbols3 *iface,
DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size)
{
- FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size);
+ FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size);
return E_NOTIMPL;
}
@@ -2532,7 +2532,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryStringWide(IDebugSym
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryOffsetRegions(IDebugSymbols3 *iface,
DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG count, ULONG *regions_avail)
{
- FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, entry, flags, regions, count, regions_avail);
+ FIXME("%p, %p, %#lx, %p, %lu, %p stub.\n", iface, entry, flags, regions, count, regions_avail);
return E_NOTIMPL;
}
@@ -2540,7 +2540,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryOffsetRegions(IDebug
static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryBySourceEntry(IDebugSymbols3 *iface,
DEBUG_SYMBOL_SOURCE_ENTRY *from_entry, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *to_entry)
{
- FIXME("%p, %p, %#x, %p stub.\n", iface, from_entry, flags, to_entry);
+ FIXME("%p, %p, %#lx, %p stub.\n", iface, from_entry, flags, to_entry);
return E_NOTIMPL;
}
@@ -2707,7 +2707,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterrupt(IDebugControl2 *iface
static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterrupt(IDebugControl2 *iface, ULONG flags)
{
- FIXME("%p, %#x stub.\n", iface, flags);
+ FIXME("%p, %#lx stub.\n", iface, flags);
return E_NOTIMPL;
}
@@ -2721,7 +2721,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterruptTimeout(IDebugControl2
static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterruptTimeout(IDebugControl2 *iface, ULONG timeout)
{
- FIXME("%p, %u stub.\n", iface, timeout);
+ FIXME("%p, %lu stub.\n", iface, timeout);
return E_NOTIMPL;
}
@@ -2729,7 +2729,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterruptTimeout(IDebugControl2
static HRESULT STDMETHODCALLTYPE debugcontrol_GetLogFile(IDebugControl2 *iface, char *buffer, ULONG buffer_size,
ULONG *file_size, BOOL *append)
{
- FIXME("%p, %p, %u, %p, %p stub.\n", iface, buffer, buffer_size, file_size, append);
+ FIXME("%p, %p, %lu, %p, %p stub.\n", iface, buffer, buffer_size, file_size, append);
return E_NOTIMPL;
}
@@ -2755,7 +2755,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetLogMask(IDebugControl2 *iface,
static HRESULT STDMETHODCALLTYPE debugcontrol_SetLogMask(IDebugControl2 *iface, ULONG mask)
{
- FIXME("%p, %#x stub.\n", iface, mask);
+ FIXME("%p, %#lx stub.\n", iface, mask);
return E_NOTIMPL;
}
@@ -2763,7 +2763,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetLogMask(IDebugControl2 *iface,
static HRESULT STDMETHODCALLTYPE debugcontrol_Input(IDebugControl2 *iface, char *buffer, ULONG buffer_size,
ULONG *input_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, input_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, input_size);
return E_NOTIMPL;
}
@@ -2777,7 +2777,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_ReturnInput(IDebugControl2 *iface,
static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULONG mask, const char *format, ...)
{
- FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format));
+ FIXME("%p, %#lx, %s stub.\n", iface, mask, debugstr_a(format));
return E_NOTIMPL;
}
@@ -2785,7 +2785,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULO
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface, ULONG mask, const char *format,
va_list args)
{
- FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format));
+ FIXME("%p, %#lx, %s stub.\n", iface, mask, debugstr_a(format));
return E_NOTIMPL;
}
@@ -2793,7 +2793,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface
static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 *iface, ULONG output_control,
ULONG mask, const char *format, ...)
{
- FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format));
+ FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, mask, debugstr_a(format));
return E_NOTIMPL;
}
@@ -2801,7 +2801,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 *
static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugControl2 *iface, ULONG output_control,
ULONG mask, const char *format, va_list args)
{
- FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format));
+ FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, mask, debugstr_a(format));
return E_NOTIMPL;
}
@@ -2809,7 +2809,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugContr
static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *iface, ULONG output_control,
const char *format, ...)
{
- FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format));
+ FIXME("%p, %lu, %s stub.\n", iface, output_control, debugstr_a(format));
return E_NOTIMPL;
}
@@ -2817,7 +2817,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *ifac
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2 *iface, ULONG output_control,
const char *format, va_list args)
{
- FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format));
+ FIXME("%p, %lu, %s stub.\n", iface, output_control, debugstr_a(format));
return E_NOTIMPL;
}
@@ -2825,7 +2825,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2
static HRESULT STDMETHODCALLTYPE debugcontrol_GetPromptText(IDebugControl2 *iface, char *buffer, ULONG buffer_size,
ULONG *text_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, text_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, text_size);
return E_NOTIMPL;
}
@@ -2833,14 +2833,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetPromptText(IDebugControl2 *ifac
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputCurrentState(IDebugControl2 *iface, ULONG output_control,
ULONG flags)
{
- FIXME("%p, %u, %#x stub.\n", iface, output_control, flags);
+ FIXME("%p, %lu, %#lx stub.\n", iface, output_control, flags);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVersionInformation(IDebugControl2 *iface, ULONG output_control)
{
- FIXME("%p, %u stub.\n", iface, output_control);
+ FIXME("%p, %lu stub.\n", iface, output_control);
return E_NOTIMPL;
}
@@ -2870,7 +2870,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_Assemble(IDebugControl2 *iface, UL
static HRESULT STDMETHODCALLTYPE debugcontrol_Disassemble(IDebugControl2 *iface, ULONG64 offset, ULONG flags,
char *buffer, ULONG buffer_size, ULONG *disassm_size, ULONG64 *end_offset)
{
- FIXME("%p, %s, %#x, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size,
+ FIXME("%p, %s, %#lx, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size,
disassm_size, end_offset);
return E_NOTIMPL;
@@ -2886,7 +2886,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetDisassembleEffectiveOffset(IDeb
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassembly(IDebugControl2 *iface, ULONG output_control,
ULONG64 offset, ULONG flags, ULONG64 *end_offset)
{
- FIXME("%p, %u, %s, %#x, %p stub.\n", iface, output_control, wine_dbgstr_longlong(offset), flags, end_offset);
+ FIXME("%p, %lu, %s, %#lx, %p stub.\n", iface, output_control, wine_dbgstr_longlong(offset), flags, end_offset);
return E_NOTIMPL;
}
@@ -2895,7 +2895,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassemblyLines(IDebugContr
ULONG prev_lines, ULONG total_lines, ULONG64 offset, ULONG flags, ULONG *offset_line, ULONG64 *start_offset,
ULONG64 *end_offset, ULONG64 *line_offsets)
{
- FIXME("%p, %u, %u, %u, %s, %#x, %p, %p, %p, %p stub.\n", iface, output_control, prev_lines, total_lines,
+ FIXME("%p, %lu, %lu, %lu, %s, %#lx, %p, %p, %p, %p stub.\n", iface, output_control, prev_lines, total_lines,
wine_dbgstr_longlong(offset), flags, offset_line, start_offset, end_offset, line_offsets);
return E_NOTIMPL;
@@ -2904,7 +2904,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassemblyLines(IDebugContr
static HRESULT STDMETHODCALLTYPE debugcontrol_GetNearInstruction(IDebugControl2 *iface, ULONG64 offset, LONG delta,
ULONG64 *instr_offset)
{
- FIXME("%p, %s, %d, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, instr_offset);
+ FIXME("%p, %s, %ld, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, instr_offset);
return E_NOTIMPL;
}
@@ -2912,7 +2912,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNearInstruction(IDebugControl2
static HRESULT STDMETHODCALLTYPE debugcontrol_GetStackTrace(IDebugControl2 *iface, ULONG64 frame_offset,
ULONG64 stack_offset, ULONG64 instr_offset, DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled)
{
- FIXME("%p, %s, %s, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(frame_offset),
+ FIXME("%p, %s, %s, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(frame_offset),
wine_dbgstr_longlong(stack_offset), wine_dbgstr_longlong(instr_offset), frames, frames_size, frames_filled);
return E_NOTIMPL;
@@ -2928,7 +2928,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetReturnOffset(IDebugControl2 *if
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *iface, ULONG output_control,
DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG flags)
{
- FIXME("%p, %u, %p, %u, %#x stub.\n", iface, output_control, frames, frames_size, flags);
+ FIXME("%p, %lu, %p, %lu, %#lx stub.\n", iface, output_control, frames, frames_size, flags);
return E_NOTIMPL;
}
@@ -2990,7 +2990,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberPossibleExecutingProcesso
static HRESULT STDMETHODCALLTYPE debugcontrol_GetPossibleExecutingProcessorTypes(IDebugControl2 *iface, ULONG start,
ULONG count, ULONG *types)
{
- FIXME("%p, %u, %u, %p stub.\n", iface, start, count, types);
+ FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, types);
return E_NOTIMPL;
}
@@ -3006,7 +3006,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSystemVersion(IDebugControl2 *i
ULONG *minor, char *sp_string, ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number,
char *build_string, ULONG build_string_size, ULONG *build_string_used)
{
- FIXME("%p, %p, %p, %p, %p, %u, %p, %p, %p, %u, %p stub.\n", iface, platform_id, major, minor, sp_string,
+ FIXME("%p, %p, %p, %p, %p, %lu, %p, %p, %p, %lu, %p stub.\n", iface, platform_id, major, minor, sp_string,
sp_string_size, sp_string_used, sp_number, build_string, build_string_size, build_string_used);
return E_NOTIMPL;
@@ -3045,7 +3045,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *ifa
hr = S_OK;
break;
default:
- FIXME("Unexpected cpu type %#x.\n", target->cpu_type);
+ FIXME("Unexpected cpu type %#lx.\n", target->cpu_type);
hr = E_UNEXPECTED;
}
@@ -3070,7 +3070,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberSupportedProcessorTypes(I
static HRESULT STDMETHODCALLTYPE debugcontrol_GetSupportedProcessorTypes(IDebugControl2 *iface, ULONG start,
ULONG count, ULONG *types)
{
- FIXME("%p, %u, %u, %p stub.\n", iface, start, count, types);
+ FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, types);
return E_NOTIMPL;
}
@@ -3079,7 +3079,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetProcessorTypeNames(IDebugContro
ULONG full_name_buffer_size, ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size,
ULONG *abbrev_name_size)
{
- FIXME("%p, %u, %p, %u, %p, %p, %u, %p stub.\n", iface, type, full_name, full_name_buffer_size, full_name_size,
+ FIXME("%p, %lu, %p, %lu, %p, %p, %lu, %p stub.\n", iface, type, full_name, full_name_buffer_size, full_name_size,
abbrev_name, abbrev_name_buffer_size, abbrev_name_size);
return E_NOTIMPL;
@@ -3094,7 +3094,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetEffectiveProcessorType(IDebugCo
static HRESULT STDMETHODCALLTYPE debugcontrol_SetEffectiveProcessorType(IDebugControl2 *iface, ULONG type)
{
- FIXME("%p, %u stub.\n", iface, type);
+ FIXME("%p, %lu stub.\n", iface, type);
return E_NOTIMPL;
}
@@ -3108,7 +3108,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetExecutionStatus(IDebugControl2
static HRESULT STDMETHODCALLTYPE debugcontrol_SetExecutionStatus(IDebugControl2 *iface, ULONG status)
{
- FIXME("%p, %u stub.\n", iface, status);
+ FIXME("%p, %lu stub.\n", iface, status);
return E_NOTIMPL;
}
@@ -3122,7 +3122,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetCodeLevel(IDebugControl2 *iface
static HRESULT STDMETHODCALLTYPE debugcontrol_SetCodeLevel(IDebugControl2 *iface, ULONG level)
{
- FIXME("%p, %u stub.\n", iface, level);
+ FIXME("%p, %lu stub.\n", iface, level);
return E_NOTIMPL;
}
@@ -3142,7 +3142,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_AddEngineOptions(IDebugControl2 *i
{
struct debug_client *debug_client = impl_from_IDebugControl2(iface);
- TRACE("%p, %#x.\n", iface, options);
+ TRACE("%p, %#lx.\n", iface, options);
if (options & ~DEBUG_ENGOPT_ALL)
return E_INVALIDARG;
@@ -3156,7 +3156,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveEngineOptions(IDebugControl2
{
struct debug_client *debug_client = impl_from_IDebugControl2(iface);
- TRACE("%p, %#x.\n", iface, options);
+ TRACE("%p, %#lx.\n", iface, options);
debug_client->engine_options &= ~options;
@@ -3167,7 +3167,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetEngineOptions(IDebugControl2 *i
{
struct debug_client *debug_client = impl_from_IDebugControl2(iface);
- TRACE("%p, %#x.\n", iface, options);
+ TRACE("%p, %#lx.\n", iface, options);
if (options & ~DEBUG_ENGOPT_ALL)
return E_INVALIDARG;
@@ -3188,7 +3188,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSystemErrorControl(IDebugContro
static HRESULT STDMETHODCALLTYPE debugcontrol_SetSystemErrorControl(IDebugControl2 *iface, ULONG output_level,
ULONG break_level)
{
- FIXME("%p, %u, %u stub.\n", iface, output_level, break_level);
+ FIXME("%p, %lu, %lu stub.\n", iface, output_level, break_level);
return E_NOTIMPL;
}
@@ -3196,14 +3196,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetSystemErrorControl(IDebugContro
static HRESULT STDMETHODCALLTYPE debugcontrol_GetTextMacro(IDebugControl2 *iface, ULONG slot, char *buffer,
ULONG buffer_size, ULONG *macro_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, slot, buffer, buffer_size, macro_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, slot, buffer, buffer_size, macro_size);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugcontrol_SetTextMacro(IDebugControl2 *iface, ULONG slot, const char *macro)
{
- FIXME("%p, %u, %s stub.\n", iface, slot, debugstr_a(macro));
+ FIXME("%p, %lu, %s stub.\n", iface, slot, debugstr_a(macro));
return E_NOTIMPL;
}
@@ -3217,7 +3217,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetRadix(IDebugControl2 *iface, UL
static HRESULT STDMETHODCALLTYPE debugcontrol_SetRadix(IDebugControl2 *iface, ULONG radix)
{
- FIXME("%p, %u stub.\n", iface, radix);
+ FIXME("%p, %lu stub.\n", iface, radix);
return E_NOTIMPL;
}
@@ -3225,7 +3225,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetRadix(IDebugControl2 *iface, UL
static HRESULT STDMETHODCALLTYPE debugcontrol_Evaluate(IDebugControl2 *iface, const char *expression,
ULONG desired_type, DEBUG_VALUE *value, ULONG *remainder_index)
{
- FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(expression), desired_type, value, remainder_index);
+ FIXME("%p, %s, %lu, %p, %p stub.\n", iface, debugstr_a(expression), desired_type, value, remainder_index);
return E_NOTIMPL;
}
@@ -3233,7 +3233,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_Evaluate(IDebugControl2 *iface, co
static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValue(IDebugControl2 *iface, DEBUG_VALUE input, ULONG output_type,
DEBUG_VALUE *output)
{
- FIXME("%p, %u, %p stub.\n", iface, output_type, output);
+ FIXME("%p, %lu, %p stub.\n", iface, output_type, output);
return E_NOTIMPL;
}
@@ -3241,7 +3241,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValue(IDebugControl2 *iface,
static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValues(IDebugControl2 *iface, ULONG count, DEBUG_VALUE *input,
ULONG *output_types, DEBUG_VALUE *output)
{
- FIXME("%p, %u, %p, %p, %p stub.\n", iface, count, input, output_types, output);
+ FIXME("%p, %lu, %p, %p, %p stub.\n", iface, count, input, output_types, output);
return E_NOTIMPL;
}
@@ -3249,7 +3249,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValues(IDebugControl2 *iface
static HRESULT STDMETHODCALLTYPE debugcontrol_Execute(IDebugControl2 *iface, ULONG output_control, const char *command,
ULONG flags)
{
- FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(command), flags);
+ FIXME("%p, %lu, %s, %#lx stub.\n", iface, output_control, debugstr_a(command), flags);
return E_NOTIMPL;
}
@@ -3257,7 +3257,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_Execute(IDebugControl2 *iface, ULO
static HRESULT STDMETHODCALLTYPE debugcontrol_ExecuteCommandFile(IDebugControl2 *iface, ULONG output_control,
const char *command_file, ULONG flags)
{
- FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(command_file), flags);
+ FIXME("%p, %lu, %s, %#lx stub.\n", iface, output_control, debugstr_a(command_file), flags);
return E_NOTIMPL;
}
@@ -3272,14 +3272,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberBreakpoints(IDebugControl
static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointByIndex(IDebugControl2 *iface, ULONG index,
IDebugBreakpoint **bp)
{
- FIXME("%p, %u, %p stub.\n", iface, index, bp);
+ FIXME("%p, %lu, %p stub.\n", iface, index, bp);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointById(IDebugControl2 *iface, ULONG id, IDebugBreakpoint **bp)
{
- FIXME("%p, %u, %p stub.\n", iface, id, bp);
+ FIXME("%p, %lu, %p stub.\n", iface, id, bp);
return E_NOTIMPL;
}
@@ -3287,7 +3287,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointById(IDebugControl2 *
static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointParameters(IDebugControl2 *iface, ULONG count, ULONG *ids,
ULONG start, DEBUG_BREAKPOINT_PARAMETERS *parameters)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, ids, start, parameters);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, count, ids, start, parameters);
return E_NOTIMPL;
}
@@ -3295,7 +3295,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointParameters(IDebugCont
static HRESULT STDMETHODCALLTYPE debugcontrol_AddBreakpoint(IDebugControl2 *iface, ULONG type, ULONG desired_id,
IDebugBreakpoint **bp)
{
- FIXME("%p, %u, %u, %p stub.\n", iface, type, desired_id, bp);
+ FIXME("%p, %lu, %lu, %p stub.\n", iface, type, desired_id, bp);
return E_NOTIMPL;
}
@@ -3310,7 +3310,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveBreakpoint(IDebugControl2 *i
static HRESULT STDMETHODCALLTYPE debugcontrol_AddExtension(IDebugControl2 *iface, const char *path, ULONG flags,
ULONG64 *handle)
{
- FIXME("%p, %s, %#x, %p stub.\n", iface, debugstr_a(path), flags, handle);
+ FIXME("%p, %s, %#lx, %p stub.\n", iface, debugstr_a(path), flags, handle);
return E_NOTIMPL;
}
@@ -3373,7 +3373,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberEventFilters(IDebugContro
static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterText(IDebugControl2 *iface, ULONG index, char *buffer,
ULONG buffer_size, ULONG *text_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, text_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, text_size);
return E_NOTIMPL;
}
@@ -3381,7 +3381,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterText(IDebugControl2
static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterCommand(IDebugControl2 *iface, ULONG index, char *buffer,
ULONG buffer_size, ULONG *command_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, command_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, command_size);
return E_NOTIMPL;
}
@@ -3389,7 +3389,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterCommand(IDebugContro
static HRESULT STDMETHODCALLTYPE debugcontrol_SetEventFilterCommand(IDebugControl2 *iface, ULONG index,
const char *command)
{
- FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(command));
+ FIXME("%p, %lu, %s stub.\n", iface, index, debugstr_a(command));
return E_NOTIMPL;
}
@@ -3397,7 +3397,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetEventFilterCommand(IDebugContro
static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterParameters(IDebugControl2 *iface, ULONG start,
ULONG count, DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters)
{
- FIXME("%p, %u, %u, %p stub.\n", iface, start, count, parameters);
+ FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, parameters);
return E_NOTIMPL;
}
@@ -3405,7 +3405,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterParameters(IDebug
static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterParameters(IDebugControl2 *iface, ULONG start,
ULONG count, DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters)
{
- FIXME("%p, %u, %u, %p stub.\n", iface, start, count, parameters);
+ FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, parameters);
return E_NOTIMPL;
}
@@ -3413,7 +3413,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterParameters(IDebug
static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterArgument(IDebugControl2 *iface, ULONG index,
char *buffer, ULONG buffer_size, ULONG *argument_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, argument_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, argument_size);
return E_NOTIMPL;
}
@@ -3421,7 +3421,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterArgument(IDebugCo
static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterArgument(IDebugControl2 *iface, ULONG index,
const char *argument)
{
- FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(argument));
+ FIXME("%p, %lu, %s stub.\n", iface, index, debugstr_a(argument));
return E_NOTIMPL;
}
@@ -3429,7 +3429,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterArgument(IDebugCo
static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterParameters(IDebugControl2 *iface, ULONG count,
ULONG *codes, ULONG start, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, codes, start, parameters);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, count, codes, start, parameters);
return E_NOTIMPL;
}
@@ -3437,7 +3437,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterParameters(IDebu
static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterParameters(IDebugControl2 *iface, ULONG count,
DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters)
{
- FIXME("%p, %u, %p stub.\n", iface, count, parameters);
+ FIXME("%p, %lu, %p stub.\n", iface, count, parameters);
return E_NOTIMPL;
}
@@ -3445,7 +3445,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterParameters(IDebu
static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterSecondCommand(IDebugControl2 *iface, ULONG index,
char *buffer, ULONG buffer_size, ULONG *command_size)
{
- FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, command_size);
+ FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, command_size);
return E_NOTIMPL;
}
@@ -3453,7 +3453,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterSecondCommand(ID
static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterSecondCommand(IDebugControl2 *iface, ULONG index,
const char *command)
{
- FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(command));
+ FIXME("%p, %lu, %s stub.\n", iface, index, debugstr_a(command));
return E_NOTIMPL;
}
@@ -3463,7 +3463,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_WaitForEvent(IDebugControl2 *iface
struct debug_client *debug_client = impl_from_IDebugControl2(iface);
struct target_process *target;
- TRACE("%p, %#x, %u.\n", iface, flags, timeout);
+ TRACE("%p, %#lx, %lu.\n", iface, flags, timeout);
/* FIXME: only one target is used currently */
@@ -3490,7 +3490,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_WaitForEvent(IDebugControl2 *iface
{
status = NtSuspendProcess(target->handle);
if (status)
- WARN("Failed to suspend a process, status %#x.\n", status);
+ WARN("Failed to suspend a process, status %#lx.\n", status);
}
return S_OK;
@@ -3507,7 +3507,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetLastEventInformation(IDebugCont
ULONG *tid, void *extra_info, ULONG extra_info_size, ULONG *extra_info_used, char *description,
ULONG desc_size, ULONG *desc_used)
{
- FIXME("%p, %p, %p, %p, %p, %u, %p, %p, %u, %p stub.\n", iface, type, pid, tid, extra_info, extra_info_size,
+ FIXME("%p, %p, %p, %p, %p, %lu, %p, %p, %lu, %p stub.\n", iface, type, pid, tid, extra_info, extra_info_size,
extra_info_used, description, desc_size, desc_used);
return E_NOTIMPL;
@@ -3515,14 +3515,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetLastEventInformation(IDebugCont
static HRESULT STDMETHODCALLTYPE debugcontrol_GetCurrentTimeDate(IDebugControl2 *iface, ULONG timedate)
{
- FIXME("%p, %u stub.\n", iface, timedate);
+ FIXME("%p, %lu stub.\n", iface, timedate);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugcontrol_GetCurrentSystemUpTime(IDebugControl2 *iface, ULONG uptime)
{
- FIXME("%p, %u stub.\n", iface, uptime);
+ FIXME("%p, %lu stub.\n", iface, uptime);
return E_NOTIMPL;
}
@@ -3545,7 +3545,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberTextReplacement(IDebugCon
ULONG index, char *src_buffer, ULONG src_buffer_size, ULONG *src_size, char *dst_buffer,
ULONG dst_buffer_size, ULONG *dst_size)
{
- FIXME("%p, %s, %u, %p, %u, %p, %p, %u, %p stub.\n", iface, debugstr_a(src_text), index, src_buffer,
+ FIXME("%p, %s, %lu, %p, %lu, %p, %p, %lu, %p stub.\n", iface, debugstr_a(src_text), index, src_buffer,
src_buffer_size, src_size, dst_buffer, dst_buffer_size, dst_size);
return E_NOTIMPL;
@@ -3569,7 +3569,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveTextReplacements(IDebugContr
static HRESULT STDMETHODCALLTYPE debugcontrol_OutputTextReplacements(IDebugControl2 *iface, ULONG output_control,
ULONG flags)
{
- FIXME("%p, %u, %#x stub.\n", iface, output_control, flags);
+ FIXME("%p, %lu, %#lx stub.\n", iface, output_control, flags);
return E_NOTIMPL;
}
@@ -3705,7 +3705,7 @@ static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface)
static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context,
ULONG context_size)
{
- FIXME("%p, %p, %u stub.\n", iface, context, context_size);
+ FIXME("%p, %p, %lu stub.\n", iface, context, context_size);
return E_NOTIMPL;
}
@@ -3713,7 +3713,7 @@ static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *
static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context,
ULONG context_size)
{
- FIXME("%p, %p, %u stub.\n", iface, context, context_size);
+ FIXME("%p, %p, %lu stub.\n", iface, context, context_size);
return E_NOTIMPL;
}
@@ -3773,14 +3773,14 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadId(IDebugSys
static HRESULT STDMETHODCALLTYPE debugsystemobjects_SetCurrentThreadId(IDebugSystemObjects *iface, ULONG id)
{
- FIXME("%p, %u stub.\n", iface, id);
+ FIXME("%p, %lu stub.\n", iface, id);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE debugsystemobjects_SetCurrentProcessId(IDebugSystemObjects *iface, ULONG id)
{
- FIXME("%p, %u stub.\n", iface, id);
+ FIXME("%p, %lu stub.\n", iface, id);
return E_NOTIMPL;
}
@@ -3803,7 +3803,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetTotalNumberThreads(IDebug
static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdsByIndex(IDebugSystemObjects *iface, ULONG start,
ULONG count, ULONG *ids, ULONG *sysids)
{
- FIXME("%p, %u, %u, %p, %p stub.\n", iface, start, count, ids, sysids);
+ FIXME("%p, %lu, %lu, %p, %p stub.\n", iface, start, count, ids, sysids);
return E_NOTIMPL;
}
@@ -3811,7 +3811,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdsByIndex(IDebugSy
static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdByProcessor(IDebugSystemObjects *iface, ULONG processor,
ULONG *id)
{
- FIXME("%p, %u, %p stub.\n", iface, processor, id);
+ FIXME("%p, %lu, %p stub.\n", iface, processor, id);
return E_NOTIMPL;
}
@@ -3857,7 +3857,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadSystemId(IDe
static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdBySystemId(IDebugSystemObjects *iface, ULONG sysid,
ULONG *id)
{
- FIXME("%p, %u, %p stub.\n", iface, sysid, id);
+ FIXME("%p, %lu, %p stub.\n", iface, sysid, id);
return E_NOTIMPL;
}
@@ -3887,7 +3887,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetNumberProcesses(IDebugSys
static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdsByIndex(IDebugSystemObjects *iface, ULONG start,
ULONG count, ULONG *ids, ULONG *sysids)
{
- FIXME("%p, %u, %u, %p, %p stub.\n", iface, start, count, ids, sysids);
+ FIXME("%p, %lu, %lu, %p, %p stub.\n", iface, start, count, ids, sysids);
return E_NOTIMPL;
}
@@ -3933,7 +3933,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessSystemId(ID
static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdBySystemId(IDebugSystemObjects *iface, ULONG sysid,
ULONG *id)
{
- FIXME("%p, %u, %p stub.\n", iface, sysid, id);
+ FIXME("%p, %lu, %p stub.\n", iface, sysid, id);
return E_NOTIMPL;
}
@@ -3957,7 +3957,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdByHandle(IDebugS
static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessExecutableName(IDebugSystemObjects *iface,
char *buffer, ULONG buffer_size, ULONG *exe_size)
{
- FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, exe_size);
+ FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, exe_size);
return E_NOTIMPL;
}
@@ -4059,7 +4059,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj)
*/
HRESULT WINAPI DebugCreateEx(REFIID riid, DWORD flags, void **obj)
{
- FIXME("(%s, %#x, %p): stub\n", debugstr_guid(riid), flags, obj);
+ FIXME("%s, %#lx, %p: stub\n", debugstr_guid(riid), flags, obj);
return E_NOTIMPL;
}
--
2.34.1
1
0
[PATCH resend] user32/tests: Expect DialogBoxParam to set ERROR_CANNOT_FIND_WND_CLASS
by Alex Henrie 07 Feb '22
by Alex Henrie 07 Feb '22
07 Feb '22
Fixes a testbot failure.
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
dlls/user32/tests/dialog.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index 24aced8e192..2636d706f8f 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -1851,7 +1851,10 @@ static void test_DialogBoxParam(void)
SetLastError(0xdeadbeef);
ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0);
ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret);
- ok(GetLastError() == 0, "got %d\n", GetLastError());
+todo_wine
+ ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS ||
+ broken(GetLastError() == ERROR_SUCCESS) /* < win10 21H1 */,
+ "got %u, expected ERROR_CANNOT_FIND_WND_CLASS\n", GetLastError());
SetLastError(0xdeadbeef);
ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0);
--
2.35.1
1
0
[PATCH v3 1/5] setupapi/tests: Test queuing the same copy operation twice.
by Zebediah Figura 07 Feb '22
by Zebediah Figura 07 Feb '22
07 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/setupapi/tests/install.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index 44b7d09d1e5..4a452435652 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -2054,12 +2054,14 @@ static void test_start_copy(void)
ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
+ ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0);
+ ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
run_queue(queue, start_copy_cb);
- ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
+ todo_wine ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
ok(delete_file("dst/one.txt"), "Destination file should exist.\n");
ok(delete_file("dst/two.txt"), "Destination file should exist.\n");
ok(delete_file("dst/three.txt"), "Destination file should exist.\n");
--
2.34.1
1
4
07 Feb '22
BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/quartz/acmwrapper.c | 3 +--
dlls/quartz/avidec.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index 12d96f69376..cf8e7cd125d 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -140,8 +140,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
while(hr == S_OK && ash.cbSrcLength)
{
- hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0);
- if (FAILED(hr))
+ if (FAILED(hr = IMemAllocator_GetBuffer(This->source.pAllocator, &pOutSample, NULL, NULL, 0)))
{
ERR("Failed to get sample, hr %#lx.\n", hr);
return hr;
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 30b6c741eed..f8660890273 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -139,8 +139,8 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
/* Update input size to match sample size */
This->pBihIn->biSizeImage = cbSrcStream;
- hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0);
- if (FAILED(hr)) {
+ if (FAILED(hr = IMemAllocator_GetBuffer(This->source.pAllocator, &pOutSample, NULL, NULL, 0)))
+ {
ERR("Failed to get sample, hr %#lx.\n", hr);
return hr;
}
--
2.34.1
1
5
[PATCH v2 1/4] setupapi/tests: Test queuing the same copy operation twice.
by Zebediah Figura 06 Feb '22
by Zebediah Figura 06 Feb '22
06 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/setupapi/tests/install.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index 44b7d09d1e5..4a452435652 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -2054,12 +2054,14 @@ static void test_start_copy(void)
ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
+ ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0);
+ ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
run_queue(queue, start_copy_cb);
- ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
+ todo_wine ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
ok(delete_file("dst/one.txt"), "Destination file should exist.\n");
ok(delete_file("dst/two.txt"), "Destination file should exist.\n");
ok(delete_file("dst/three.txt"), "Destination file should exist.\n");
--
2.34.1
2
5
Hello guys,
I have pushed wine-6.0.3-rc1 (05e95b723a0a125fa251e3ab73884f17a000ab16) to
https://github.com/mstefani/wine-stable/tree/oldstable
https://people.redhat.com/mstefani/wine/stable/
Commits from the 6.10 to 6.20 era. So I still have commits for a 6.0.4.
A few fixes for oleaut32 VarParseNumFromStr(), fixes for the winhttp hangs but
other than that nothing fancy.
What's new in this release (see below for details):
- Various bug fixes
----------------------------------------------------------------
Bugs fixed in 6.0.3 (total 46):
30244 Might & Magic Clash of Heroes: fails to start
36887 Trusteer Rapport setup crashes on unimplemented function
ntoskrnl.exe.PsGetCurrentProcessSessionId
37592 Filenames in themed file dialog change size
39142 Roblox Client/Server connection is dropped with error "This server has
shut down."
41292 Nexton LC-ScriptEngine freezes, possibly bad dsound notifications
47047 Multiple kernel drivers crash due to missing
'ntoskrnl.exe.MmGetPhysicalAddress' semi-stub (64-bit MRAC Anti-Cheat (My.Com
Warface) kernel service, DELL BIOS flash utility, BattlEye Anti-Cheat)
47505 Levelhead: Fatal error when attempting to access the game's servers
when logged in
47791 Inconsistent %ERRORLEVEL% after setting env var value in cmd.exe
48891 Bash from Cygwin/msys2 terminates after first command
49625 winedbg --command 'info wnd' fails with Exception c0000005
49726 ChrisPC Free VPN Connection 2.x crashes on unimplemented function
rasapi32.dll.RasSetCredentialsA when clicking 'Connect to VPN'
50041 Amnesia: Rebirth crashes with builtin vcomp140
50113 Total Commander 9.51: when using a third-party theme with Windows XP,
the drive buttons and function buttons at the bottom of the window (F5 Copy) are
not displayed
50244 Melodyne 5: activation via internet fails with 12152 error
50272 Melodyne 5: activation via internet produces "Unknown Error"
50404 Sims 4 crashes on startup with builtin msvcrt
50412 Wrong check for needed access rights in QueryServiceConfig2
50603 WiX Toolset v3.11 installer crashes when loading update feed XML
50615 Excel 2007 needs ICreateTypeInfo2::DeleteFuncDesc()
50735 MSBuild fails to launch FileTracker
51221 Dangerous Water crash when starting a Multiplayer game (requires
IDirectPlay8Server_EnumServiceProviders implementation)
51244 Frostpunk doesn't launch with builtin msvcr120
51264 GUI exe receives invalid StdOutput HANDLE if launched via ShellExecuteEx
51267 Rise of Legends Demo crashes with null pointer exception inside
SAXReader::parseURL
51291 Youkoso! Sukebe Elf no Mori e (demo) doesn't show thumbnail image in
monitor settings.
51302 NASCAR '15 Victory Edition gets in infinite loop on launch
51303 Metal Gear Solid V: Ground Zeroes needs
d3d11_swapchain_GetLastPresentCount implementation
51348 uxtheme.SetWindowTheme should use SendMessage to send WM_THEMECHANGED
51358 Civilization 4: XML load error when trying to start
51382 NetEase Cloud Music crashes on zh_CN.UTF-8 locale.
51435 iostream float formatting broken since Wine 5.12-170-g1bc6f0c8617
51452 oleaut32:varformat fails in Wine when the currency sign has two
characters or more
51465 EVE Online launcher crashes
51503 vbscript parser error in expression with # char
51505 MIDISelector's MIDI mapper configuration doesn't take effect
51506 Disabled controls are not greyed out when theming is active
51535 Native Access 1.13.3 crashes on unimplemented function
virtdisk.dll.DetachVirtualDisk
51553 Purple bitmap should be transparent in scrollbar theming
51574 swscanf_s with %zu fails for valid value
51576 Click-N-Type 3.03 virtual keyboard installer sometimes has two task panes
51590 services:service fails when the KDE taskbar is at the top
51591 AFxW: file list panes aren't updated at start-up
51635 wine fails to build with glibc 2.34
51728 copypasta in pwcache.c:ctox()
51894 ucrtbase:misc fails on some Windows 10 1607 and 1709
51932 wine-stable 6.0.2 build fails in Ubuntu 21.10
----------------------------------------------------------------
Changes since 6.0.2:
Akihiro Sagawa (6):
ntdll/tests: Expand path name tests with path + device name.
ntdll: Validate directory path when the path name ends with a dos device name.
ntdll: Fix null pointer dereference in
RtlDosPathNameToNtPathName_U_WithStatus.
midimap: Introduce XP form and prefer it.
user32/tests: Test pending redraw state with owner-drawn list box.
user32/listbox: Fix redraw after LB_SETCOUNT message.
Alex Henrie (2):
ntoskrnl: Add MmGetPhysicalAddress semi-stub.
rasapi32: Add RasSetCredentialsA/W stubs.
Alexandre Julliard (2):
ntdll: Avoid crash on shutting down partially initialized thread.
wininet/tests: Mark a failing test as todo.
Alistair Leslie-Hughes (5):
services: Check correct permission for QueryServiceConfig2W.
dpnet: Implement IDirectPlay8Server EnumServiceProviders.
ntoskrnl.exe: Implement PsGetCurrentProcessSessionId.
wininet: Reset context length for http status 304.
wininet: Allow up to 4K for response headers.
Andrew Boyarshin (1):
include: Fix IRequestDictionary IID.
Andrew Eikum (1):
comctl32: Avoid gcc 11 maybe-uninitialized warning.
Andrey Gusev (1):
msvcr120: Add version.rc file.
Austin English (1):
virtdisk: Add DetachVirtualDisk stub.
Bernhard Übelacker (1):
attrib: Avoid crash when called without parameter.
Brendan McGrath (1):
kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE.
Damjan Jovanovic (4):
server: The owner of a securable object should have all the standard
access rights.
msxml3: Return S_FALSE from IXMLDOMNamedNodeMap::nextNode() when there are
no attributes.
msxml3/tests: Add some regex tests.
msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}.
Dmitry Timoshkov (1):
vcruntime140_1: Fix compilation with clang.
Eric Pouech (1):
winedbg: Fix crash when no process attached in 'info wnd' command.
Fabian Maurer (3):
configure: Improve resolv lib test for glibc 2.34.
mpr: Fix copy paste error when converting hex char to int.
msi: Set dialog as parent in subsequent dialog.
Florian Eder (1):
cmd: Do not change errorlevel when setting environment variables.
François Gouget (16):
ntdll: Fix the spelling of a comment.
oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings.
oleaut32/tests: Add more VarParseNumFromStr() tests.
oleaut32: Fix VarParseNumFromStr()'s support for two-character currencies.
oleaut32: VarParseNumFromStr() accepts trailing currency symbols.
oleaut32: Setting sThousand to a non-breaking space also matches regular
spaces.
oleaut32: Fix a trace containing a null character.
oleaut32/tests: Fix the Swiss franc and Moroccan dirham tests.
oleaut32: VarParseNumFromStr() does not allow leading thousands separators.
oleaut32: Fix VarParseNumFromStr()'s support for trailing thousands
separator spaces.
oleaut32/tests: Test VarParseNumFromStr()'s handling of LOCALE_SMON*.
oleaut32/tests: Add more VarParseNumFromStr() hexadecimal/octal tests.
oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars().
oleaut32: Fix VarParseNumFromStr()'s handling of currency thousands
separators.
oleaut32: Add support for longer currency symbols.
gdiplus: GdipGetFamilyName() should not crash when given a NULL name.
Gerald Pfeifer (1):
ntdll: Only use sysinfo function when present.
Gijs Vermeulen (2):
vcomp: Implement omp_get_num_procs().
ntdll: Avoid declaration-after-statement warning.
Giovanni Mascellani (1):
kernelbase: Fix an incorrect allocation size.
Hans Leidekker (10):
wldap32: Rename ldap_connect() to avoid a name conflict.
winhttp: Pass a socket pointer to send_bytes() and receive_bytes().
winhttp: Read any data left in the request buffer for websocket connections.
winhttp: Call read_data() at least once in drain_content().
winhttp: Call drain_content() before clear_response_headers().
winhttp: Fix return value for relative redirects.
winhttp: Don't remove content-type/length headers in handle_redirect().
winhttp/tests: Add redirect tests.
wbemprox: Return an empty array for __DERIVATION.
wbemprox: Add __DERIVATION to the list of system properties.
Henri Verbeet (2):
dxgi/tests: Add a test for swapchain present counts.
dxgi: Implement d3d11_swapchain_GetLastPresentCount().
Hiroki Awata (1):
dsound: Notify DSBPN_OFFSETSTOP earlier.
Jacek Caban (2):
advapi32: Link to msvcrt.dll.
include: Use __builtin_offsetof on Clang.
Jactry Zeng (1):
gdi32: Fix a typo in unix_face_create().
Jan Sikorski (1):
winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes.
Jefferson Carpenter (1):
msxml3/saxreader: Handle null url in parseURL().
Kalen Alwardt (1):
ntdll: Export ZwFilterToken().
Nikolay Sivov (2):
oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
d3dx9/effect: Reset output handle for next after last technique in
FindNextValidTechnique().
Oleg Dubinskiy (1):
include: Add RASCREDENTIALSA/W structures.
Paul Gofman (2):
wined3d: Add GPU information for AMD VANGOGH.
kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
Piotr Caban (3):
msvcrt: Update round_limb on first limb length change in printf.
msvcrt: Support z length modifier in scanf.
ucrtbase: Fix fopen x mode test failures.
Robert Wilhelm (1):
vbscript: Support date and time literals.
Roman Pišl (1):
ntdll: Don't pretend that the whole address space is reserved on non-i386.
Rémi Bernon (4):
msvcrt: Set next_token when str is empty in wcstok_s.
dssenh/tests: Add CryptAcquireContextA last error check.
dssenh: Return NTE_BAD_KEYSET when key cannot be opened.
dssenh: Only fill hash buffer when it's provided.
Ted Lyngmo (1):
ucrtbase: Add support for x mode in fopen.
Vijay Kiran Kamuju (1):
msdrm: Add stub DRMRegisterContent function.
Zebediah Figura (2):
quartz: Do not print an incorrect state warning in MediaFilter_GetState()
if a filter has been run asynchronously.
server: Return STATUS_KEY_DELETED when trying to retrieve the full name of
a deleted key.
Zhiyi Zhang (8):
uxtheme/tests: Test SetWindowTheme() with a non-existent subclass.
uxtheme: Fall back to default class if the specified subclass is not found.
uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED
instead of posting it.
uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme().
uxtheme: Fix incorrect part IDs in button class map.
uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff.
user32: Report a fake monitor when running on an invisible window station.
uxtheme: Get and set system metrics in 96 DPI.
--
Michael Stefaniuc
mstefani(a)winehq.org
2
2
[PATCH] msdasql: ICommandText Execute use ODBC to fetch results
by Alistair Leslie-Hughes 06 Feb '22
by Alistair Leslie-Hughes 06 Feb '22
06 Feb '22
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/msdasql/session.c | 59 ++++++++++++++++++++++++++---------
dlls/msdasql/tests/provider.c | 15 +++++++--
2 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c
index 0f74c126138..199eb0830d6 100644
--- a/dlls/msdasql/session.c
+++ b/dlls/msdasql/session.c
@@ -477,6 +477,7 @@ struct msdasql_rowset
IColumnsRowset IColumnsRowset_iface;
IUnknown *caller;
LONG refs;
+ SQLHSTMT hstmt;
};
static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface )
@@ -575,6 +576,8 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface)
{
TRACE( "destroying %p\n", rowset );
+ SQLFreeHandle(SQL_HANDLE_STMT, rowset->hstmt);
+
if (rowset->caller)
IUnknown_Release(rowset->caller);
@@ -845,27 +848,53 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI
{
struct command *command = impl_from_ICommandText( iface );
struct msdasql_rowset *msrowset;
- HRESULT hr;
+ HRESULT hr = S_OK;
+ RETCODE ret;
+ SQLHSTMT hstmt = command->hstmt;
+ SQLLEN results = -1;
- FIXME("%p, %p, %s, %p %p %p Semi Stub\n", command, outer, debugstr_guid(riid), params, affected, rowset);
+ TRACE("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset);
- msrowset = heap_alloc(sizeof(*msrowset));
- if (!msrowset)
- return E_OUTOFMEMORY;
+ if (!hstmt)
+ SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &hstmt);
- msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl;
- msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl;
- msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll;
- msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl;
- msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl;
- msrowset->refs = 1;
- ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller);
+ ret = SQLExecDirectW(hstmt, command->query, SQL_NTS);
+ if (ret != SQL_SUCCESS)
+ {
+ dump_sql_diag_records(SQL_HANDLE_STMT, hstmt);
+ return E_FAIL;
+ }
+
+ ret = SQLRowCount(hstmt, &results);
+ if (ret != SQL_SUCCESS)
+ ERR("SQLRowCount failed (%d)\n", ret);
if (affected)
- *affected = 0; /* FIXME */
+ *affected = results;
+
+ *rowset = NULL;
+ if (!wcsnicmp( command->query, L"select ", 7 ))
+ {
+ msrowset = heap_alloc(sizeof(*msrowset));
+ if (!msrowset)
+ return E_OUTOFMEMORY;
- hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset);
- IRowset_Release(&msrowset->IRowset_iface);
+ command->hstmt = NULL;
+
+ msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl;
+ msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl;
+ msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll;
+ msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl;
+ msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl;
+ msrowset->refs = 1;
+ ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller);
+ msrowset->hstmt = hstmt;
+
+ hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset);
+ IRowset_Release(&msrowset->IRowset_iface);
+ }
+ else
+ SQLFreeStmt(hstmt, SQL_CLOSE);
return hr;
}
diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c
index 7a5175fa050..d261e34e987 100644
--- a/dlls/msdasql/tests/provider.c
+++ b/dlls/msdasql/tests/provider.c
@@ -382,11 +382,20 @@ static void test_command_rowset(IUnknown *cmd)
affected = 9999;
hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk);
ok(hr == S_OK, "got 0x%08lx\n", hr);
- todo_wine ok(unk == NULL, "Unexpected value\n");
- todo_wine ok(affected == -1, "got %Id\n", affected);
+ ok(unk == NULL, "Unexpected value\n");
+ ok(affected == -1, "got %Id\n", affected);
if (unk)
IUnknown_Release(unk);
+ hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"insert into testing values(1, 0)");
+ ok(hr == S_OK, "got 0x%08lx\n", hr);
+
+ affected = 9999;
+ hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk);
+ ok(hr == S_OK, "got 0x%08lx\n", hr);
+ ok(affected == 1, "got %Id\n", affected);
+ ok(unk == NULL, "Unexpected value\n");
+
hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing");
ok(hr == S_OK, "got 0x%08lx\n", hr);
@@ -396,7 +405,7 @@ static void test_command_rowset(IUnknown *cmd)
ok(unk != NULL, "Unexpected value\n");
if (hr == S_OK)
{
- ok(affected == -1, "wrong affected value\n");
+ ok(affected == -1, "got %Id\n", affected);
hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset);
ok(hr == S_OK, "got 0x%08lx\n", hr);
--
2.34.1
1
0
[PATCH] xactengine3_7/tests: Build without -DWINE_NO_LONG_TYPES.
by Alistair Leslie-Hughes 06 Feb '22
by Alistair Leslie-Hughes 06 Feb '22
06 Feb '22
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/xactengine3_7/tests/Makefile.in | 1 -
dlls/xactengine3_7/tests/xact3.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in
index 693c3687728..c32b2562546 100644
--- a/dlls/xactengine3_7/tests/Makefile.in
+++ b/dlls/xactengine3_7/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = xactengine3_7.dll
IMPORTS = ole32
diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c
index 6b04c36a9f0..623a1c97db8 100644
--- a/dlls/xactengine3_7/tests/xact3.c
+++ b/dlls/xactengine3_7/tests/xact3.c
@@ -84,7 +84,7 @@ static void test_interfaces(void)
trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) );
continue;
}
- ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr);
+ ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08lx\n", i, hr);
if (hr == S_OK)
IUnknown_Release(unk);
}
--
2.34.1
1
0
[PATCH 1/4] setupapi/tests: Test queuing the same copy operation twice.
by Zebediah Figura 05 Feb '22
by Zebediah Figura 05 Feb '22
05 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/setupapi/tests/install.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index 44b7d09d1e5..58350f7ca89 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -2054,12 +2054,14 @@ static void test_start_copy(void)
ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
+ ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0);
+ ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
run_queue(queue, start_copy_cb);
- ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
+ todo_wine ok(got_start_copy == 4, "Got %u callbacks.\n", got_start_copy);
ok(delete_file("dst/one.txt"), "Destination file should exist.\n");
ok(delete_file("dst/two.txt"), "Destination file should exist.\n");
ok(delete_file("dst/three.txt"), "Destination file should exist.\n");
--
2.34.1
2
7
Signed-off-by: Floris Renaud <jkfloris(a)dds.nl>
---
po/nl.po | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/po/nl.po b/po/nl.po
index 51a3e0f88e8..f174bf9c3e8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: Wine\n"
"Report-Msgid-Bugs-To: https://bugs.winehq.org\n"
"POT-Creation-Date: N/A\n"
-"PO-Revision-Date: 2021-12-22 10:00+0100\n"
+"PO-Revision-Date: 2022-02-05 10:30+0100\n"
"Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n"
"Language-Team: Dutch\n"
"Language: nl\n"
@@ -6972,54 +6972,40 @@ msgid "This network connection does not exist.\n"
msgstr "Deze netwerkverbinding bestaat niet.\n"
#: dlls/kernel32/winerror.mc:3748
-#, fuzzy
-#| msgid "Invalid at interrupt time.\n"
msgid "Call interrupted.\n"
-msgstr "Ongeldig op interruptietijd.\n"
+msgstr "Oproep onderbroken.\n"
#: dlls/kernel32/winerror.mc:3753
-#, fuzzy
-#| msgid "Invalid handle.\n"
msgid "Invalid file handle.\n"
-msgstr "Ongeldige handle.\n"
+msgstr "Ongeldige bestandsingang.\n"
#: dlls/kernel32/winerror.mc:3763
-#, fuzzy
-#| msgid "Invalid network address.\n"
msgid "Invalid pointer address.\n"
-msgstr "Ongeldig netwerkadres.\n"
+msgstr "Ongeldig pointeradres.\n"
#: dlls/kernel32/winerror.mc:3768
-#, fuzzy
-#| msgid "Invalid name.\n"
msgid "Invalid argument.\n"
-msgstr "Ongeldige naam.\n"
+msgstr "Ongeldig argument.\n"
#: dlls/kernel32/winerror.mc:3778
msgid "Connection reset by peer.\n"
msgstr "Verbinding opnieuw ingesteld door gelijkwaardige computer.\n"
#: dlls/kernel32/winerror.mc:3788
-#, fuzzy
-#| msgid "Point not found.\n"
msgid "Host not found.\n"
-msgstr "Punt niet gevonden.\n"
+msgstr "Host niet gevonden.\n"
#: dlls/kernel32/winerror.mc:3793
-#, fuzzy
-#| msgid "Attribute is not found.\n"
msgid "Nonauthoritative host not found.\n"
-msgstr "Kenmerk is niet gevonden.\n"
+msgstr "Niet-gemachtigde host niet gevonden.\n"
#: dlls/kernel32/winerror.mc:3798
-#, fuzzy
-#| msgid "Unrecoverable error occurred.\n"
msgid "Nonrecoverable error.\n"
-msgstr "Onherstelbare fout opgetreden.\n"
+msgstr "Onherstelbare fout.\n"
#: dlls/kernel32/winerror.mc:3803
msgid "Name valid, no data record.\n"
-msgstr ""
+msgstr "Geldige naam, geen gegevensrecord.\n"
#: dlls/kernel32/winerror.mc:3817
msgid "Not implemented.\n"
--
2.34.1
1
0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/ws2_32/socket.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 4b3ca3c2507..b06fb341991 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3305,8 +3305,9 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol,
if (!num_startup)
{
- err = WSANOTINITIALISED;
- goto done;
+ WARN( "not initialised\n" );
+ SetLastError( WSANOTINITIALISED );
+ return -1;
}
/* hack for WSADuplicateSocket */
@@ -3406,11 +3407,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol,
}
WSASetLastError(0);
return ret;
-
-done:
- WARN("\t\tfailed, error %d!\n", err);
- SetLastError(err);
- return INVALID_SOCKET;
}
/***********************************************************************
--
2.34.1
1
1
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/quartz/Makefile.in | 1 -
dlls/quartz/acmwrapper.c | 18 +--
dlls/quartz/avidec.c | 31 ++--
dlls/quartz/dsoundrender.c | 40 +++--
dlls/quartz/filesource.c | 15 +-
dlls/quartz/filtergraph.c | 296 ++++++++++++++++++------------------
dlls/quartz/filtermapper.c | 96 ++++++------
dlls/quartz/main.c | 9 +-
dlls/quartz/memallocator.c | 44 +++---
dlls/quartz/passthrough.c | 4 +-
dlls/quartz/regsvr.c | 2 +-
dlls/quartz/systemclock.c | 15 +-
dlls/quartz/videorenderer.c | 10 +-
dlls/quartz/vmr9.c | 121 +++++++--------
dlls/quartz/window.c | 83 +++++-----
15 files changed, 387 insertions(+), 398 deletions(-)
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 81db98e639d..e7e1b43da79 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = quartz.dll
IMPORTLIB = quartz
IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index a07bdfef0ca..12d96f69376 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -110,7 +110,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
- ERR("Cannot get pointer to sample data (%x)\n", hr);
+ ERR("Failed to get input buffer pointer, hr %#lx.\n", hr);
return hr;
}
@@ -135,8 +135,6 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
tMed = tStart;
mtMed = mtStart;
- TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
-
ash.pbSrc = pbSrcStream;
ash.cbSrcLength = cbSrcStream;
@@ -145,7 +143,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0);
if (FAILED(hr))
{
- ERR("Unable to get delivery buffer (%x)\n", hr);
+ ERR("Failed to get sample, hr %#lx.\n", hr);
return hr;
}
IMediaSample_SetPreroll(pOutSample, preroll);
@@ -155,7 +153,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = IMediaSample_GetPointer(pOutSample, &pbDstStream);
if (FAILED(hr)) {
- ERR("Unable to get pointer to buffer (%x)\n", hr);
+ ERR("Failed to get output buffer pointer, hr %#lx.\n", hr);
goto error;
}
cbDstStream = IMediaSample_GetSize(pOutSample);
@@ -192,7 +190,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
goto error;
}
- TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength);
+ TRACE("used in %lu/%lu, used out %lu/%lu\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength);
hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed);
assert(hr == S_OK);
@@ -200,7 +198,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
/* Bug in acm codecs? It apparently uses the input, but doesn't necessarily output immediately */
if (!ash.cbSrcLengthUsed)
{
- WARN("Sample was skipped? Outputted: %u\n", ash.cbDstLengthUsed);
+ WARN("Sample was skipped? Outputted: %lu\n", ash.cbDstLengthUsed);
ash.cbSrcLength = 0;
goto error;
}
@@ -243,7 +241,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {
if (FAILED(hr))
- ERR("Error sending sample (%x)\n", hr);
+ ERR("Failed to send sample, hr %#lx.\n", hr);
goto error;
}
@@ -419,7 +417,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface,
IQualityControl *peer;
HRESULT hr = S_OK;
- TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n",
+ TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
if (filter->source_qc_sink)
@@ -492,7 +490,7 @@ static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface)
HRESULT hr;
if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator)))
- ERR("Failed to commit allocator, hr %#x.\n", hr);
+ ERR("Failed to commit allocator, hr %#lx.\n", hr);
return S_OK;
}
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 3d947e1b1bf..30b6c741eed 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -101,14 +101,13 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
struct avi_decompressor *This = impl_from_strmbase_filter(iface->pin.filter);
VIDEOINFOHEADER *source_format;
HRESULT hr;
- DWORD res;
IMediaSample* pOutSample = NULL;
- DWORD cbDstStream;
+ LONG cbDstStream, cbSrcStream;
LPBYTE pbDstStream;
- DWORD cbSrcStream;
LPBYTE pbSrcStream;
LONGLONG tStart, tStop;
DWORD flags = 0;
+ LRESULT res;
/* We do not expect pin connection state to change while the filter is
* running. This guarantee is necessary, since otherwise we would have to
@@ -131,20 +130,18 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
- ERR("Cannot get pointer to sample data (%x)\n", hr);
+ ERR("Failed to get input buffer pointer, hr %#lx.\n", hr);
return hr;
}
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
- TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
-
/* Update input size to match sample size */
This->pBihIn->biSizeImage = cbSrcStream;
hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0);
if (FAILED(hr)) {
- ERR("Unable to get delivery buffer (%x)\n", hr);
+ ERR("Failed to get sample, hr %#lx.\n", hr);
return hr;
}
@@ -153,14 +150,14 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
hr = IMediaSample_GetPointer(pOutSample, &pbDstStream);
if (FAILED(hr)) {
- ERR("Unable to get pointer to buffer (%x)\n", hr);
+ ERR("Failed to get output buffer pointer, hr %#lx.\n", hr);
IMediaSample_Release(pOutSample);
return hr;
}
cbDstStream = IMediaSample_GetSize(pOutSample);
if (cbDstStream < source_format->bmiHeader.biSizeImage)
{
- ERR("Sample size is too small (%u < %u).\n", cbDstStream, source_format->bmiHeader.biSizeImage);
+ ERR("Sample size is too small (%ld < %lu).\n", cbDstStream, source_format->bmiHeader.biSizeImage);
IMediaSample_Release(pOutSample);
return E_FAIL;
}
@@ -175,7 +172,7 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
res = ICDecompress(This->hvid, flags, This->pBihIn, pbSrcStream, &source_format->bmiHeader, pbDstStream);
if (res != ICERR_OK)
- ERR("Error occurred during the decompression (%x)\n", res);
+ ERR("Failed to decompress, error %Id.\n", res);
/* Drop sample if it's intended to be dropped */
if (flags & ICDECOMPRESS_HURRYUP) {
@@ -198,7 +195,7 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED)
- ERR("Error sending sample (%x)\n", hr);
+ ERR("Failed to send sample, hr %#lx.\n", hr);
IMediaSample_Release(pOutSample);
return hr;
@@ -228,7 +225,7 @@ static HRESULT avi_decompressor_sink_connect(struct strmbase_sink *iface, IPin *
if (This->hvid)
{
DWORD bih_size;
- DWORD result;
+ LRESULT result;
/* Copy bitmap header from media type to 1 for input and 1 for output */
bih_size = bmi->biSize + bmi->biClrUsed * 4;
@@ -242,7 +239,7 @@ static HRESULT avi_decompressor_sink_connect(struct strmbase_sink *iface, IPin *
if ((result = ICDecompressQuery(This->hvid, This->pBihIn, NULL)))
{
- WARN("No decompressor found, error %d.\n", result);
+ WARN("No decompressor found, error %Id.\n", result);
return VFW_E_TYPE_NOT_ACCEPTED;
}
@@ -479,7 +476,7 @@ static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface,
{
struct avi_decompressor *filter = impl_from_source_IQualityControl(iface);
- TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n",
+ TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
EnterCriticalSection(&filter->filter.stream_cs);
@@ -555,12 +552,12 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface)
source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat;
if ((res = ICDecompressBegin(filter->hvid, filter->pBihIn, &source_format->bmiHeader)))
{
- ERR("ICDecompressBegin() failed, error %ld.\n", res);
+ ERR("ICDecompressBegin() failed, error %Id.\n", res);
return E_FAIL;
}
if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator)))
- ERR("Failed to commit allocator, hr %#x.\n", hr);
+ ERR("Failed to commit allocator, hr %#lx.\n", hr);
return S_OK;
}
@@ -575,7 +572,7 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface)
if (filter->hvid && (res = ICDecompressEnd(filter->hvid)))
{
- ERR("ICDecompressEnd() failed, error %ld.\n", res);
+ ERR("ICDecompressEnd() failed, error %Id.\n", res);
return E_FAIL;
}
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index df40d1254ee..1abd4bdbcec 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -126,7 +126,7 @@ static void DSoundRender_UpdatePositions(struct dsound_render *This, DWORD *seqw
adv = playpos - old_playpos;
This->last_playpos = playpos;
if (adv) {
- TRACE("Moving from %u to %u: clearing %u bytes\n", old_playpos, playpos, adv);
+ TRACE("Moving from %lu to %lu: clearing %lu bytes.\n", old_playpos, playpos, adv);
IDirectSoundBuffer_Lock(This->dsbuffer, old_playpos, adv, (void**)&buf1, &size1, (void**)&buf2, &size2, 0);
memset(buf1, wfx->wBitsPerSample == 8 ? 128 : 0, size1);
memset(buf2, wfx->wBitsPerSample == 8 ? 128 : 0, size2);
@@ -190,19 +190,19 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This,
past = min_writepos_t - write_at;
if (past >= 0) {
DWORD skipbytes = pos_from_time(This, past);
- WARN("Skipping %u bytes\n", skipbytes);
+ WARN("Skipping %lu bytes.\n", skipbytes);
*skip = skipbytes;
*ret_writepos = min_writepos;
} else {
DWORD aheadbytes = pos_from_time(This, -past);
- WARN("Advancing %u bytes\n", aheadbytes);
+ WARN("Advancing %lu bytes.\n", aheadbytes);
*ret_writepos = (min_writepos + aheadbytes) % This->buf_size;
}
} else /* delta_t > 0 */ {
DWORD aheadbytes;
WARN("Delta too big %s/%s, too far ahead\n", debugstr_time(delta_t), debugstr_time(max_lag));
aheadbytes = pos_from_time(This, delta_t);
- WARN("Advancing %u bytes\n", aheadbytes);
+ WARN("Advancing %lu bytes.\n", aheadbytes);
if (delta_t >= DSoundRenderer_Max_Fill)
return S_FALSE;
*ret_writepos = (min_writepos + aheadbytes) % This->buf_size;
@@ -254,13 +254,13 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This,
if (This->sink.flushing || This->filter.state == State_Stopped)
return This->filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE;
if (ret != WAIT_TIMEOUT)
- ERR("%x\n", ret);
+ ERR("WaitForSingleObject() returned %ld.\n", ret);
continue;
}
tStart = -1;
if (skip)
- FIXME("Sample dropped %u of %u bytes\n", skip, size);
+ FIXME("Sample dropped %lu of %lu bytes.\n", skip, size);
if (skip >= size)
return S_OK;
data += skip;
@@ -268,7 +268,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This,
hr = IDirectSoundBuffer_Lock(This->dsbuffer, writepos, min(free, size), (void**)&buf1, &size1, (void**)&buf2, &size2, 0);
if (hr != DS_OK) {
- ERR("Unable to lock sound buffer! (%x)\n", hr);
+ ERR("Failed to lock sound buffer, hr %#lx.\n", hr);
break;
}
memcpy(buf1, data, size1);
@@ -276,7 +276,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This,
memcpy(buf2, data+size1, size2);
IDirectSoundBuffer_Unlock(This->dsbuffer, buf1, size1, buf2, size2);
This->writepos = (writepos + size1 + size2) % This->buf_size;
- TRACE("Wrote %u bytes at %u, next at %u - (%u/%u)\n", size1+size2, writepos, This->writepos, free, size);
+ TRACE("Wrote %lu bytes at %lu, next at %lu - (%lu/%lu)\n", size1+size2, writepos, This->writepos, free, size);
data += size1 + size2;
size -= size1 + size2;
}
@@ -330,13 +330,13 @@ static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSam
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
- ERR("Cannot get pointer to sample data (%x)\n", hr);
+ ERR("Failed to get buffer pointer, hr %#lx.\n", hr);
return hr;
}
hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr)) {
- ERR("Cannot get sample time (%x)\n", hr);
+ ERR("Failed to get sample time, hr %#lx.\n", hr);
tStart = tStop = -1;
}
@@ -347,8 +347,6 @@ static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSam
}
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
- TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
-
return DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream);
}
@@ -416,17 +414,17 @@ static HRESULT dsound_render_sink_connect(struct strmbase_sink *iface, IPin *pee
hr = IDirectSound8_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL);
This->writepos = This->buf_size;
if (FAILED(hr))
- ERR("Can't create sound buffer (%x)\n", hr);
+ ERR("Failed to create sound buffer, hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
hr = IDirectSoundBuffer_SetVolume(This->dsbuffer, This->volume);
if (FAILED(hr))
- ERR("Can't set volume to %d (%x)\n", This->volume, hr);
+ ERR("Failed to set volume to %ld, hr %#lx.\n", This->volume, hr);
hr = IDirectSoundBuffer_SetPan(This->dsbuffer, This->pan);
if (FAILED(hr))
- ERR("Can't set pan to %d (%x)\n", This->pan, hr);
+ ERR("Failed to set pan to %ld, hr %#lx.\n", This->pan, hr);
hr = S_OK;
}
@@ -701,7 +699,7 @@ HRESULT WINAPI basic_audio_GetTypeInfoCount(IBasicAudio *iface, UINT *count)
HRESULT WINAPI basic_audio_GetTypeInfo(IBasicAudio *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicAudio_tid, typeinfo);
}
@@ -711,7 +709,7 @@ HRESULT WINAPI basic_audio_GetIDsOfNames(IBasicAudio *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@@ -728,7 +726,7 @@ static HRESULT WINAPI basic_audio_Invoke(IBasicAudio *iface, DISPID id, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@@ -743,7 +741,7 @@ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface,
LONG lVolume) {
struct dsound_render *This = impl_from_IBasicAudio(iface);
- TRACE("(%p/%p)->(%d)\n", This, iface, lVolume);
+ TRACE("filter %p, volume %ld.\n", This, lVolume);
if (lVolume > DSBVOLUME_MAX || lVolume < DSBVOLUME_MIN)
return E_INVALIDARG;
@@ -774,7 +772,7 @@ static HRESULT WINAPI Basicaudio_put_Balance(IBasicAudio *iface,
LONG lBalance) {
struct dsound_render *This = impl_from_IBasicAudio(iface);
- TRACE("(%p/%p)->(%d)\n", This, iface, lBalance);
+ TRACE("filter %p, balance %ld.\n", This, lBalance);
if (lBalance < DSBPAN_LEFT || lBalance > DSBPAN_RIGHT)
return E_INVALIDARG;
@@ -963,7 +961,7 @@ static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,
{
struct dsound_render *filter = impl_from_IQualityControl(iface);
- FIXME("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s, stub!\n",
+ FIXME("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s, stub!\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
return E_NOTIMPL;
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index e5e7b482984..6ffae606df4 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -217,7 +217,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID
if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
{
- WARN("Failed to open file %s, error %u.\n", debugstr_w(filename), GetLastError());
+ WARN("Failed to open file %s, error %lu.\n", debugstr_w(filename), GetLastError());
return FALSE;
}
@@ -393,14 +393,14 @@ static DWORD CALLBACK io_thread(void *arg)
EnterCriticalSection(&filter->sample_cs);
req = CONTAINING_RECORD(ovl, struct request, ovl);
- TRACE("Got sample %u.\n", req - filter->requests);
+ TRACE("Got sample %Iu.\n", req - filter->requests);
assert(req >= filter->requests && req < filter->requests + filter->max_requests);
if (ret)
WakeConditionVariable(&filter->sample_cv);
else
{
- ERR("GetQueuedCompletionStatus() returned failure, error %u.\n", GetLastError());
+ ERR("GetQueuedCompletionStatus() returned failure, error %lu.\n", GetLastError());
req->sample = NULL;
}
@@ -624,7 +624,6 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc
FreeMediaType(&This->pin.mt);
}
- TRACE(" -- %x\n", hr);
return hr;
}
@@ -712,7 +711,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample
HRESULT hr;
BYTE *data;
- TRACE("filter %p, sample %p, cookie %#lx.\n", filter, sample, cookie);
+ TRACE("filter %p, sample %p, cookie %#Ix.\n", filter, sample, cookie);
if (!sample)
return E_POINTER;
@@ -765,7 +764,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface,
struct async_reader *filter = impl_from_IAsyncReader(iface);
unsigned int i;
- TRACE("filter %p, timeout %u, sample %p, cookie %p.\n", filter, timeout, sample, cookie);
+ TRACE("filter %p, timeout %lu, sample %p, cookie %p.\n", filter, timeout, sample, cookie);
*sample = NULL;
*cookie = 0;
@@ -824,7 +823,7 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D
if (ret || GetLastError() == ERROR_IO_PENDING)
ret = GetOverlappedResult(file, &ovl, read_len, TRUE);
- TRACE("Returning %u bytes.\n", *read_len);
+ TRACE("Returning %lu bytes.\n", *read_len);
CloseHandle(ovl.hEvent);
return ret;
@@ -873,7 +872,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface,
HRESULT hr;
BOOL ret;
- TRACE("filter %p, offset %s, length %d, buffer %p.\n",
+ TRACE("filter %p, offset %s, length %ld, buffer %p.\n",
filter, wine_dbgstr_longlong(offset), length, buffer);
ret = sync_read(filter->file, offset, length, buffer, &read_len);
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 0dccf2b7fb4..1849174cf97 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -98,7 +98,7 @@ struct filter_graph
struct list filters;
unsigned int name_index;
- OAFilterState state;
+ FILTER_STATE state;
TP_WORK *async_run_work;
IReferenceClock *refClock;
@@ -181,7 +181,7 @@ static ULONG WINAPI EnumFilters_AddRef(IEnumFilters *iface)
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
ULONG ref = InterlockedIncrement(&enum_filters->ref);
- TRACE("%p increasing refcount to %u.\n", enum_filters, ref);
+ TRACE("%p increasing refcount to %lu.\n", enum_filters, ref);
return ref;
}
@@ -191,7 +191,7 @@ static ULONG WINAPI EnumFilters_Release(IEnumFilters *iface)
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
ULONG ref = InterlockedDecrement(&enum_filters->ref);
- TRACE("%p decreasing refcount to %u.\n", enum_filters, ref);
+ TRACE("%p decreasing refcount to %lu.\n", enum_filters, ref);
if (!ref)
{
@@ -208,7 +208,7 @@ static HRESULT WINAPI EnumFilters_Next(IEnumFilters *iface, ULONG count,
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
unsigned int i = 0;
- TRACE("enum_filters %p, count %u, filters %p, fetched %p.\n",
+ TRACE("enum_filters %p, count %lu, filters %p, fetched %p.\n",
enum_filters, count, filters, fetched);
if (enum_filters->version != enum_filters->graph->version)
@@ -238,7 +238,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count)
{
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
- TRACE("enum_filters %p, count %u.\n", enum_filters, count);
+ TRACE("enum_filters %p, count %lu.\n", enum_filters, count);
if (enum_filters->version != enum_filters->graph->version)
return VFW_E_ENUM_OUT_OF_SYNC;
@@ -418,23 +418,24 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri
static ULONG WINAPI FilterGraphInner_AddRef(IUnknown *iface)
{
- struct filter_graph *This = impl_from_IUnknown(iface);
- ULONG ref = InterlockedIncrement(&This->ref);
+ struct filter_graph *graph = impl_from_IUnknown(iface);
+ ULONG refcount = InterlockedIncrement(&graph->ref);
- TRACE("(%p)->(): new ref = %d\n", This, ref);
+ TRACE("%p increasing refcount to %lu.\n", graph, refcount);
- return ref;
+ return refcount;
}
static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface)
{
struct filter_graph *This = impl_from_IUnknown(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
+ ULONG refcount = InterlockedDecrement(&This->ref);
struct list *cursor;
- TRACE("(%p)->(): new ref = %d\n", This, ref);
+ TRACE("%p decreasing refcount to %lu.\n", This, refcount);
- if (ref == 0) {
+ if (!refcount)
+ {
int i;
This->ref = 1; /* guard against reentrancy (aggregation). */
@@ -476,7 +477,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface)
DeleteCriticalSection(&This->cs);
free(This);
}
- return ref;
+ return refcount;
}
static struct filter_graph *impl_from_IFilterGraph2(IFilterGraph2 *iface)
@@ -694,7 +695,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
{
if (FAILED(hr = IPin_Disconnect(peer)))
{
- WARN("Failed to disconnect peer %p, hr %#x.\n", peer, hr);
+ WARN("Failed to disconnect peer %p, hr %#lx.\n", peer, hr);
IPin_Release(peer);
IPin_Release(ppin);
IEnumPins_Release(penumpins);
@@ -704,7 +705,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
if (FAILED(hr = IPin_Disconnect(ppin)))
{
- WARN("Failed to disconnect pin %p, hr %#x.\n", ppin, hr);
+ WARN("Failed to disconnect pin %p, hr %#lx.\n", ppin, hr);
IPin_Release(ppin);
IEnumPins_Release(penumpins);
return hr;
@@ -781,7 +782,7 @@ static HRESULT check_cyclic_connection(IPin *source, IPin *sink)
hr = IPin_QueryPinInfo(sink, &sink_info);
if (FAILED(hr))
{
- ERR("Failed to query pin, hr %#x.\n", hr);
+ ERR("Failed to query pin, hr %#lx.\n", hr);
return hr;
}
IBaseFilter_Release(sink_info.pFilter);
@@ -789,7 +790,7 @@ static HRESULT check_cyclic_connection(IPin *source, IPin *sink)
hr = IPin_QueryPinInfo(source, &source_info);
if (FAILED(hr))
{
- ERR("Failed to query pin, hr %#x.\n", hr);
+ ERR("Failed to query pin, hr %#lx.\n", hr);
return hr;
}
@@ -803,7 +804,7 @@ static HRESULT check_cyclic_connection(IPin *source, IPin *sink)
hr = IBaseFilter_EnumPins(source_info.pFilter, &enumpins);
if (FAILED(hr))
{
- ERR("Failed to enumerate pins, hr %#x.\n", hr);
+ ERR("Failed to enumerate pins, hr %#lx.\n", hr);
IBaseFilter_Release(source_info.pFilter);
return hr;
}
@@ -1264,7 +1265,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
if (callback && FAILED(hr = IAMGraphBuilderCallback_SelectedFilter(callback, moniker)))
{
- TRACE("Filter rejected by IAMGraphBuilderCallback::SelectedFilter(), hr %#x.\n", hr);
+ TRACE("Filter rejected by IAMGraphBuilderCallback::SelectedFilter(), hr %#lx.\n", hr);
IMoniker_Release(moniker);
continue;
}
@@ -1273,14 +1274,14 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
IMoniker_Release(moniker);
if (FAILED(hr))
{
- ERR("Failed to create filter for %s, hr %#x.\n", debugstr_w(V_BSTR(&var)), hr);
+ ERR("Failed to create filter for %s, hr %#lx.\n", debugstr_w(V_BSTR(&var)), hr);
VariantClear(&var);
continue;
}
if (callback && FAILED(hr = IAMGraphBuilderCallback_CreatedFilter(callback, filter)))
{
- TRACE("Filter rejected by IAMGraphBuilderCallback::CreatedFilter(), hr %#x.\n", hr);
+ TRACE("Filter rejected by IAMGraphBuilderCallback::CreatedFilter(), hr %#lx.\n", hr);
IBaseFilter_Release(filter);
continue;
}
@@ -1289,7 +1290,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
VariantClear(&var);
if (FAILED(hr))
{
- ERR("Failed to add filter, hr %#x.\n", hr);
+ ERR("Failed to add filter, hr %#lx.\n", hr);
IBaseFilter_Release(filter);
continue;
}
@@ -1347,7 +1348,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *source, I
LeaveCriticalSection(&graph->cs);
- TRACE("Returning %#x.\n", hr);
+ TRACE("Returning %#lx.\n", hr);
return hr;
}
@@ -1364,7 +1365,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *source)
if (hr == VFW_E_CANNOT_CONNECT)
hr = VFW_E_CANNOT_RENDER;
- TRACE("Returning %#x.\n", hr);
+ TRACE("Returning %#lx.\n", hr);
return hr;
}
@@ -1417,7 +1418,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw
if (!any)
{
if (FAILED(hr = IFilterGraph2_RemoveFilter(iface, preader)))
- ERR("Failed to remove source filter, hr %#x.\n", hr);
+ ERR("Failed to remove source filter, hr %#lx.\n", hr);
hr = VFW_E_CANNOT_RENDER;
}
else if (partial)
@@ -1431,7 +1432,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw
}
IBaseFilter_Release(preader);
- TRACE("--> %08x\n", hr);
+ TRACE("Returning %#lx.\n", hr);
return hr;
}
@@ -1454,13 +1455,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface,
if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER,
&IID_IBaseFilter, (void **)&filter)))
{
- WARN("Failed to create filter, hr %#x.\n", hr);
+ WARN("Failed to create filter, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource)))
{
- WARN("Failed to get IFileSourceFilter, hr %#x.\n", hr);
+ WARN("Failed to get IFileSourceFilter, hr %#lx.\n", hr);
IBaseFilter_Release(filter);
return hr;
}
@@ -1469,7 +1470,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface,
IFileSourceFilter_Release(filesource);
if (FAILED(hr))
{
- WARN("Failed to load file, hr %#x.\n", hr);
+ WARN("Failed to load file, hr %#lx.\n", hr);
return hr;
}
@@ -1484,11 +1485,11 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface,
return S_OK;
}
-static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR hFile)
+static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR file)
{
- struct filter_graph *This = impl_from_IFilterGraph2(iface);
+ struct filter_graph *graph = impl_from_IFilterGraph2(iface);
- TRACE("(%p/%p)->(%08x): stub !!!\n", This, iface, (DWORD) hFile);
+ TRACE("graph %p, file %#Ix.\n", graph, file);
return S_OK;
}
@@ -1523,13 +1524,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilterForMoniker(IFilterGraph2 *ifac
hr = IMoniker_BindToObject(pMoniker, pCtx, NULL, &IID_IBaseFilter, (void**)&pfilter);
if(FAILED(hr)) {
- WARN("Unable to bind moniker to filter object (%x)\n", hr);
+ WARN("Failed to bind moniker, hr %#lx.\n", hr);
return hr;
}
hr = IFilterGraph2_AddFilter(iface, pfilter, lpcwstrFilterName);
if (FAILED(hr)) {
- WARN("Unable to add filter (%x)\n", hr);
+ WARN("Failed to add filter, hr %#lx.\n", hr);
IBaseFilter_Release(pfilter);
return hr;
}
@@ -1571,10 +1572,10 @@ static HRESULT WINAPI FilterGraph2_RenderEx(IFilterGraph2 *iface, IPin *source,
struct filter_graph *graph = impl_from_IFilterGraph2(iface);
HRESULT hr;
- TRACE("graph %p, source %p, flags %#x, context %p.\n", graph, source, flags, context);
+ TRACE("graph %p, source %p, flags %#lx, context %p.\n", graph, source, flags, context);
if (flags & ~AM_RENDEREX_RENDERTOEXISTINGRENDERERS)
- FIXME("Unknown flags %#x.\n", flags);
+ FIXME("Unknown flags %#lx.\n", flags);
EnterCriticalSection(&graph->cs);
hr = autoplug(graph, source, NULL, !!(flags & AM_RENDEREX_RENDERTOEXISTINGRENDERERS), 0);
@@ -1582,7 +1583,7 @@ static HRESULT WINAPI FilterGraph2_RenderEx(IFilterGraph2 *iface, IPin *source,
if (hr == VFW_E_CANNOT_CONNECT)
hr = VFW_E_CANNOT_RENDER;
- TRACE("Returning %#x.\n", hr);
+ TRACE("Returning %#lx.\n", hr);
return hr;
}
@@ -1646,7 +1647,7 @@ static HRESULT WINAPI MediaControl_GetTypeInfoCount(IMediaControl *iface, UINT *
static HRESULT WINAPI MediaControl_GetTypeInfo(IMediaControl *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaControl_tid, typeinfo);
}
@@ -1656,7 +1657,7 @@ static HRESULT WINAPI MediaControl_GetIDsOfNames(IMediaControl *iface, REFIID ii
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaControl_tid, &typeinfo)))
@@ -1673,7 +1674,7 @@ static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, DISPID id, REFII
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaControl_tid, &typeinfo)))
@@ -1741,11 +1742,11 @@ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_sta
HRESULT filter_hr = IBaseFilter_Run(filter->filter, stream_start);
if (hr == S_OK)
hr = filter_hr;
- TRACE("Filter %p returned %#x.\n", filter->filter, filter_hr);
+ TRACE("Filter %p returned %#lx.\n", filter->filter, filter_hr);
}
if (FAILED(hr))
- WARN("Failed to start stream, hr %#x.\n", hr);
+ WARN("Failed to start stream, hr %#lx.\n", hr);
return hr;
}
@@ -1840,7 +1841,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface)
HRESULT filter_hr = IBaseFilter_Pause(filter->filter);
if (hr == S_OK)
hr = filter_hr;
- TRACE("Filter %p returned %#x.\n", filter->filter, filter_hr);
+ TRACE("Filter %p returned %#lx.\n", filter->filter, filter_hr);
/* If a filter returns VFW_S_CANT_CUE, we shouldn't wait for a
* paused state. */
@@ -1852,7 +1853,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface)
if (FAILED(hr))
{
LeaveCriticalSection(&graph->cs);
- WARN("Failed to pause, hr %#x.\n", hr);
+ WARN("Failed to pause, hr %#lx.\n", hr);
return hr;
}
}
@@ -1900,7 +1901,7 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG timeout,
{
struct filter_graph *graph = impl_from_IMediaControl(iface);
- TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state);
+ TRACE("graph %p, timeout %ld, state %p.\n", graph, timeout, state);
if (timeout < 0) timeout = INFINITE;
@@ -1951,13 +1952,13 @@ static void CALLBACK wait_pause_cb(TP_CALLBACK_INSTANCE *instance, void *context
HRESULT hr;
if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK)
- ERR("Failed to get paused state, hr %#x.\n", hr);
+ ERR("Failed to get paused state, hr %#lx.\n", hr);
if (FAILED(hr = IMediaControl_Stop(control)))
- ERR("Failed to stop, hr %#x.\n", hr);
+ ERR("Failed to stop, hr %#lx.\n", hr);
if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK)
- ERR("Failed to get paused state, hr %#x.\n", hr);
+ ERR("Failed to get paused state, hr %#lx.\n", hr);
IMediaControl_Release(control);
}
@@ -1969,7 +1970,7 @@ static void CALLBACK wait_stop_cb(TP_CALLBACK_INSTANCE *instance, void *context)
HRESULT hr;
if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK)
- ERR("Failed to get state, hr %#x.\n", hr);
+ ERR("Failed to get state, hr %#lx.\n", hr);
IMediaControl_Release(control);
}
@@ -2056,9 +2057,6 @@ static HRESULT all_renderers_seek(struct filter_graph *This, fnFoundSeek FoundSe
HRESULT hr, hr_return = S_OK;
struct filter *filter;
- TRACE("(%p)->(%p %08lx)\n", This, FoundSeek, arg);
- /* Send a message to all renderers, they are responsible for broadcasting it further */
-
LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry)
{
update_seeking(filter);
@@ -2250,7 +2248,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *d
LeaveCriticalSection(&graph->cs);
- TRACE("Returning hr %#x, duration %s (%s seconds).\n", hr,
+ TRACE("Returning hr %#lx, duration %s (%s seconds).\n", hr,
wine_dbgstr_longlong(*duration), debugstr_time(*duration));
return hr;
}
@@ -2358,7 +2356,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
struct filter *filter;
FILTER_STATE state;
- TRACE("graph %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", graph,
+ TRACE("graph %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", graph,
current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags,
stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags);
if (current_ptr)
@@ -2370,11 +2368,11 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning
&& (current_flags & 0x7) != AM_SEEKING_NoPositioning)
- FIXME("Unhandled current_flags %#x.\n", current_flags & 0x7);
+ FIXME("Unhandled current_flags %#lx.\n", current_flags & 0x7);
if ((stop_flags & 0x7) != AM_SEEKING_NoPositioning
&& (stop_flags & 0x7) != AM_SEEKING_AbsolutePositioning)
- FIXME("Unhandled stop_flags %#x.\n", stop_flags & 0x7);
+ FIXME("Unhandled stop_flags %#lx.\n", stop_flags & 0x7);
EnterCriticalSection(&graph->cs);
@@ -2539,7 +2537,7 @@ static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT
static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaPosition_tid, typeinfo);
}
@@ -2549,7 +2547,7 @@ static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition *iface, REFIID
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
@@ -2566,7 +2564,7 @@ static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition *iface, DISPID id, REF
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
@@ -2868,7 +2866,7 @@ static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *coun
static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicAudio_tid, typeinfo);
}
@@ -2878,7 +2876,7 @@ static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@@ -2895,7 +2893,7 @@ static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID id, REFIID ii
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@@ -2913,7 +2911,7 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume)
IBasicAudio* pBasicAudio;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, lVolume);
+ TRACE("graph %p, volume %ld.\n", This, lVolume);
EnterCriticalSection(&This->cs);
@@ -2953,7 +2951,7 @@ static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, LONG lBalance)
IBasicAudio* pBasicAudio;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, lBalance);
+ TRACE("graph %p, balance %ld.\n", This, lBalance);
EnterCriticalSection(&This->cs);
@@ -3035,7 +3033,7 @@ static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *cou
static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo2 *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo);
}
@@ -3045,7 +3043,7 @@ static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo2 *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@@ -3062,7 +3060,7 @@ static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo2 *iface, DISPID id, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@@ -3180,7 +3178,7 @@ static HRESULT WINAPI BasicVideo_put_SourceLeft(IBasicVideo2 *iface, LONG Source
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft);
+ TRACE("graph %p, left %ld.\n", This, SourceLeft);
EnterCriticalSection(&This->cs);
@@ -3220,7 +3218,7 @@ static HRESULT WINAPI BasicVideo_put_SourceWidth(IBasicVideo2 *iface, LONG Sourc
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, SourceWidth);
+ TRACE("graph %p, width %ld.\n", This, SourceWidth);
EnterCriticalSection(&This->cs);
@@ -3260,7 +3258,7 @@ static HRESULT WINAPI BasicVideo_put_SourceTop(IBasicVideo2 *iface, LONG SourceT
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop);
+ TRACE("graph %p, top %ld.\n", This, SourceTop);
EnterCriticalSection(&This->cs);
@@ -3300,7 +3298,7 @@ static HRESULT WINAPI BasicVideo_put_SourceHeight(IBasicVideo2 *iface, LONG Sour
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, SourceHeight);
+ TRACE("graph %p, height %ld.\n", This, SourceHeight);
EnterCriticalSection(&This->cs);
@@ -3340,7 +3338,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationLeft(IBasicVideo2 *iface, LONG D
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft);
+ TRACE("graph %p, left %ld.\n", This, DestinationLeft);
EnterCriticalSection(&This->cs);
@@ -3380,7 +3378,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationWidth(IBasicVideo2 *iface, LONG
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, DestinationWidth);
+ TRACE("graph %p, width %ld.\n", This, DestinationWidth);
EnterCriticalSection(&This->cs);
@@ -3420,7 +3418,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationTop(IBasicVideo2 *iface, LONG De
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop);
+ TRACE("graph %p, top %ld.\n", This, DestinationTop);
EnterCriticalSection(&This->cs);
@@ -3460,7 +3458,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationHeight(IBasicVideo2 *iface, LONG
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight);
+ TRACE("graph %p, height %ld.\n", This, DestinationHeight);
EnterCriticalSection(&This->cs);
@@ -3502,7 +3500,7 @@ static HRESULT WINAPI BasicVideo_SetSourcePosition(IBasicVideo2 *iface, LONG Lef
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height);
+ TRACE("graph %p, left %ld, top %ld, width %ld, height %ld.\n", This, Left, Top, Width, Height);
EnterCriticalSection(&This->cs);
@@ -3564,7 +3562,7 @@ static HRESULT WINAPI BasicVideo_SetDestinationPosition(IBasicVideo2 *iface, LON
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height);
+ TRACE("graph %p, left %ld, top %ld, width %ld, height %ld.\n", This, Left, Top, Width, Height);
EnterCriticalSection(&This->cs);
@@ -3646,7 +3644,8 @@ static HRESULT WINAPI BasicVideo_GetVideoPaletteEntries(IBasicVideo2 *iface, LON
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette);
+ TRACE("graph %p, start_index %ld, count %ld, ret_count %p, entries %p.\n",
+ This, StartIndex, Entries, pRetrieved, pPalette);
EnterCriticalSection(&This->cs);
@@ -3819,7 +3818,7 @@ HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count)
HRESULT WINAPI VideoWindow_GetTypeInfo(IVideoWindow *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IVideoWindow_tid, typeinfo);
}
@@ -3829,7 +3828,7 @@ HRESULT WINAPI VideoWindow_GetIDsOfNames(IVideoWindow *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@@ -3846,7 +3845,7 @@ static HRESULT WINAPI VideoWindow_Invoke(IVideoWindow *iface, DISPID id, REFIID
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@@ -3904,7 +3903,7 @@ static HRESULT WINAPI VideoWindow_put_WindowStyle(IVideoWindow *iface, LONG Wind
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyle);
+ TRACE("graph %p, style %#lx.\n", This, WindowStyle);
EnterCriticalSection(&This->cs);
@@ -3944,7 +3943,7 @@ static HRESULT WINAPI VideoWindow_put_WindowStyleEx(IVideoWindow *iface, LONG Wi
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx);
+ TRACE("graph %p, style %#lx.\n", This, WindowStyleEx);
EnterCriticalSection(&This->cs);
@@ -3984,7 +3983,7 @@ static HRESULT WINAPI VideoWindow_put_AutoShow(IVideoWindow *iface, LONG AutoSho
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow);
+ TRACE("graph %p, show %#lx.\n", This, AutoShow);
EnterCriticalSection(&This->cs);
@@ -4024,7 +4023,7 @@ static HRESULT WINAPI VideoWindow_put_WindowState(IVideoWindow *iface, LONG Wind
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, WindowState);
+ TRACE("graph %p, state %ld.\n", This, WindowState);
EnterCriticalSection(&This->cs);
@@ -4064,7 +4063,7 @@ static HRESULT WINAPI VideoWindow_put_BackgroundPalette(IVideoWindow *iface, LON
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, BackgroundPalette);
+ TRACE("graph %p, palette %ld.\n", This, BackgroundPalette);
EnterCriticalSection(&This->cs);
@@ -4105,7 +4104,7 @@ static HRESULT WINAPI VideoWindow_put_Visible(IVideoWindow *iface, LONG Visible)
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Visible);
+ TRACE("graph %p, visible %ld.\n", This, Visible);
EnterCriticalSection(&This->cs);
@@ -4145,7 +4144,7 @@ static HRESULT WINAPI VideoWindow_put_Left(IVideoWindow *iface, LONG Left)
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Left);
+ TRACE("graph %p, left %ld.\n", This, Left);
EnterCriticalSection(&This->cs);
@@ -4185,7 +4184,7 @@ static HRESULT WINAPI VideoWindow_put_Width(IVideoWindow *iface, LONG Width)
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Width);
+ TRACE("graph %p, width %ld.\n", This, Width);
EnterCriticalSection(&This->cs);
@@ -4225,7 +4224,7 @@ static HRESULT WINAPI VideoWindow_put_Top(IVideoWindow *iface, LONG Top)
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Top);
+ TRACE("graph %p, top %ld.\n", This, Top);
EnterCriticalSection(&This->cs);
@@ -4265,7 +4264,7 @@ static HRESULT WINAPI VideoWindow_put_Height(IVideoWindow *iface, LONG Height)
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Height);
+ TRACE("graph %p, height %ld.\n", This, Height);
EnterCriticalSection(&This->cs);
@@ -4305,7 +4304,7 @@ static HRESULT WINAPI VideoWindow_put_Owner(IVideoWindow *iface, OAHWND Owner)
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner);
+ TRACE("graph %p, owner %#Ix.\n", This, Owner);
EnterCriticalSection(&This->cs);
@@ -4345,7 +4344,7 @@ static HRESULT WINAPI VideoWindow_put_MessageDrain(IVideoWindow *iface, OAHWND D
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
+ TRACE("graph %p, drain %#Ix.\n", This, Drain);
EnterCriticalSection(&This->cs);
@@ -4405,7 +4404,7 @@ static HRESULT WINAPI VideoWindow_put_BorderColor(IVideoWindow *iface, LONG Colo
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Color);
+ TRACE("graph %p, colour %#lx.\n", This, Color);
EnterCriticalSection(&This->cs);
@@ -4445,7 +4444,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG F
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, FullScreenMode);
+ TRACE("graph %p, fullscreen %ld.\n", This, FullScreenMode);
EnterCriticalSection(&This->cs);
@@ -4465,7 +4464,7 @@ static HRESULT WINAPI VideoWindow_SetWindowForeground(IVideoWindow *iface, LONG
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, Focus);
+ TRACE("graph %p, focus %ld.\n", This, Focus);
EnterCriticalSection(&This->cs);
@@ -4486,7 +4485,7 @@ static HRESULT WINAPI VideoWindow_NotifyOwnerMessage(IVideoWindow *iface, OAHWND
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam);
+ TRACE("graph %p, hwnd %#Ix, message %#lx, wparam %#Ix, lparam %#Ix.\n", This, hwnd, uMsg, wParam, lParam);
EnterCriticalSection(&This->cs);
@@ -4507,7 +4506,7 @@ static HRESULT WINAPI VideoWindow_SetWindowPosition(IVideoWindow *iface, LONG Le
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height);
+ TRACE("graph %p, left %ld, top %ld, width %ld, height %ld.\n", This, Left, Top, Width, Height);
EnterCriticalSection(&This->cs);
@@ -4611,7 +4610,7 @@ static HRESULT WINAPI VideoWindow_HideCursor(IVideoWindow *iface, LONG HideCurso
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d)\n", This, iface, HideCursor);
+ TRACE("graph %p, hide %ld.\n", This, HideCursor);
EnterCriticalSection(&This->cs);
@@ -4729,7 +4728,7 @@ static HRESULT WINAPI MediaEvent_GetTypeInfoCount(IMediaEventEx *iface, UINT *co
static HRESULT WINAPI MediaEvent_GetTypeInfo(IMediaEventEx *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaEvent_tid, typeinfo);
}
@@ -4739,7 +4738,7 @@ static HRESULT WINAPI MediaEvent_GetIDsOfNames(IMediaEventEx *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaEvent_tid, &typeinfo)))
@@ -4756,7 +4755,7 @@ static HRESULT WINAPI MediaEvent_Invoke(IMediaEventEx *iface, DISPID id, REFIID
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaEvent_tid, &typeinfo)))
@@ -4784,7 +4783,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code,
struct media_event *event;
struct list *entry;
- TRACE("graph %p, code %p, param1 %p, param2 %p, timeout %d.\n", graph, code, param1, param2, timeout);
+ TRACE("graph %p, code %p, param1 %p, param2 %p, timeout %ld.\n", graph, code, param1, param2, timeout);
*code = 0;
@@ -4815,7 +4814,7 @@ static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, LONG ms
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode);
+ TRACE("graph %p, timeout %ld, code %p.\n", This, msTimeout, pEvCode);
if (This->state != State_Running)
return VFW_E_WRONG_STATE;
@@ -4834,7 +4833,7 @@ static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, LON
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode);
+ TRACE("graph %p, code %#lx.\n", This, lEvCode);
if (lEvCode == EC_COMPLETE)
This->HandleEcComplete = FALSE;
@@ -4852,7 +4851,7 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, LO
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode);
+ TRACE("graph %p, code %#lx.\n", This, lEvCode);
if (lEvCode == EC_COMPLETE)
This->HandleEcComplete = TRUE;
@@ -4866,12 +4865,12 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, LO
return S_OK;
}
-static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG lEvCode,
- LONG_PTR lParam1, LONG_PTR lParam2)
+static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG code,
+ LONG_PTR param1, LONG_PTR param2)
{
- struct filter_graph *This = impl_from_IMediaEventEx(iface);
+ struct filter_graph *graph = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%d, %08lx, %08lx): stub !!!\n", This, iface, lEvCode, lParam1, lParam2);
+ WARN("graph %p, code %#lx, param1 %Id, param2 %Id, stub!\n", graph, code, param1, param2);
return S_OK;
}
@@ -4882,7 +4881,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface,
{
struct filter_graph *graph = impl_from_IMediaEventEx(iface);
- TRACE("graph %p, window %#Ix, message %#x, lparam %#Ix.\n", graph, window, message, lparam);
+ TRACE("graph %p, window %#Ix, message %#lx, lparam %#Ix.\n", graph, window, message, lparam);
graph->media_event_window = (HWND)window;
graph->media_event_message = message;
@@ -4895,11 +4894,11 @@ static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG flags
{
struct filter_graph *graph = impl_from_IMediaEventEx(iface);
- TRACE("graph %p, flags %#x.\n", graph, flags);
+ TRACE("graph %p, flags %#lx.\n", graph, flags);
if (flags & ~AM_MEDIAEVENT_NONOTIFY)
{
- WARN("Invalid flags %#x, returning E_INVALIDARG.\n", flags);
+ WARN("Invalid flags %#lx, returning E_INVALIDARG.\n", flags);
return E_INVALIDARG;
}
@@ -5121,7 +5120,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
DWORD end = GetTickCount() + timeout;
HRESULT hr;
- TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state);
+ TRACE("graph %p, timeout %lu, state %p.\n", graph, timeout, state);
if (!state)
return E_POINTER;
@@ -5147,7 +5146,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
{
HRESULT filter_hr = IBaseFilter_GetState(filter->filter, 0, &filter_state);
- TRACE("Filter %p returned hr %#x, state %u.\n", filter->filter, filter_hr, filter_state);
+ TRACE("Filter %p returned hr %#lx, state %u.\n", filter->filter, filter_hr, filter_state);
if (filter_hr == VFW_S_STATE_INTERMEDIATE)
async_filter = filter->filter;
@@ -5189,7 +5188,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
EnterCriticalSection(&graph->cs);
}
- TRACE("Returning %#x, state %u.\n", hr, *state);
+ TRACE("Returning %#lx, state %u.\n", hr, *state);
return hr;
}
@@ -5308,7 +5307,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code,
{
struct filter_graph *graph = impl_from_IMediaEventSink(iface);
- TRACE("graph %p, code %#x, param1 %#Ix, param2 %#Ix.\n", graph, code, param1, param2);
+ TRACE("graph %p, code %#lx, param1 %#Ix, param2 %#Ix.\n", graph, code, param1, param2);
EnterCriticalSection(&graph->event_cs);
@@ -5372,34 +5371,35 @@ static ULONG WINAPI GraphConfig_Release(IGraphConfig *iface)
return IUnknown_Release(graph->outer_unk);
}
-static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPin, IPin *pInputPin,
- const AM_MEDIA_TYPE *pmtFirstConnection, IBaseFilter *pUsingFilter, HANDLE hAbortEvent,
- DWORD dwFlags)
+static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *source, IPin *sink,
+ const AM_MEDIA_TYPE *mt, IBaseFilter *filter, HANDLE abort_event, DWORD flags)
{
- struct filter_graph *This = impl_from_IGraphConfig(iface);
+ struct filter_graph *graph = impl_from_IGraphConfig(iface);
+
+ FIXME("graph %p, source %p, sink %p, mt %p, filter %p, abort_event %p, flags %#lx, stub!\n",
+ graph, source, sink, mt, filter, abort_event, flags);
+ strmbase_dump_media_type(mt);
- FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags);
- strmbase_dump_media_type(pmtFirstConnection);
-
return E_NOTIMPL;
}
-static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface, IGraphConfigCallback *pCallback,
- void *pvContext, DWORD dwFlags, HANDLE hAbortEvent)
+static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface,
+ IGraphConfigCallback *callback, void *context, DWORD flags, HANDLE abort_event)
{
- struct filter_graph *This = impl_from_IGraphConfig(iface);
+ struct filter_graph *graph = impl_from_IGraphConfig(iface);
HRESULT hr;
- WARN("(%p)->(%p, %p, %x, %p): partial stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent);
+ TRACE("graph %p, callback %p, context %p, flags %#lx, abort_event %p.\n",
+ graph, callback, context, flags, abort_event);
- if (hAbortEvent)
+ if (abort_event)
FIXME("The parameter hAbortEvent is not handled!\n");
- EnterCriticalSection(&This->cs);
+ EnterCriticalSection(&graph->cs);
- hr = IGraphConfigCallback_Reconfigure(pCallback, pvContext, dwFlags);
+ hr = IGraphConfigCallback_Reconfigure(callback, context, flags);
- LeaveCriticalSection(&This->cs);
+ LeaveCriticalSection(&graph->cs);
return hr;
}
@@ -5450,12 +5450,11 @@ static HRESULT WINAPI GraphConfig_PushThroughData(IGraphConfig *iface, IPin *pOu
return E_NOTIMPL;
}
-static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface, IBaseFilter *pFilter,
- DWORD dwFlags)
+static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface, IBaseFilter *filter, DWORD flags)
{
- struct filter_graph *This = impl_from_IGraphConfig(iface);
+ struct filter_graph *graph = impl_from_IGraphConfig(iface);
- FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags);
+ FIXME("graph %p, filter %p, flags %#lx, stub!\n", graph, filter, flags);
return E_NOTIMPL;
}
@@ -5470,12 +5469,11 @@ static HRESULT WINAPI GraphConfig_GetFilterFlags(IGraphConfig *iface, IBaseFilte
return E_NOTIMPL;
}
-static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface, IBaseFilter *pFilter,
- DWORD dwFlags)
+static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface, IBaseFilter *filter, DWORD flags)
{
- struct filter_graph *This = impl_from_IGraphConfig(iface);
+ struct filter_graph *graph = impl_from_IGraphConfig(iface);
- FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags);
+ FIXME("graph %p, filter %p, flags %#lx, stub!\n", graph, filter, flags);
return E_NOTIMPL;
}
@@ -5523,16 +5521,16 @@ static ULONG WINAPI GraphVersion_Release(IGraphVersion *iface)
return IUnknown_Release(graph->outer_unk);
}
-static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *pVersion)
+static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *version)
{
- struct filter_graph *This = impl_from_IGraphVersion(iface);
+ struct filter_graph *graph = impl_from_IGraphVersion(iface);
- if(!pVersion)
+ TRACE("graph %p, version %p, returning %ld.\n", graph, version, graph->version);
+
+ if (!version)
return E_POINTER;
- TRACE("(%p)->(%p): current version %i\n", This, pVersion, This->version);
-
- *pVersion = This->version;
+ *version = graph->version;
return S_OK;
}
@@ -5569,13 +5567,13 @@ static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface)
static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frame_count, IUnknown *filter)
{
- FIXME("iface %p, frame_count %u, filter %p, stub!\n", iface, frame_count, filter);
+ FIXME("iface %p, frame_count %lu, filter %p, stub!\n", iface, frame_count, filter);
return E_NOTIMPL;
}
static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *filter)
{
- FIXME("iface %p, multiple %d, filter %p, stub!\n", iface, multiple, filter);
+ FIXME("iface %p, multiple %ld, filter %p, stub!\n", iface, multiple, filter);
return E_NOTIMPL;
}
@@ -5633,7 +5631,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL
if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, object->outer_unk,
CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&object->punkFilterMapper2)))
{
- ERR("Failed to create filter mapper, hr %#x.\n", hr);
+ ERR("Failed to create filter mapper, hr %#lx.\n", hr);
free(object);
return hr;
}
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index a95f0ca7832..149bc8d1716 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -76,7 +76,7 @@ static ULONG WINAPI enum_reg_filters_AddRef(IEnumRegFilters *iface)
{
struct enum_reg_filters *enumerator = impl_from_IEnumRegFilters(iface);
ULONG refcount = InterlockedIncrement(&enumerator->refcount);
- TRACE("%p increasing refcount to %u.\n", enumerator, refcount);
+ TRACE("%p increasing refcount to %lu.\n", enumerator, refcount);
return refcount;
}
@@ -86,7 +86,7 @@ static ULONG WINAPI enum_reg_filters_Release(IEnumRegFilters *iface)
ULONG refcount = InterlockedDecrement(&enumerator->refcount);
unsigned int i;
- TRACE("%p decreasing refcount to %u.\n", enumerator, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", enumerator, refcount);
if (!refcount)
{
for (i = 0; i < enumerator->count; ++i)
@@ -103,7 +103,7 @@ static HRESULT WINAPI enum_reg_filters_Next(IEnumRegFilters *iface, ULONG count,
struct enum_reg_filters *enumerator = impl_from_IEnumRegFilters(iface);
unsigned int i;
- TRACE("iface %p, count %u, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
+ TRACE("iface %p, count %lu, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
for (i = 0; i < count && enumerator->index + i < enumerator->count; ++i)
{
@@ -131,7 +131,7 @@ static HRESULT WINAPI enum_reg_filters_Next(IEnumRegFilters *iface, ULONG count,
static HRESULT WINAPI enum_reg_filters_Skip(IEnumRegFilters *iface, ULONG count)
{
- TRACE("iface %p, count %u, unimplemented.\n", iface, count);
+ TRACE("iface %p, count %lu, unimplemented.\n", iface, count);
return E_NOTIMPL;
}
@@ -234,7 +234,7 @@ static ULONG WINAPI enum_moniker_AddRef(IEnumMoniker *iface)
{
struct enum_moniker *enumerator = impl_from_IEnumMoniker(iface);
ULONG refcount = InterlockedIncrement(&enumerator->refcount);
- TRACE("%p increasing refcount to %u.\n", enumerator, refcount);
+ TRACE("%p increasing refcount to %lu.\n", enumerator, refcount);
return refcount;
}
@@ -244,7 +244,7 @@ static ULONG WINAPI enum_moniker_Release(IEnumMoniker *iface)
ULONG refcount = InterlockedDecrement(&enumerator->refcount);
unsigned int i;
- TRACE("%p decreasing refcount to %u.\n", enumerator, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", enumerator, refcount);
if (!refcount)
{
for (i = 0; i < enumerator->count; ++i)
@@ -261,7 +261,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG count,
struct enum_moniker *enumerator = impl_from_IEnumMoniker(iface);
unsigned int i;
- TRACE("iface %p, count %u, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
+ TRACE("iface %p, count %lu, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
for (i = 0; i < count && enumerator->index + i < enumerator->count; ++i)
IMoniker_AddRef(filters[i] = enumerator->filters[enumerator->index + i]);
@@ -276,7 +276,7 @@ static HRESULT WINAPI enum_moniker_Skip(IEnumMoniker *iface, ULONG count)
{
struct enum_moniker *enumerator = impl_from_IEnumMoniker(iface);
- TRACE("iface %p, count %u.\n", iface, count);
+ TRACE("iface %p, count %lu.\n", iface, count);
enumerator->index += count;
return S_OK;
@@ -469,27 +469,27 @@ static HRESULT WINAPI Inner_QueryInterface(IUnknown *iface, REFIID riid, void **
static ULONG WINAPI Inner_AddRef(IUnknown *iface)
{
- FilterMapper3Impl *This = impl_from_IUnknown(iface);
- ULONG ref = InterlockedIncrement(&This->ref);
+ FilterMapper3Impl *mapper = impl_from_IUnknown(iface);
+ ULONG refcount = InterlockedIncrement(&mapper->ref);
- TRACE("(%p)->(): new ref = %d\n", This, ref);
+ TRACE("%p increasing refcount to %lu.\n", mapper, refcount);
- return ref;
+ return refcount;
}
static ULONG WINAPI Inner_Release(IUnknown *iface)
{
- FilterMapper3Impl *This = impl_from_IUnknown(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
+ FilterMapper3Impl *mapper = impl_from_IUnknown(iface);
+ ULONG refcount = InterlockedDecrement(&mapper->ref);
- TRACE("(%p)->(): new ref = %d\n", This, ref);
+ TRACE("%p decreasing refcount to %lu.\n", mapper, refcount);
- if (ref == 0)
+ if (!refcount)
{
- CoTaskMemFree(This);
+ CoTaskMemFree(mapper);
}
- return ref;
+ return refcount;
}
static const IUnknownVtbl IInner_VTable =
@@ -529,7 +529,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory(IFilterMapper3 *iface,
HKEY key;
LONG ret;
- TRACE("iface %p, category %s, merit %#x, description %s.\n", iface,
+ TRACE("iface %p, category %s, merit %#lx, description %s.\n", iface,
debugstr_guid(category), merit, debugstr_w(description));
StringFromGUID2(category, guidstr, ARRAY_SIZE(guidstr));
@@ -702,14 +702,14 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2)
if (prrf->dwVersion != 2)
{
- FIXME("Filter registry version %d not supported\n", prrf->dwVersion);
+ FIXME("Filter registry version %lu is not supported.\n", prrf->dwVersion);
ZeroMemory(prf2, sizeof(*prf2));
hr = E_FAIL;
}
if (SUCCEEDED(hr))
{
- TRACE("version = %d, merit = %x, #pins = %d, unused = %x\n",
+ TRACE("dwVersion %lu, dwMerit %#lx, dwPins %lu, dwUnused %#lx.\n",
prrf->dwVersion, prrf->dwMerit, prrf->dwPins, prrf->dwUnused);
prf2->dwVersion = prrf->dwVersion;
@@ -730,7 +730,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2)
TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4));
- TRACE("\tpin[%d]: flags = %x, instances = %d, media types = %d, mediums = %d\n",
+ TRACE("\tPin %lu: dwFlags %#lx, dwInstances %lu, dwMediaTypes %lu, dwMediums %lu.\n",
i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums);
rgPins2[i].dwFlags = prrfp->dwFlags;
@@ -901,7 +901,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
if (FAILED(hr = IParseDisplayName_ParseDisplayName(parser, NULL, display_name, &eaten, &moniker)))
{
- ERR("Failed to parse display name, hr %#x.\n", hr);
+ ERR("Failed to parse display name, hr %#lx.\n", hr);
IParseDisplayName_Release(parser);
free(display_name);
return hr;
@@ -911,7 +911,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
if (FAILED(hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag)))
{
- ERR("Failed to get property bag, hr %#x.\n", hr);
+ ERR("Failed to get property bag, hr %#lx.\n", hr);
IMoniker_Release(moniker);
free(display_name);
return hr;
@@ -920,13 +920,13 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = SysAllocString(name);
if (FAILED(hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var)))
- ERR("Failed to write friendly name, hr %#x.\n", hr);
+ ERR("Failed to write friendly name, hr %#lx.\n", hr);
VariantClear(&var);
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = SysAllocString(clsid_string);
if (FAILED(hr = IPropertyBag_Write(prop_bag, L"CLSID", &var)))
- ERR("Failed to write class ID, hr %#x.\n", hr);
+ ERR("Failed to write class ID, hr %#lx.\n", hr);
VariantClear(&var);
if (SUCCEEDED(FM2_WriteFilterData(®filter2, &filter_data, &filter_data_len)))
@@ -936,7 +936,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
{
memcpy(V_ARRAY(&var)->pvData, filter_data, filter_data_len);
if (FAILED(hr = IPropertyBag_Write(prop_bag, L"FilterData", &var)))
- ERR("Failed to write filter data, hr %#x.\n", hr);
+ ERR("Failed to write filter data, hr %#lx.\n", hr);
VariantClear(&var);
}
@@ -1030,7 +1030,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters(
HRESULT hr;
struct Vector monikers = {NULL, 0, 0};
- TRACE("(%p, %x, %s, %x, %s, %d, %p, %p, %p, %s, %s, %p, %p, %p)\n",
+ TRACE("(%p, %#lx, %s, %#lx, %s, %lu, %p, %p, %p, %s, %s, %p, %p, %p)\n",
ppEnum,
dwFlags,
bExactMatch ? "true" : "false",
@@ -1047,9 +1047,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters(
pPinCategoryOut);
if (dwFlags != 0)
- {
- FIXME("dwFlags = %x not implemented\n", dwFlags);
- }
+ FIXME("Ignoring flags %#lx.\n", dwFlags);
*ppEnum = NULL;
@@ -1289,7 +1287,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
REGFILTER* regfilters;
HRESULT hr;
- TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s)\n",
+ TRACE("(%p/%p)->(%p, %#lx, %s, %s, %s, %s, %s, %s, %s)\n",
This,
iface,
ppEnum,
@@ -1401,7 +1399,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface,
HKEY key;
LONG ret;
- TRACE("iface %p, clsid %s, name %s, merit %#x.\n",
+ TRACE("iface %p, clsid %s, name %s, merit %#lx.\n",
iface, debugstr_guid(&clsid), debugstr_w(name), merit);
StringFromGUID2(&clsid, guidstr, ARRAY_SIZE(guidstr));
@@ -1412,7 +1410,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface,
return HRESULT_FROM_WIN32(ret);
if ((ret = RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)name, (wcslen(name) + 1) * sizeof(WCHAR))))
- ERR("Failed to set filter name, error %u.\n", ret);
+ ERR("Failed to set filter name, error %lu.\n", ret);
RegCloseKey(key);
wcscpy(keypath, L"CLSID\\");
@@ -1420,11 +1418,11 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface,
if (!(ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL)))
{
if ((ret = RegSetValueExW(key, L"Merit", 0, REG_DWORD, (const BYTE *)&merit, sizeof(DWORD))))
- ERR("Failed to set merit, error %u.\n", ret);
+ ERR("Failed to set merit, error %lu.\n", ret);
RegCloseKey(key);
}
else
- ERR("Failed to create CLSID key, error %u.\n", ret);
+ ERR("Failed to create CLSID key, error %lu.\n", ret);
return S_OK;
}
@@ -1466,7 +1464,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid
if ((ret = RegCreateKeyExW(key, pin_keypath, 0, NULL, 0, KEY_WRITE, NULL, &pin_key, NULL)))
{
- ERR("Failed to open pin key, error %u.\n", ret);
+ ERR("Failed to open pin key, error %lu.\n", ret);
free(pin_keypath);
RegCloseKey(key);
return HRESULT_FROM_WIN32(ret);
@@ -1474,18 +1472,18 @@ static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid
free(pin_keypath);
if ((ret = RegSetValueExW(pin_key, L"AllowedMany", 0, REG_DWORD, (const BYTE *)&many, sizeof(DWORD))))
- ERR("Failed to set AllowedMany value, error %u.\n", ret);
+ ERR("Failed to set AllowedMany value, error %lu.\n", ret);
if ((ret = RegSetValueExW(pin_key, L"AllowedZero", 0, REG_DWORD, (const BYTE *)&zero, sizeof(DWORD))))
- ERR("Failed to set AllowedZero value, error %u.\n", ret);
+ ERR("Failed to set AllowedZero value, error %lu.\n", ret);
if ((ret = RegSetValueExW(pin_key, L"Direction", 0, REG_DWORD, (const BYTE *)&output, sizeof(DWORD))))
- ERR("Failed to set Direction value, error %u.\n", ret);
+ ERR("Failed to set Direction value, error %lu.\n", ret);
if ((ret = RegSetValueExW(pin_key, L"IsRendered", 0, REG_DWORD, (const BYTE *)&rendered, sizeof(DWORD))))
- ERR("Failed to set IsRendered value, error %u.\n", ret);
+ ERR("Failed to set IsRendered value, error %lu.\n", ret);
if (!(ret = RegCreateKeyExW(pin_key, L"Types", 0, NULL, 0, 0, NULL, &type_key, NULL)))
RegCloseKey(type_key);
else
- ERR("Failed to create Types subkey, error %u.\n", ret);
+ ERR("Failed to create Types subkey, error %lu.\n", ret);
RegCloseKey(pin_key);
RegCloseKey(key);
@@ -1527,7 +1525,7 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(IFilterMapper *iface,
if (!(ret = RegCreateKeyExW(key, type_keypath, 0, NULL, 0, 0, NULL, &type_key, NULL)))
RegCloseKey(type_key);
else
- ERR("Failed to create type key, error %u.\n", ret);
+ ERR("Failed to create type key, error %lu.\n", ret);
RegCloseKey(key);
return HRESULT_FROM_WIN32(ret);
@@ -1546,7 +1544,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper *iface, CLSID
if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Filter", 0, 0, &key)))
return HRESULT_FROM_WIN32(ret);
if ((ret = RegDeleteKeyW(key, guidstr)))
- ERR("Failed to delete filter key, error %u.\n", ret);
+ ERR("Failed to delete filter key, error %lu.\n", ret);
RegCloseKey(key);
wcscpy(keypath, L"CLSID\\");
@@ -1554,13 +1552,13 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper *iface, CLSID
if (!(ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key)))
{
if ((ret = RegDeleteValueW(key, L"Merit")))
- ERR("Failed to delete Merit value, error %u.\n", ret);
+ ERR("Failed to delete Merit value, error %lu.\n", ret);
if ((ret = RegDeleteTreeW(key, L"Pins")))
- ERR("Failed to delete Pins key, error %u.\n", ret);
+ ERR("Failed to delete Pins key, error %lu.\n", ret);
RegCloseKey(key);
}
else
- ERR("Failed to open CLSID key, error %u.\n", ret);
+ ERR("Failed to open CLSID key, error %lu.\n", ret);
return S_OK;
}
@@ -1592,7 +1590,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID cl
return HRESULT_FROM_WIN32(ret);
if ((ret = RegDeleteTreeW(key, name)))
- ERR("Failed to delete subkey, error %u.\n", ret);
+ ERR("Failed to delete subkey, error %lu.\n", ret);
RegCloseKey(key);
@@ -1648,7 +1646,7 @@ static HRESULT WINAPI AMFilterData_ParseFilterData(IAMFilterData* iface,
HRESULT hr = S_OK;
static REGFILTER2 *prf2;
- TRACE("(%p/%p)->(%p, %d, %p)\n", This, iface, pData, cb, ppRegFilter2);
+ TRACE("mapper %p, data %p, size %lu, parsed_data %p.\n", This, pData, cb, ppRegFilter2);
prf2 = CoTaskMemAlloc(sizeof(*prf2));
if (!prf2)
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index ed7080b76b9..c5302db6ced 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -260,13 +260,13 @@ const char * qzdebugstr_guid( const GUID * id )
return debugstr_guid(id);
}
-LONG WINAPI AmpFactorToDB(LONG ampfactor)
+int WINAPI AmpFactorToDB(int ampfactor)
{
FIXME("(%d) Stub!\n", ampfactor);
return 0;
}
-LONG WINAPI DBToAmpFactor(LONG db)
+int WINAPI DBToAmpFactor(int db)
{
FIXME("(%d) Stub!\n", db);
/* Avoid divide by zero (probably during range computation) in Windows Media Player 6.4 */
@@ -283,7 +283,8 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen)
DWORD res;
WCHAR errorW[MAX_ERROR_TEXT_LEN];
- TRACE("(%x,%p,%d)\n", hr, buffer, maxlen);
+ TRACE("hr %#lx, buffer %p, maxlen %lu.\n", hr, buffer, maxlen);
+
if (!buffer)
return 0;
@@ -305,7 +306,7 @@ DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen)
unsigned int len;
WCHAR error[MAX_ERROR_TEXT_LEN];
- FIXME("(%x,%p,%d) stub\n", hr, buffer, maxlen);
+ TRACE("hr %#lx, buffer %p, maxlen %lu.\n", hr, buffer, maxlen);
if (!buffer) return 0;
swprintf(error, ARRAY_SIZE(error), L"Error: 0x%lx", hr);
diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c
index 531fbe874cf..87869b4d6b2 100644
--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -135,7 +135,7 @@ static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface)
BaseMemAllocator *This = impl_from_IMemAllocator(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
+ TRACE("%p increasing refcount to %lu.\n", This, ref);
return ref;
}
@@ -145,7 +145,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface)
BaseMemAllocator *This = impl_from_IMemAllocator(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() Release from %d\n", iface, ref + 1);
+ TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref)
{
@@ -166,7 +166,7 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO
TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual);
- TRACE("Requested %d buffers, size %d, alignment %d, prefix %d.\n",
+ TRACE("Requested %ld buffers, size %ld, alignment %ld, prefix %ld.\n",
pRequest->cBuffers, pRequest->cbBuffer, pRequest->cbAlign, pRequest->cbPrefix);
EnterCriticalSection(This->pCritSect);
@@ -236,7 +236,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)
{
if (!(This->hSemWaiting = CreateSemaphoreW(NULL, This->props.cBuffers, This->props.cBuffers, NULL)))
{
- ERR("Couldn't create semaphore (error was %u)\n", GetLastError());
+ ERR("Failed to create semaphore, error %lu.\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError());
}
else
@@ -245,7 +245,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)
if (SUCCEEDED(hr))
This->bCommitted = TRUE;
else
- ERR("fnAlloc failed with error 0x%x\n", hr);
+ ERR("Failed to allocate, hr %#lx.\n", hr);
}
}
}
@@ -278,15 +278,13 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface)
else
{
if (This->lWaiting != 0)
- ERR("Waiting: %d\n", This->lWaiting);
+ ERR("Waiting: %ld\n", This->lWaiting);
This->bCommitted = FALSE;
CloseHandle(This->hSemWaiting);
This->hSemWaiting = NULL;
hr = This->fnFree(iface);
- if (FAILED(hr))
- ERR("fnFree failed with error 0x%x\n", hr);
}
}
}
@@ -302,8 +300,9 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa
/* NOTE: The pStartTime and pEndTime parameters are not applied to the sample.
* The allocator might use these values to determine which buffer it retrieves */
-
- TRACE("(%p)->(%p, %p, %p, %x)\n", This, pSample, pStartTime, pEndTime, dwFlags);
+
+ TRACE("allocator %p, sample %p, start_time %p, end_time %p, flags %#lx.\n",
+ This, pSample, pStartTime, pEndTime, dwFlags);
*pSample = NULL;
@@ -351,7 +350,7 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa
LeaveCriticalSection(This->pCritSect);
if (hr != S_OK)
- WARN("%08x\n", hr);
+ WARN("Returning hr %#lx.\n", hr);
return hr;
}
@@ -379,10 +378,8 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
if (list_empty(&This->used_list) && This->bDecommitQueued && This->bCommitted)
{
- HRESULT hrfree;
-
if (This->lWaiting != 0)
- ERR("Waiting: %d\n", This->lWaiting);
+ ERR("Waiting: %ld\n", This->lWaiting);
This->bCommitted = FALSE;
This->bDecommitQueued = FALSE;
@@ -390,8 +387,7 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
CloseHandle(This->hSemWaiting);
This->hSemWaiting = NULL;
- if (FAILED(hrfree = This->fnFree(iface)))
- ERR("fnFree failed with error 0x%x\n", hrfree);
+ This->fnFree(iface);
}
}
LeaveCriticalSection(This->pCritSect);
@@ -399,7 +395,7 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
/* notify a waiting thread that there is now a free buffer */
if (This->hSemWaiting && !ReleaseSemaphore(This->hSemWaiting, 1, NULL))
{
- ERR("ReleaseSemaphore failed with error %u\n", GetLastError());
+ ERR("Failed to release semaphore, error %lu.\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError());
}
@@ -479,7 +475,7 @@ static ULONG WINAPI StdMediaSample2_AddRef(IMediaSample2 * iface)
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %d\n", This, ref);
+ TRACE("%p increasing refcount to %lu.\n", This, ref);
return ref;
}
@@ -489,7 +485,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface)
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %d\n", This, ref);
+ TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref)
{
@@ -645,11 +641,11 @@ static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface,
{
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
- TRACE("(%p)->(%d)\n", iface, len);
+ TRACE("sample %p, len %ld.\n", This, len);
if ((len > This->props.cbBuffer) || (len < 0))
{
- WARN("Tried to set length to %d, while max is %d\n", len, This->props.cbBuffer);
+ ERR("Length %ld exceeds maximum %ld.\n", len, This->props.cbBuffer);
return VFW_E_BUFFER_OVERFLOW;
}
else
@@ -766,7 +762,7 @@ static HRESULT WINAPI StdMediaSample2_GetProperties(IMediaSample2 * iface, DWORD
{
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
- TRACE("(%p)->(%d, %p)\n", iface, cbProperties, pbProperties);
+ TRACE("sample %p, size %lu, properties %p.\n", This, cbProperties, pbProperties);
memcpy(pbProperties, &This->props, min(cbProperties, sizeof(This->props)));
@@ -777,7 +773,7 @@ static HRESULT WINAPI StdMediaSample2_SetProperties(IMediaSample2 * iface, DWORD
{
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
- TRACE("(%p)->(%d, %p)\n", iface, cbProperties, pbProperties);
+ TRACE("sample %p, size %lu, properties %p.\n", This, cbProperties, pbProperties);
/* NOTE: pbBuffer and cbBuffer are read-only */
memcpy(&This->props, pbProperties, min(cbProperties, AM_SAMPLE2_PROP_SIZE_WRITABLE));
@@ -896,7 +892,7 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface)
/* free memory */
if (!VirtualFree(This->pMemory, 0, MEM_RELEASE))
{
- ERR("Couldn't free memory. Error: %u\n", GetLastError());
+ ERR("Failed to free memory, error %lu.\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}
diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c
index 2f8fe9dc370..4627b2d26f8 100644
--- a/dlls/quartz/passthrough.c
+++ b/dlls/quartz/passthrough.c
@@ -66,7 +66,7 @@ static ULONG WINAPI seeking_passthrough_AddRef(IUnknown *iface)
struct seeking_passthrough *passthrough = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&passthrough->refcount);
- TRACE("%p increasing refcount to %u.\n", passthrough, refcount);
+ TRACE("%p increasing refcount to %lu.\n", passthrough, refcount);
return refcount;
}
@@ -75,7 +75,7 @@ static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface)
struct seeking_passthrough *passthrough = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&passthrough->refcount);
- TRACE("%p decreasing refcount to %u.\n", passthrough, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", passthrough, refcount);
if (!refcount)
{
strmbase_passthrough_cleanup(&passthrough->passthrough);
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index 649e25e7327..d035f8673fb 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -127,7 +127,7 @@ static HRESULT register_filters(struct regsvr_filter const *list)
}
if (FAILED(hr)) {
- ERR("failed to register with hresult 0x%x\n", hr);
+ ERR("failed to register with hresult %#lx\n", hr);
CoTaskMemFree(prfp2);
break;
}
diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c
index f579ae754ea..729122fec46 100644
--- a/dlls/quartz/systemclock.c
+++ b/dlls/quartz/systemclock.c
@@ -25,7 +25,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
-static int cookie_counter;
+static LONG cookie_counter;
struct advise_sink
{
@@ -42,7 +42,8 @@ struct system_clock
IUnknown *outer_unk;
LONG refcount;
- BOOL thread_created, thread_stopped;
+ LONG thread_created;
+ BOOL thread_stopped;
HANDLE thread;
LARGE_INTEGER frequency;
REFERENCE_TIME last_time;
@@ -90,7 +91,7 @@ static ULONG WINAPI system_clock_inner_AddRef(IUnknown *iface)
struct system_clock *clock = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&clock->refcount);
- TRACE("%p increasing refcount to %u.\n", clock, refcount);
+ TRACE("%p increasing refcount to %lu.\n", clock, refcount);
return refcount;
}
@@ -101,7 +102,7 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface)
ULONG refcount = InterlockedDecrement(&clock->refcount);
struct advise_sink *sink, *cursor;
- TRACE("%p decreasing refcount to %u.\n", clock, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", clock, refcount);
if (!refcount)
{
@@ -267,7 +268,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface,
{
struct system_clock *clock = impl_from_IReferenceClock(iface);
- TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n",
+ TRACE("clock %p, base %s, offset %s, event %#Ix, cookie %p.\n",
clock, debugstr_time(base), debugstr_time(offset), event, cookie);
if (base + offset <= 0)
@@ -281,7 +282,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface,
{
struct system_clock *clock = impl_from_IReferenceClock(iface);
- TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n",
+ TRACE("clock %p, start %s, period %s, semaphore %#Ix, cookie %p.\n",
clock, debugstr_time(start), debugstr_time(period), semaphore, cookie);
if (start <= 0 || period <= 0)
@@ -295,7 +296,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR
struct system_clock *clock = impl_from_IReferenceClock(iface);
struct advise_sink *sink;
- TRACE("clock %p, cookie %#lx.\n", clock, cookie);
+ TRACE("clock %p, cookie %#Ix.\n", clock, cookie);
EnterCriticalSection(&clock->cs);
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 1dbb8a02181..f44ce35dc59 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -92,7 +92,7 @@ static HRESULT video_renderer_render(struct strmbase_renderer *iface, IMediaSamp
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
- ERR("Cannot get pointer to sample data (%x)\n", hr);
+ ERR("Failed to get buffer pointer, hr %#lx.\n", hr);
return hr;
}
@@ -277,7 +277,7 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface,
{
struct video_renderer *This = impl_from_IVideoWindow(iface);
- TRACE("(%p/%p)->(%p): %d\n", This, iface, FullScreenMode, This->FullScreenMode);
+ TRACE("window %p, fullscreen %p.\n", This, FullScreenMode);
if (!FullScreenMode)
return E_POINTER;
@@ -292,7 +292,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG f
struct video_renderer *filter = impl_from_IVideoWindow(iface);
HWND window = filter->window.hwnd;
- FIXME("filter %p, fullscreen %d.\n", filter, fullscreen);
+ FIXME("filter %p, fullscreen %ld.\n", filter, fullscreen);
if (fullscreen)
{
@@ -399,7 +399,7 @@ static HRESULT WINAPI overlay_GetPalette(IOverlay *iface, DWORD *count, PALETTEE
static HRESULT WINAPI overlay_SetPalette(IOverlay *iface, DWORD count, PALETTEENTRY *palette)
{
- FIXME("iface %p, count %u, palette %p, stub!\n", iface, count, palette);
+ FIXME("iface %p, count %lu, palette %p, stub!\n", iface, count, palette);
return E_NOTIMPL;
}
@@ -445,7 +445,7 @@ static HRESULT WINAPI overlay_GetVideoPosition(IOverlay *iface, RECT *source, RE
static HRESULT WINAPI overlay_Advise(IOverlay *iface, IOverlayNotify *sink, DWORD flags)
{
- FIXME("iface %p, sink %p, flags %#x, stub!\n", iface, sink, flags);
+ FIXME("iface %p, sink %p, flags %#lx, stub!\n", iface, sink, flags);
return E_NOTIMPL;
}
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 78e47bbb908..4b213d57426 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -244,7 +244,7 @@ static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
if (FAILED(hr = IMediaSample_GetPointer(sample, &data)))
{
- ERR("Failed to get pointer to sample data, hr %#x.\n", hr);
+ ERR("Failed to get pointer to sample data, hr %#lx.\n", hr);
return hr;
}
data_size = IMediaSample_GetActualDataLength(sample);
@@ -267,7 +267,7 @@ static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
if (FAILED(hr = IDirect3DSurface9_LockRect(info.lpSurf, &locked_rect, NULL, D3DLOCK_DISCARD)))
{
- ERR("Failed to lock surface, hr %#x.\n", hr);
+ ERR("Failed to lock surface, hr %#lx.\n", hr);
return hr;
}
@@ -332,7 +332,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *
if (FAILED(hr = IVMRSurfaceAllocator9_InitializeDevice(filter->allocator,
filter->cookie, info, &count)))
{
- WARN("Failed to initialize device (flags %#x), hr %#x.\n", info->dwFlags, hr);
+ WARN("Failed to initialize device (flags %#lx), hr %#lx.\n", info->dwFlags, hr);
return hr;
}
@@ -341,7 +341,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *
if (FAILED(hr = IVMRSurfaceAllocator9_GetSurface(filter->allocator,
filter->cookie, i, 0, &filter->surfaces[i])))
{
- ERR("Failed to get surface %u, hr %#x.\n", i, hr);
+ ERR("Failed to get surface %lu, hr %#lx.\n", i, hr);
while (i--)
IDirect3DSurface9_Release(filter->surfaces[i]);
IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie);
@@ -425,7 +425,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE
break;
default:
- WARN("Unhandled video compression %#x.\n", filter->bmiheader.biCompression);
+ WARN("Unhandled video compression %#lx.\n", filter->bmiheader.biCompression);
free(filter->surfaces);
return VFW_E_TYPE_NOT_ACCEPTED;
}
@@ -882,11 +882,12 @@ static HRESULT WINAPI VMR7FilterConfig_SetImageCompositor(IVMRFilterConfig *ifac
return E_NOTIMPL;
}
-static HRESULT WINAPI VMR7FilterConfig_SetNumberOfStreams(IVMRFilterConfig *iface, DWORD max)
+static HRESULT WINAPI VMR7FilterConfig_SetNumberOfStreams(IVMRFilterConfig *iface, DWORD count)
{
- struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface);
+ struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface);
+
+ FIXME("filter %p, count %lu, stub!\n", filter, count);
- FIXME("(%p/%p)->(%u) stub\n", iface, This, max);
return E_NOTIMPL;
}
@@ -898,11 +899,12 @@ static HRESULT WINAPI VMR7FilterConfig_GetNumberOfStreams(IVMRFilterConfig *ifac
return E_NOTIMPL;
}
-static HRESULT WINAPI VMR7FilterConfig_SetRenderingPrefs(IVMRFilterConfig *iface, DWORD renderflags)
+static HRESULT WINAPI VMR7FilterConfig_SetRenderingPrefs(IVMRFilterConfig *iface, DWORD flags)
{
- struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface);
+ struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface);
+
+ FIXME("filter %p, flags %#lx, stub!\n", filter, flags);
- FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags);
return E_NOTIMPL;
}
@@ -918,7 +920,7 @@ static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface,
{
struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface);
- TRACE("iface %p, mode %#x.\n", iface, mode);
+ TRACE("iface %p, mode %#lx.\n", iface, mode);
return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode);
}
@@ -1104,7 +1106,7 @@ static HRESULT WINAPI VMR7MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig *
struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface);
struct get_available_monitors_args args;
- FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev);
+ TRACE("filter %p, info %p, arraysize %lu, numdev %p.\n", This, info, arraysize, numdev);
if (!numdev)
return E_POINTER;
@@ -1204,7 +1206,7 @@ static HRESULT WINAPI VMR9MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig9
struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface);
struct get_available_monitors_args args;
- FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev);
+ TRACE("filter %p, info %p, arraysize %lu, numdev %p.\n", This, info, arraysize, numdev);
if (!numdev)
return E_POINTER;
@@ -1264,7 +1266,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *ifa
{
struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface);
- FIXME("iface %p, count %u, stub!\n", iface, count);
+ FIXME("iface %p, count %lu, stub!\n", iface, count);
if (!count)
{
@@ -1307,11 +1309,12 @@ static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *ifa
return S_OK;
}
-static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD renderflags)
+static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD flags)
{
- struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface);
+ struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface);
+
+ TRACE("filter %p, flags %#lx.\n", filter, flags);
- FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags);
return E_NOTIMPL;
}
@@ -1328,7 +1331,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface
HRESULT hr = S_OK;
struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface);
- TRACE("(%p/%p)->(%u)\n", iface, This, mode);
+ TRACE("filter %p, mode %lu.\n", This, mode);
EnterCriticalSection(&This->renderer.filter.filter_cs);
if (This->mode)
@@ -1353,14 +1356,14 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface
if (FAILED(hr = VMR9DefaultAllocatorPresenterImpl_create(This, (void **)&This->presenter)))
{
- ERR("Failed to create default presenter, hr %#x.\n", hr);
+ ERR("Failed to create default presenter, hr %#lx.\n", hr);
break;
}
if (FAILED(hr = IVMRImagePresenter9_QueryInterface(This->presenter,
&IID_IVMRSurfaceAllocator9, (void **)&This->allocator)))
{
- ERR("Failed to query for IVMRSurfaceAllocator9, hr %#x.\n", hr);
+ ERR("Failed to query for IVMRSurfaceAllocator9, hr %#lx.\n", hr);
IVMRImagePresenter9_Release(This->presenter);
This->allocator = NULL;
This->presenter = NULL;
@@ -1720,7 +1723,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon
{
struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface);
- TRACE("filter %p, mode %u.\n", filter, mode);
+ TRACE("filter %p, mode %lu.\n", filter, mode);
EnterCriticalSection(&filter->renderer.filter.filter_cs);
filter->aspect_mode = mode;
@@ -1936,7 +1939,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_AddRef(IVMRSurfaceAllocatorNotify
struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface);
ULONG refcount = InterlockedIncrement(&filter->IVMRSurfaceAllocatorNotify9_refcount);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -1946,7 +1949,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif
struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface);
ULONG refcount = InterlockedDecrement(&filter->IVMRSurfaceAllocatorNotify9_refcount);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount && !filter->renderer.filter.refcount)
free(filter);
@@ -2031,7 +2034,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa
if (!allocinfo || !numbuffers || !surface)
return E_POINTER;
- TRACE("Flags %#x, size %ux%u, format %u (%#x), pool %u, minimum buffers %u.\n",
+ TRACE("Flags %#lx, size %lux%lu, format %u (%#x), pool %u, minimum buffers %lu.\n",
allocinfo->dwFlags, allocinfo->dwWidth, allocinfo->dwHeight,
allocinfo->Format, allocinfo->Format, allocinfo->Pool, allocinfo->MinBuffers);
@@ -2056,7 +2059,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa
if (!*numbuffers || *numbuffers < allocinfo->MinBuffers)
{
- WARN("%u surfaces requested (minimum %u); returning E_INVALIDARG.\n",
+ WARN("%lu surfaces requested (minimum %lu); returning E_INVALIDARG.\n",
*numbuffers, allocinfo->MinBuffers);
return E_INVALIDARG;
}
@@ -2103,12 +2106,12 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa
}
else
{
- FIXME("Unhandled flags %#x.\n", allocinfo->dwFlags);
+ FIXME("Unhandled flags %#lx.\n", allocinfo->dwFlags);
return E_NOTIMPL;
}
if (FAILED(hr))
- WARN("%u/%u surfaces allocated, hr %#x.\n", i, *numbuffers, hr);
+ WARN("%lu/%lu surfaces allocated, hr %#lx.\n", i, *numbuffers, hr);
if (i >= allocinfo->MinBuffers)
{
@@ -2170,7 +2173,7 @@ static HRESULT WINAPI mixer_control9_SetAlpha(IVMRMixerControl9 *iface, DWORD st
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, stream %u, alpha %.8e, stub!\n", filter, stream, alpha);
+ FIXME("filter %p, stream %lu, alpha %.8e, stub!\n", filter, stream, alpha);
return E_NOTIMPL;
}
@@ -2179,7 +2182,7 @@ static HRESULT WINAPI mixer_control9_GetAlpha(IVMRMixerControl9 *iface, DWORD st
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, stream %u, alpha %p, stub!\n", filter, stream, alpha);
+ FIXME("filter %p, stream %lu, alpha %p, stub!\n", filter, stream, alpha);
return E_NOTIMPL;
}
@@ -2188,7 +2191,7 @@ static HRESULT WINAPI mixer_control9_SetZOrder(IVMRMixerControl9 *iface, DWORD s
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, stream %u, z %u, stub!\n", filter, stream, z);
+ FIXME("filter %p, stream %lu, z %lu, stub!\n", filter, stream, z);
return E_NOTIMPL;
}
@@ -2197,7 +2200,7 @@ static HRESULT WINAPI mixer_control9_GetZOrder(IVMRMixerControl9 *iface, DWORD s
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, stream %u, z %p, stub!\n", filter, stream, z);
+ FIXME("filter %p, stream %lu, z %p, stub!\n", filter, stream, z);
return E_NOTIMPL;
}
@@ -2207,7 +2210,7 @@ static HRESULT WINAPI mixer_control9_SetOutputRect(IVMRMixerControl9 *iface,
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, stream %u, rect %s, stub!\n", filter, stream, debugstr_normalized_rect(rect));
+ FIXME("filter %p, stream %lu, rect %s, stub!\n", filter, stream, debugstr_normalized_rect(rect));
return E_NOTIMPL;
}
@@ -2217,7 +2220,7 @@ static HRESULT WINAPI mixer_control9_GetOutputRect(IVMRMixerControl9 *iface,
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, stream %u, rect %p, stub!\n", filter, stream, rect);
+ FIXME("filter %p, stream %lu, rect %p, stub!\n", filter, stream, rect);
return E_NOTIMPL;
}
@@ -2226,7 +2229,7 @@ static HRESULT WINAPI mixer_control9_SetBackgroundClr(IVMRMixerControl9 *iface,
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, color #%06x, stub!\n", filter, color);
+ FIXME("filter %p, color #%06lx, stub!\n", filter, color);
return E_NOTIMPL;
}
@@ -2244,7 +2247,7 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
- FIXME("filter %p, flags %#x, stub!\n", filter, flags);
+ FIXME("filter %p, flags %#lx, stub!\n", filter, flags);
EnterCriticalSection(&filter->renderer.filter.filter_cs);
filter->mixing_prefs = flags;
@@ -2341,7 +2344,7 @@ static HRESULT WINAPI mixer_bitmap9_SetAlphaBitmap(IVMRMixerBitmap9 *iface,
const VMR9AlphaBitmap *bitmap)
{
FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap);
- TRACE("dwFlags %#x, hdc %p, pDDS %p, rSrc %s, rDest %s, fAlpha %.8e, clrSrcKey #%06x, dwFilterMode %#x.\n",
+ TRACE("dwFlags %#lx, hdc %p, pDDS %p, rSrc %s, rDest %s, fAlpha %.8e, clrSrcKey #%06lx, dwFilterMode %#lx.\n",
bitmap->dwFlags, bitmap->hdc, bitmap->pDDS, wine_dbgstr_rect(&bitmap->rSrc),
debugstr_normalized_rect(&bitmap->rDest), bitmap->fAlpha, bitmap->clrSrcKey, bitmap->dwFilterMode);
return E_NOTIMPL;
@@ -2410,7 +2413,7 @@ static HRESULT WINAPI aspect_ratio_control9_SetAspectRatioMode(IVMRAspectRatioCo
{
struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface);
- TRACE("filter %p, mode %u.\n", filter, mode);
+ TRACE("filter %p, mode %lu.\n", filter, mode);
EnterCriticalSection(&filter->renderer.filter.filter_cs);
filter->aspect_mode = mode;
@@ -2458,7 +2461,7 @@ static HRESULT WINAPI overlay_GetPalette(IOverlay *iface, DWORD *count, PALETTEE
static HRESULT WINAPI overlay_SetPalette(IOverlay *iface, DWORD count, PALETTEENTRY *palette)
{
- FIXME("iface %p, count %u, palette %p, stub!\n", iface, count, palette);
+ FIXME("iface %p, count %lu, palette %p, stub!\n", iface, count, palette);
return E_NOTIMPL;
}
@@ -2507,7 +2510,7 @@ static HRESULT WINAPI overlay_GetVideoPosition(IOverlay *iface, RECT *source, RE
static HRESULT WINAPI overlay_Advise(IOverlay *iface, IOverlayNotify *sink, DWORD flags)
{
- FIXME("iface %p, sink %p, flags %#x, stub!\n", iface, sink, flags);
+ FIXME("iface %p, sink %p, flags %#lx, stub!\n", iface, sink, flags);
return E_NOTIMPL;
}
@@ -2623,32 +2626,30 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if
static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface)
{
- struct default_presenter *This = impl_from_IVMRImagePresenter9(iface);
- ULONG refCount = InterlockedIncrement(&This->refCount);
+ struct default_presenter *presenter = impl_from_IVMRImagePresenter9(iface);
+ ULONG refcount = InterlockedIncrement(&presenter->refCount);
- TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1);
+ TRACE("%p increasing refcount to %lu.\n", presenter, refcount);
- return refCount;
+ return refcount;
}
static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface)
{
struct default_presenter *This = impl_from_IVMRImagePresenter9(iface);
- ULONG refCount = InterlockedDecrement(&This->refCount);
+ ULONG refcount = InterlockedDecrement(&This->refCount);
- TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
+ TRACE("%p decreasing refcount to %lu.\n", This, refcount);
- if (!refCount)
+ if (!refcount)
{
DWORD i;
- TRACE("Destroying\n");
+
IDirect3D9_Release(This->d3d9_ptr);
- TRACE("Number of surfaces: %u\n", This->num_surfaces);
for (i = 0; i < This->num_surfaces; ++i)
{
IDirect3DSurface9 *surface = This->d3d9_surfaces[i];
- TRACE("Releasing surface %p\n", surface);
if (surface)
IDirect3DSurface9_Release(surface);
}
@@ -2661,7 +2662,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface)
free(This);
return 0;
}
- return refCount;
+ return refcount;
}
static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie)
@@ -2701,23 +2702,23 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
if (FAILED(hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET,
D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0)))
- ERR("Failed to clear, hr %#x.\n", hr);
+ ERR("Failed to clear, hr %#lx.\n", hr);
if (FAILED(hr = IDirect3DDevice9_BeginScene(device)))
- ERR("Failed to begin scene, hr %#x.\n", hr);
+ ERR("Failed to begin scene, hr %#lx.\n", hr);
if (FAILED(hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
{
- ERR("Failed to get backbuffer, hr %#x.\n", hr);
+ ERR("Failed to get backbuffer, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = IDirect3DDevice9_StretchRect(device, info->lpSurf, NULL, backbuffer, NULL, D3DTEXF_POINT)))
- ERR("Failed to blit image, hr %#x.\n", hr);
+ ERR("Failed to blit image, hr %#lx.\n", hr);
IDirect3DSurface9_Release(backbuffer);
if (FAILED(hr = IDirect3DDevice9_EndScene(device)))
- ERR("Failed to end scene, hr %#x.\n", hr);
+ ERR("Failed to end scene, hr %#lx.\n", hr);
if (filter->aspect_mode == VMR9ARMode_LetterBox)
{
@@ -2745,7 +2746,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
}
if (FAILED(hr = IDirect3DDevice9_Present(device, &src, &dst, NULL, NULL)))
- ERR("Failed to present, hr %#x.\n", hr);
+ ERR("Failed to present, hr %#lx.\n", hr);
return S_OK;
}
@@ -2873,7 +2874,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato
NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device);
if (FAILED(hr))
{
- ERR("Could not create device: %08x\n", hr);
+ ERR("Failed to create device, hr %#lx.\n", hr);
return hr;
}
@@ -2897,7 +2898,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato
info, numbuffers, This->d3d9_surfaces);
if (FAILED(hr))
{
- ERR("Failed to allocate surfaces, hr %#x.\n", hr);
+ ERR("Failed to allocate surfaces, hr %#lx.\n", hr);
IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie);
return hr;
}
@@ -2909,7 +2910,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato
static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie)
{
- TRACE("iface %p, cookie %#lx.\n", iface, cookie);
+ TRACE("iface %p, cookie %#Ix.\n", iface, cookie);
return S_OK;
}
diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c
index 5b172d5f108..3e19d9b582e 100644
--- a/dlls/quartz/window.c
+++ b/dlls/quartz/window.c
@@ -105,7 +105,7 @@ HRESULT video_window_create_window(struct video_window *window)
winclass.lpszClassName = class_name;
if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS)
{
- ERR("Unable to register window class: %u\n", GetLastError());
+ ERR("Failed to register class, error %lu.\n", GetLastError());
return E_FAIL;
}
@@ -151,7 +151,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT
HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IVideoWindow_tid, typeinfo);
}
@@ -161,7 +161,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@@ -178,7 +178,7 @@ HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID id, REFI
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@@ -225,7 +225,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG s
{
struct video_window *window = impl_from_IVideoWindow(iface);
- TRACE("window %p, style %#x.\n", window, style);
+ TRACE("window %p, style %#lx.\n", window, style);
if (style & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL))
return E_INVALIDARG;
@@ -250,7 +250,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyleEx(IVideoWindow *iface, LONG
{
struct video_window *window = impl_from_IVideoWindow(iface);
- TRACE("window %p, style %#x.\n", window, style);
+ TRACE("window %p, style %#lx.\n", window, style);
if (!SetWindowLongW(window->hwnd, GWL_EXSTYLE, style))
return E_FAIL;
@@ -271,7 +271,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_AutoShow(IVideoWindow *iface, LONG Auto
{
struct video_window *This = impl_from_IVideoWindow(iface);
- TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow);
+ TRACE("window %p, AutoShow %ld.\n", This, AutoShow);
This->AutoShow = AutoShow;
@@ -293,7 +293,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowState(IVideoWindow *iface, LONG s
{
struct video_window *window = impl_from_IVideoWindow(iface);
- TRACE("window %p, state %#x.\n", window, state);
+ TRACE("window %p, state %ld.\n", window, state);
ShowWindow(window->hwnd, state);
return S_OK;
@@ -323,7 +323,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_BackgroundPalette(IVideoWindow *iface,
{
struct video_window *This = impl_from_IVideoWindow(iface);
- FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, BackgroundPalette);
+ FIXME("window %p, palette %ld, stub!\n", This, BackgroundPalette);
return S_OK;
}
@@ -341,7 +341,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Visible(IVideoWindow *iface, LONG visib
{
struct video_window *window = impl_from_IVideoWindow(iface);
- TRACE("window %p, visible %d.\n", window, visible);
+ TRACE("window %p, visible %ld.\n", window, visible);
ShowWindow(window->hwnd, visible ? SW_SHOW : SW_HIDE);
return S_OK;
@@ -365,7 +365,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Left(IVideoWindow *iface, LONG left)
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
- TRACE("window %p, left %d.\n", window, left);
+ TRACE("window %p, left %ld.\n", window, left);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, left, rect.top, 0, 0,
@@ -392,7 +392,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Width(IVideoWindow *iface, LONG width)
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
- TRACE("window %p, width %d.\n", window, width);
+ TRACE("window %p, width %ld.\n", window, width);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, 0, 0, width, rect.bottom - rect.top,
@@ -419,7 +419,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Top(IVideoWindow *iface, LONG top)
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
- TRACE("window %p, top %d.\n", window, top);
+ TRACE("window %p, top %ld.\n", window, top);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, rect.left, top, 0, 0,
@@ -446,7 +446,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Height(IVideoWindow *iface, LONG height
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
- TRACE("window %p, height %d.\n", window, height);
+ TRACE("window %p, height %ld.\n", window, height);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, 0, 0, rect.right - rect.left,
@@ -473,7 +473,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND owner
struct video_window *window = impl_from_IVideoWindow(iface);
HWND hwnd = window->hwnd;
- TRACE("window %p, owner %#lx.\n", window, owner);
+ TRACE("window %p, owner %#Ix.\n", window, owner);
/* Make sure we are marked as WS_CHILD before reparenting ourselves, so that
* we do not steal focus. LEGO Island depends on this. */
@@ -503,7 +503,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_MessageDrain(IVideoWindow *iface, OAHWN
{
struct video_window *This = impl_from_IVideoWindow(iface);
- TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
+ TRACE("window %p, drain %#Ix.\n", This, Drain);
This->hwndDrain = (HWND)Drain;
@@ -534,7 +534,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_BorderColor(IVideoWindow *iface, LONG C
{
struct video_window *This = impl_from_IVideoWindow(iface);
- FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, Color);
+ TRACE("window %p, colour %#lx.\n", This, Color);
return S_OK;
}
@@ -546,9 +546,12 @@ HRESULT WINAPI BaseControlWindowImpl_get_FullScreenMode(IVideoWindow *iface, LON
return E_NOTIMPL;
}
-HRESULT WINAPI BaseControlWindowImpl_put_FullScreenMode(IVideoWindow *iface, LONG FullScreenMode)
+HRESULT WINAPI BaseControlWindowImpl_put_FullScreenMode(IVideoWindow *iface, LONG fullscreen)
{
- TRACE("(%p)->(%d)\n", iface, FullScreenMode);
+ struct video_window *window = impl_from_IVideoWindow(iface);
+
+ TRACE("window %p, fullscreen %ld.\n", window, fullscreen);
+
return E_NOTIMPL;
}
@@ -557,7 +560,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowForeground(IVideoWindow *iface, LO
struct video_window *window = impl_from_IVideoWindow(iface);
UINT flags = SWP_NOMOVE | SWP_NOSIZE;
- TRACE("window %p, focus %d.\n", window, focus);
+ TRACE("window %p, focus %ld.\n", window, focus);
if (focus != OAFALSE && focus != OATRUE)
return E_INVALIDARG;
@@ -577,7 +580,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface,
{
struct video_window *window = impl_from_IVideoWindow(iface);
- TRACE("window %p, left %d, top %d, width %d, height %d.\n", window, left, top, width, height);
+ TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height);
if (!SetWindowPos(window->hwnd, NULL, left, top, width, height, SWP_NOACTIVATE | SWP_NOZORDER))
return E_FAIL;
@@ -605,7 +608,7 @@ HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface,
{
struct video_window *window = impl_from_IVideoWindow(iface);
- TRACE("window %p, hwnd %#lx, message %#x, wparam %#lx, lparam %#lx.\n",
+ TRACE("window %p, hwnd %#Ix, message %#lx, wparam %#Ix, lparam %#Ix.\n",
window, hwnd, message, wparam, lparam);
/* That these messages are forwarded, and no others, is stated by the
@@ -661,11 +664,11 @@ HRESULT WINAPI BaseControlWindowImpl_GetRestorePosition(IVideoWindow *iface, LON
return S_OK;
}
-HRESULT WINAPI BaseControlWindowImpl_HideCursor(IVideoWindow *iface, LONG HideCursor)
+HRESULT WINAPI BaseControlWindowImpl_HideCursor(IVideoWindow *iface, LONG hide)
{
- struct video_window *This = impl_from_IVideoWindow(iface);
+ struct video_window *window = impl_from_IVideoWindow(iface);
- FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, HideCursor);
+ FIXME("window %p, hide %ld, stub!\n", window, hide);
return S_OK;
}
@@ -712,7 +715,7 @@ static HRESULT WINAPI basic_video_GetTypeInfoCount(IBasicVideo *iface, UINT *cou
static HRESULT WINAPI basic_video_GetTypeInfo(IBasicVideo *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo);
}
@@ -722,7 +725,7 @@ static HRESULT WINAPI basic_video_GetIDsOfNames(IBasicVideo *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@@ -739,7 +742,7 @@ static HRESULT WINAPI basic_video_Invoke(IBasicVideo *iface, DISPID id, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@@ -843,7 +846,7 @@ static HRESULT WINAPI basic_video_put_SourceLeft(IBasicVideo *iface, LONG left)
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, left %d.\n", window, left);
+ TRACE("window %p, left %ld.\n", window, left);
if (left < 0 || window->src.right + left - window->src.left > get_bitmap_header(window)->biWidth)
return E_INVALIDARG;
@@ -869,7 +872,7 @@ static HRESULT WINAPI basic_video_put_SourceWidth(IBasicVideo *iface, LONG width
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, width %d.\n", window, width);
+ TRACE("window %p, width %ld.\n", window, width);
if (width <= 0 || window->src.left + width > get_bitmap_header(window)->biWidth)
return E_INVALIDARG;
@@ -895,7 +898,7 @@ static HRESULT WINAPI basic_video_put_SourceTop(IBasicVideo *iface, LONG top)
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, top %d.\n", window, top);
+ TRACE("window %p, top %ld.\n", window, top);
if (top < 0 || window->src.bottom + top - window->src.top > get_bitmap_header(window)->biHeight)
return E_INVALIDARG;
@@ -921,7 +924,7 @@ static HRESULT WINAPI basic_video_put_SourceHeight(IBasicVideo *iface, LONG heig
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, height %d.\n", window, height);
+ TRACE("window %p, height %ld.\n", window, height);
if (height <= 0 || window->src.top + height > get_bitmap_header(window)->biHeight)
return E_INVALIDARG;
@@ -947,7 +950,7 @@ static HRESULT WINAPI basic_video_put_DestinationLeft(IBasicVideo *iface, LONG l
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, left %d.\n", window, left);
+ TRACE("window %p, left %ld.\n", window, left);
window->default_dst = FALSE;
OffsetRect(&window->dst, left - window->dst.left, 0);
@@ -971,7 +974,7 @@ static HRESULT WINAPI basic_video_put_DestinationWidth(IBasicVideo *iface, LONG
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, width %d.\n", window, width);
+ TRACE("window %p, width %ld.\n", window, width);
if (width <= 0)
return E_INVALIDARG;
@@ -998,7 +1001,7 @@ static HRESULT WINAPI basic_video_put_DestinationTop(IBasicVideo *iface, LONG to
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, top %d.\n", window, top);
+ TRACE("window %p, top %ld.\n", window, top);
window->default_dst = FALSE;
OffsetRect(&window->dst, 0, top - window->dst.top);
@@ -1022,7 +1025,7 @@ static HRESULT WINAPI basic_video_put_DestinationHeight(IBasicVideo *iface, LONG
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, height %d.\n", window, height);
+ TRACE("window %p, height %ld.\n", window, height);
if (height <= 0)
return E_INVALIDARG;
@@ -1051,7 +1054,7 @@ static HRESULT WINAPI basic_video_SetSourcePosition(IBasicVideo *iface,
struct video_window *window = impl_from_IBasicVideo(iface);
const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window);
- TRACE("window %p, left %d, top %d, width %d, height %d.\n", window, left, top, width, height);
+ TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height);
if (left < 0 || left + width > bitmap_header->biWidth || width <= 0)
return E_INVALIDARG;
@@ -1095,7 +1098,7 @@ static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface,
{
struct video_window *window = impl_from_IBasicVideo(iface);
- TRACE("window %p, left %d, top %d, width %d, height %d.\n", window, left, top, width, height);
+ TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height);
if (width <= 0 || height <= 0)
return E_INVALIDARG;
@@ -1153,7 +1156,7 @@ static HRESULT WINAPI basic_video_GetVideoPaletteEntries(IBasicVideo *iface,
{
struct video_window *window = impl_from_IBasicVideo(iface);
- FIXME("window %p, start %d, count %d, ret_count %p, palette %p, stub!\n",
+ FIXME("window %p, start %ld, count %ld, ret_count %p, palette %p, stub!\n",
window, start, count, ret_count, palette);
if (!ret_count || !palette)
@@ -1244,7 +1247,7 @@ static const IBasicVideoVtbl basic_video_vtbl =
void video_window_unregister_class(void)
{
if (!UnregisterClassW(class_name, NULL) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST)
- ERR("Failed to unregister class, error %u.\n", GetLastError());
+ ERR("Failed to unregister class, error %lu.\n", GetLastError());
}
void video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl,
--
2.34.1
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dswave/Makefile.in | 1 -
dlls/dswave/dmobject.c | 20 ++++++++++----------
dlls/dswave/dswave.c | 4 ++--
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index f047d3bf7df..9a08518397b 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dswave.dll
IMPORTS = dxguid uuid ole32 advapi32
diff --git a/dlls/dswave/dmobject.c b/dlls/dswave/dmobject.c
index e6a1ce906a7..b526b23d031 100644
--- a/dlls/dswave/dmobject.c
+++ b/dlls/dswave/dmobject.c
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
return;
TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
- TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
+ TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
- TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
+ TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
X(DMUS_OBJ_OBJECT);
X(DMUS_OBJ_CLASS);
X(DMUS_OBJ_NAME);
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
return "(null)";
if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
- return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
+ return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
}
static HRESULT stream_read(IStream *stream, void *data, ULONG size)
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
hr = IStream_Read(stream, data, size, &read);
if (FAILED(hr))
- TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
+ TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr);
else if (!read && read < size) {
/* All or nothing: Handle a partial read due to end of stream as an error */
- TRACE_(dmfile)("Short read: %u < %u\n", read, size);
+ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
return E_FAIL;
}
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
return hr;
if (size != elem_size) {
- WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
+ WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
debugstr_chunk(chunk), size, elem_size);
return DMUS_E_UNSUPPORTED_STREAM;
}
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
ULONG size)
{
if (chunk->size != size) {
- WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
+ WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
debugstr_fourcc(chunk->id), chunk->size,
wine_dbgstr_longlong(chunk->offset.QuadPart), size);
return E_FAIL;
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
struct chunk_entry chunk = {.parent = riff};
HRESULT hr;
- TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
+ TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
desc->dwValidData = 0;
desc->dwSize = sizeof(*desc);
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
break;
}
}
- TRACE("Found %#x\n", desc->dwValidData);
+ TRACE("Found %#lx\n", desc->dwValidData);
return hr;
}
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
return hr;
}
- TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
+ TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
reference.dwValidData);
if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c
index 349c7e2fda5..1b83d5ab053 100644
--- a/dlls/dswave/dswave.c
+++ b/dlls/dswave/dswave.c
@@ -72,7 +72,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface)
IDirectMusicWaveImpl *This = impl_from_IUnknown(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref);
+ TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@@ -82,7 +82,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)
IDirectMusicWaveImpl *This = impl_from_IUnknown(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref);
+ TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
--
2.34.1
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dswave/tests/Makefile.in | 1 -
dlls/dswave/tests/dswave.c | 71 +++++++++++++++++------------------
2 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/dlls/dswave/tests/Makefile.in b/dlls/dswave/tests/Makefile.in
index 0eb00e401f6..0745348860d 100644
--- a/dlls/dswave/tests/Makefile.in
+++ b/dlls/dswave/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = dswave.dll
IMPORTS = ole32
diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c
index 62a76f1806e..bf25de3c2ed 100644
--- a/dlls/dswave/tests/dswave.c
+++ b/dlls/dswave/tests/dswave.c
@@ -56,46 +56,46 @@ static void test_COM(void)
hr = CoCreateInstance(&CLSID_DirectSoundWave, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmo);
ok(hr == CLASS_E_NOAGGREGATION,
- "DirectSoundWave create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
+ "DirectSoundWave create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr);
ok(!dmo, "dmo = %p\n", dmo);
/* Invalid RIID */
hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicSegment8, (void**)&dmo);
- ok(hr == E_NOINTERFACE, "DirectSoundWave create failed: %08x, expected E_NOINTERFACE\n", hr);
+ ok(hr == E_NOINTERFACE, "DirectSoundWave create failed: %#lx, expected E_NOINTERFACE\n", hr);
/* Same refcount for all DirectSoundWave interfaces */
hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicObject, (void**)&dmo);
- ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectSoundWave create failed: %#lx, expected S_OK\n", hr);
refcount = IDirectMusicObject_AddRef(dmo);
- ok(refcount == 2, "refcount == %u, expected 2\n", refcount);
+ ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps);
- ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr);
refcount = IPersistStream_AddRef(ps);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
IPersistStream_Release(ps);
hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk);
- ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr);
refcount = IUnknown_AddRef(unk);
- ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
+ ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
refcount = IUnknown_Release(unk);
hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicWavePRIVATE, (void**)&unk);
- todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicWavePRIVATE failed: %08x\n", hr);
+ todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicWavePRIVATE failed: %#lx\n", hr);
if (hr == S_OK) {
refcount = IUnknown_AddRef(unk);
- ok(refcount == 6, "refcount == %u, expected 6\n", refcount);
+ ok(refcount == 6, "refcount == %lu, expected 6\n", refcount);
refcount = IUnknown_Release(unk);
}
/* Interfaces that native does not support */
hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicSegment, (void**)&unk);
- ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSegment failed: %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSegment failed: %#lx\n", hr);
hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicSegment8, (void**)&unk);
- ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSegment8 failed: %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSegment8 failed: %#lx\n", hr);
while (IDirectMusicObject_Release(dmo));
}
@@ -214,19 +214,19 @@ static void test_parsedescriptor(void)
hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicObject, (void **)&dmo);
- ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectSoundWave create failed: %#lx, expected S_OK\n", hr);
/* Nothing loaded */
hr = IDirectMusicObject_GetDescriptor(dmo, &desc);
- todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr);
- todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
+ todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %#lx, expected E_INVALIDARG\n", hr);
+ todo_wine ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData);
/* Empty RIFF stream */
stream = gen_riff_stream(empty);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
+ ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData);
IStream_Release(stream);
/* NULL pointers */
@@ -234,30 +234,29 @@ static void test_parsedescriptor(void)
/* Crashes on Windows */
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc);
- ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr);
+ ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr);
}
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL);
- ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr);
+ ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr);
/* Wrong form */
empty[1] = DMUS_FOURCC_CONTAINER_FORM;
stream = gen_riff_stream(empty);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == DMUS_E_CHUNKNOTFOUND,
- "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr);
+ ok(hr == DMUS_E_CHUNKNOTFOUND, "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr);
IStream_Release(stream);
/* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_VERSION supported */
stream = gen_riff_stream(alldesc);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION),
- "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData);
+ "Got valid data %#lx, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData);
ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n",
wine_dbgstr_guid(&desc.guidClass));
ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8,
- "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS,
+ "Got version %lu.%lu, expected 5.8\n", desc.vVersion.dwVersionMS,
desc.vVersion.dwVersionLS);
IStream_Release(stream);
@@ -266,8 +265,8 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(inam);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
+ ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData);
IStream_Release(stream);
/* INFO list with INAM */
@@ -275,8 +274,8 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(inam);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n",
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
+ ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#lx, expected DMUS_OBJ_NAME\n",
desc.dwValidData);
ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName));
@@ -286,9 +285,9 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(dupes);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION),
- "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n",
+ "Got valid data %#lx, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n",
desc.dwValidData);
ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName));
@@ -307,23 +306,23 @@ static void test_dswave(void)
hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicObject, (void**)&dmo);
- ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectSoundWave create failed: %#lx, expected S_OK\n", hr);
/* IPersistStream */
hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps);
- ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr);
hr = IPersistStream_GetClassID(ps, &class);
- ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
+ ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr);
ok(IsEqualGUID(&class, &CLSID_DirectSoundWave),
"Expected class CLSID_DirectSoundWave got %s\n", wine_dbgstr_guid(&class));
/* Unimplemented IPersistStream methods */
hr = IPersistStream_IsDirty(ps);
- ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr);
+ ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr);
hr = IPersistStream_GetSizeMax(ps, &size);
- ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr);
+ ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr);
hr = IPersistStream_Save(ps, NULL, TRUE);
- ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr);
+ ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr);
while (IDirectMusicObject_Release(dmo));
}
--
2.34.1
1
0
04 Feb '22
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmusic/collection.c | 4 ++--
dlls/dmusic/port.c | 25 ++++++++++++-------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 0f9fb54cccb..05f67d5578d 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -60,7 +60,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicColl
{
IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface);
- TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface);
+ TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
*ret_iface = NULL;
@@ -72,7 +72,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicColl
*ret_iface = &This->dmobj.IPersistStream_iface;
else
{
- WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface);
+ WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface);
return E_NOINTERFACE;
}
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index 9d58dd8924d..d593d739a9e 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -151,7 +151,7 @@ static HRESULT WINAPI synth_port_QueryInterface(IDirectMusicPort *iface, REFIID
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface);
+ TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort))
*ret_iface = &This->IDirectMusicPort_iface;
@@ -218,7 +218,7 @@ static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusi
LPBYTE data;
DWORD size;
- TRACE("(%p/%p)->(%p)\n", iface, This, buffer);
+ TRACE("(%p, %p)\n", iface, buffer);
if (!buffer)
return E_POINTER;
@@ -339,10 +339,9 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi
static HRESULT WINAPI synth_port_UnloadInstrument(IDirectMusicPort *iface,
IDirectMusicDownloadedInstrument *downloaded_instrument)
{
- struct synth_port *This = synth_from_IDirectMusicPort(iface);
IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument);
- TRACE("(%p/%p)->(%p)\n", iface, This, downloaded_instrument);
+ TRACE("(%p, %p)\n", iface, downloaded_instrument);
if (!downloaded_instrument)
return E_POINTER;
@@ -361,7 +360,7 @@ static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IRefer
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, clock);
+ TRACE("(%p, %p)\n", iface, clock);
return IDirectMusicSynth8_GetLatencyClock(This->synth, clock);
}
@@ -385,7 +384,7 @@ static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, port_caps);
+ TRACE("(%p, %p)\n", iface, port_caps);
return IDirectMusicSynth_GetPortCaps(This->synth, port_caps);
}
@@ -416,7 +415,7 @@ static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DW
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, channel_groups);
+ TRACE("(%p, %p)\n", iface, channel_groups);
*channel_groups = This->nrofgroups;
@@ -586,7 +585,7 @@ static HRESULT WINAPI synth_port_download_QueryInterface(IDirectMusicPortDownloa
{
struct synth_port *This = synth_from_IDirectMusicPortDownload(iface);
- TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface);
+ TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface);
}
@@ -595,7 +594,7 @@ static ULONG WINAPI synth_port_download_AddRef(IDirectMusicPortDownload *iface)
{
struct synth_port *This = synth_from_IDirectMusicPortDownload(iface);
- TRACE("(%p/%p)->()\n", iface, This);
+ TRACE("(%p)\n", iface);
return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface);
}
@@ -604,7 +603,7 @@ static ULONG WINAPI synth_port_download_Release(IDirectMusicPortDownload *iface)
{
struct synth_port *This = synth_from_IDirectMusicPortDownload(iface);
- TRACE("(%p/%p)->()\n", iface, This);
+ TRACE("(%p)\n", iface);
return IDirectMusicPort_Release(&This->IDirectMusicPort_iface);
}
@@ -686,7 +685,7 @@ static HRESULT WINAPI synth_port_thru_QueryInterface(IDirectMusicThru *iface, RE
{
struct synth_port *This = synth_from_IDirectMusicThru(iface);
- TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface);
+ TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface);
}
@@ -695,7 +694,7 @@ static ULONG WINAPI synth_port_thru_AddRef(IDirectMusicThru *iface)
{
struct synth_port *This = synth_from_IDirectMusicThru(iface);
- TRACE("(%p/%p)->()\n", iface, This);
+ TRACE("(%p)\n", iface);
return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface);
}
@@ -704,7 +703,7 @@ static ULONG WINAPI synth_port_thru_Release(IDirectMusicThru *iface)
{
struct synth_port *This = synth_from_IDirectMusicThru(iface);
- TRACE("(%p/%p)->()\n", iface, This);
+ TRACE("(%p)\n", iface);
return IDirectMusicPort_Release(&This->IDirectMusicPort_iface);
}
--
2.34.1
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmusic/Makefile.in | 1 -
dlls/dmusic/buffer.c | 10 ++++----
dlls/dmusic/clock.c | 6 ++---
dlls/dmusic/collection.c | 36 +++++++++++++-------------
dlls/dmusic/dmobject.c | 20 +++++++--------
dlls/dmusic/dmusic.c | 14 +++++-----
dlls/dmusic/dmusic_main.c | 12 ++++-----
dlls/dmusic/download.c | 4 +--
dlls/dmusic/instrument.c | 50 ++++++++++++++++++------------------
dlls/dmusic/port.c | 54 +++++++++++++++++++--------------------
10 files changed, 103 insertions(+), 104 deletions(-)
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index 45826765239..a8955a2ab42 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dmusic.dll
IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm
diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c
index e17bad90dc3..c328c15541e 100644
--- a/dlls/dmusic/buffer.c
+++ b/dlls/dmusic/buffer.c
@@ -56,7 +56,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface)
IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
return ref;
}
@@ -66,7 +66,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface)
IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This->data);
@@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER
DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(sizeof(channel_message));
DMUS_EVENTHEADER *header;
- TRACE("(%p)->(0x%s, %u, 0x%x)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message);
+ TRACE("(%p, 0x%s, %lu, %#lx)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message);
if (new_write_pos > This->size)
return DMUS_E_BUFFER_FULL;
@@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(IDirectMusicBuffer
DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(len);
DMUS_EVENTHEADER *header;
- TRACE("(%p, 0x%s, %d, %d, %p)\n", This, wine_dbgstr_longlong(ref_time), channel_group, len, data);
+ TRACE("(%p, 0x%s, %ld, %ld, %p)\n", This, wine_dbgstr_longlong(ref_time), channel_group, len, data);
if (new_write_pos > This->size)
return DMUS_E_BUFFER_FULL;
@@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes(LPDIRECTMUSICBUFFER if
{
IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface);
- TRACE("(%p)->(%u)\n", iface, used_bytes);
+ TRACE("(%p, %lu)\n", iface, used_bytes);
if (used_bytes > This->size)
return DMUS_E_BUFFER_FULL;
diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c
index 8a4cc9112a7..97bd05c4524 100644
--- a/dlls/dmusic/clock.c
+++ b/dlls/dmusic/clock.c
@@ -49,7 +49,7 @@ static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface)
IReferenceClockImpl *This = impl_from_IReferenceClock(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
return ref;
}
@@ -59,7 +59,7 @@ static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface)
IReferenceClockImpl *This = impl_from_IReferenceClock(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
@@ -103,7 +103,7 @@ static HRESULT WINAPI IReferenceClockImpl_Unadvise(IReferenceClock *iface, DWORD
{
IReferenceClockImpl *This = impl_from_IReferenceClock(iface);
- FIXME("(%p)->(%d): stub\n", This, dwAdviseCookie);
+ FIXME("(%p, %ld): stub\n", This, dwAdviseCookie);
return S_OK;
}
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 13d5ce868d3..0f9fb54cccb 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -85,7 +85,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *if
IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
return ref;
}
@@ -95,7 +95,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *i
IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
@@ -114,7 +114,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicColle
struct list *list_entry;
DWORD inst_patch;
- TRACE("(%p/%p)->(%u, %p)\n", iface, This, patch, instrument);
+ TRACE("(%p, %lu, %p)\n", iface, patch, instrument);
LIST_FOR_EACH(list_entry, &This->Instruments) {
inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry);
@@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl
struct list *list_entry;
DWORD length;
- TRACE("(%p/%p)->(%d, %p, %p, %d)\n", iface, This, index, patch, name, name_length);
+ TRACE("(%p, %ld, %p, %p, %ld)\n", iface, index, patch, name, name_length);
LIST_FOR_EACH(list_entry, &This->Instruments) {
inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry);
@@ -228,7 +228,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
This->pStm = stream;
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
if (chunk.fccID != FOURCC_RIFF) {
TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
@@ -253,7 +253,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do {
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
StreamCount += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
switch (chunk.fccID) {
case FOURCC_COLH: {
TRACE_(dmfile)(": collection header chunk\n");
@@ -293,7 +293,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do {
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
switch (chunk.fccID) {
case mmioFOURCC('I','N','A','M'): {
CHAR szName[DMUS_MAX_NAME];
@@ -360,7 +360,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break;
}
}
- TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+ TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]);
break;
}
@@ -378,7 +378,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do {
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
switch (chunk.fccID) {
case FOURCC_LIST: {
IStream_Read(stream, &chunk.fccID, sizeof(FOURCC), NULL);
@@ -401,7 +401,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do {
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
switch (chunk.fccID) {
case FOURCC_INSH: {
TRACE_(dmfile)(": instrument header chunk\n");
@@ -433,7 +433,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break;
}
}
- TRACE_(dmfile)(": ListCount[1] = %d < ListSize[1] = %d\n", ListCount[1], ListSize[1]);
+ TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]);
} while (ListCount[1] < ListSize[1]);
/* DEBUG: dumps whole instrument object tree: */
if (TRACE_ON(dmusic)) {
@@ -441,11 +441,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
if (!IsEqualGUID(&instrument->id, &GUID_NULL))
TRACE(" - GUID = %s\n", debugstr_dmguid(&instrument->id));
TRACE(" - Instrument header:\n");
- TRACE(" - cRegions: %d\n", instrument->header.cRegions);
+ TRACE(" - cRegions: %ld\n", instrument->header.cRegions);
TRACE(" - Locale:\n");
- TRACE(" - ulBank: %d\n", instrument->header.Locale.ulBank);
- TRACE(" - ulInstrument: %d\n", instrument->header.Locale.ulInstrument);
- TRACE(" => dwPatch: %d\n", MIDILOCALE2Patch(&instrument->header.Locale));
+ TRACE(" - ulBank: %ld\n", instrument->header.Locale.ulBank);
+ TRACE(" - ulInstrument: %ld\n", instrument->header.Locale.ulInstrument);
+ TRACE(" => dwPatch: %ld\n", MIDILOCALE2Patch(&instrument->header.Locale));
}
list_add_tail(&This->Instruments, &new_instrument->entry);
}
@@ -461,7 +461,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break;
}
}
- TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+ TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]);
break;
}
@@ -481,7 +481,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break;
}
}
- TRACE_(dmfile)(": StreamCount = %d < StreamSize = %d\n", StreamCount, StreamSize);
+ TRACE_(dmfile)(": StreamCount = %ld < StreamSize = %ld\n", StreamCount, StreamSize);
} while (StreamCount < StreamSize);
TRACE_(dmfile)(": reading finished\n");
@@ -497,7 +497,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
dump_DMUS_OBJECTDESC(&This->dmobj.desc);
TRACE(" - Collection header:\n");
- TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments);
+ TRACE(" - cInstruments: %ld\n", This->pHeader->cInstruments);
TRACE(" - Instruments:\n");
LIST_FOR_EACH(listEntry, &This->Instruments) {
diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c
index e6a1ce906a7..84b08e0d772 100644
--- a/dlls/dmusic/dmobject.c
+++ b/dlls/dmusic/dmobject.c
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
return;
TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
- TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
+ TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
- TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
+ TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
X(DMUS_OBJ_OBJECT);
X(DMUS_OBJ_CLASS);
X(DMUS_OBJ_NAME);
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
return "(null)";
if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
- return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
+ return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
}
static HRESULT stream_read(IStream *stream, void *data, ULONG size)
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
hr = IStream_Read(stream, data, size, &read);
if (FAILED(hr))
- TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
+ TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr);
else if (!read && read < size) {
/* All or nothing: Handle a partial read due to end of stream as an error */
- TRACE_(dmfile)("Short read: %u < %u\n", read, size);
+ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
return E_FAIL;
}
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
return hr;
if (size != elem_size) {
- WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
+ WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
debugstr_chunk(chunk), size, elem_size);
return DMUS_E_UNSUPPORTED_STREAM;
}
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
ULONG size)
{
if (chunk->size != size) {
- WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
+ WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
debugstr_fourcc(chunk->id), chunk->size,
wine_dbgstr_longlong(chunk->offset.QuadPart), size);
return E_FAIL;
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
struct chunk_entry chunk = {.parent = riff};
HRESULT hr;
- TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
+ TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
desc->dwValidData = 0;
desc->dwSize = sizeof(*desc);
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
break;
}
}
- TRACE("Found %#x\n", desc->dwValidData);
+ TRACE("Found %#lx\n", desc->dwValidData);
return hr;
}
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
return hr;
}
- TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
+ TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
reference.dwValidData);
if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 8dc9e788858..cb94497883e 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -62,7 +62,7 @@ static ULONG WINAPI master_IReferenceClock_AddRef(IReferenceClock *iface)
struct master_clock *This = impl_from_IReferenceClock(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %u\n", iface, ref);
+ TRACE("(%p) ref = %lu\n", iface, ref);
return ref;
}
@@ -72,7 +72,7 @@ static ULONG WINAPI master_IReferenceClock_Release(IReferenceClock *iface)
struct master_clock *This = impl_from_IReferenceClock(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %u\n", iface, ref);
+ TRACE("(%p) ref = %lu\n", iface, ref);
if (!ref)
heap_free(This);
@@ -115,7 +115,7 @@ static HRESULT WINAPI master_IReferenceClock_AdvisePeriodic(IReferenceClock *ifa
static HRESULT WINAPI master_IReferenceClock_Unadvise(IReferenceClock *iface, DWORD cookie)
{
- TRACE("(%p, %#x): method not implemented\n", iface, cookie);
+ TRACE("(%p, %#lx): method not implemented\n", iface, cookie);
return E_NOTIMPL;
}
@@ -183,7 +183,7 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface)
IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
return ref;
}
@@ -193,7 +193,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface)
IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
if (!ref) {
IReferenceClock_Release(This->master_clock);
@@ -213,7 +213,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind
{
IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface);
- TRACE("(%p, %d, %p)\n", This, index, port_caps);
+ TRACE("(%p, %ld, %p)\n", This, index, port_caps);
if (!port_caps)
return E_POINTER;
@@ -333,7 +333,7 @@ void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port)
static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info)
{
- TRACE("(%p)->(%d, %p)\n", iface, index, clock_info);
+ TRACE("(%p, %ld, %p)\n", iface, index, clock_info);
if (!clock_info)
return E_POINTER;
diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c
index 2446dc18852..6f69e48d607 100644
--- a/dlls/dmusic/dmusic_main.c
+++ b/dlls/dmusic/dmusic_main.c
@@ -222,12 +222,12 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask)
void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params)
{
TRACE("DMUS_PORTPARAMS (%p):\n", params);
- TRACE(" - dwSize = %d\n", params->dwSize);
+ TRACE(" - dwSize = %ld\n", params->dwSize);
TRACE(" - dwValidParams = %s\n", debugstr_DMUS_PORTPARAMS_FLAGS(params->dwValidParams));
- if (params->dwValidParams & DMUS_PORTPARAMS_VOICES) TRACE(" - dwVoices = %u\n", params->dwVoices);
- if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) TRACE(" - dwChannelGroup = %u\n", params->dwChannelGroups);
- if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) TRACE(" - dwAudioChannels = %u\n", params->dwAudioChannels);
- if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE) TRACE(" - dwSampleRate = %u\n", params->dwSampleRate);
- if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS) TRACE(" - dwEffectFlags = %x\n", params->dwEffectFlags);
+ if (params->dwValidParams & DMUS_PORTPARAMS_VOICES) TRACE(" - dwVoices = %lu\n", params->dwVoices);
+ if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) TRACE(" - dwChannelGroup = %lu\n", params->dwChannelGroups);
+ if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) TRACE(" - dwAudioChannels = %lu\n", params->dwAudioChannels);
+ if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE) TRACE(" - dwSampleRate = %lu\n", params->dwSampleRate);
+ if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS) TRACE(" - dwEffectFlags = %lx\n", params->dwEffectFlags);
if (params->dwValidParams & DMUS_PORTPARAMS_SHARE) TRACE(" - fShare = %u\n", params->fShare);
}
diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c
index 6ce650d780a..56ee9c7477d 100644
--- a/dlls/dmusic/download.c
+++ b/dlls/dmusic/download.c
@@ -51,7 +51,7 @@ static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface)
IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
return ref;
}
@@ -61,7 +61,7 @@ static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface
IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c
index baa4a2f5715..f90e08b9128 100644
--- a/dlls/dmusic/instrument.c
+++ b/dlls/dmusic/instrument.c
@@ -61,7 +61,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if
IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
return ref;
}
@@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i
IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
if (!ref)
{
@@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMEN
{
IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface);
- TRACE("(%p)->(%d): stub\n", This, dwPatch);
+ TRACE("(%p, %ld): stub\n", This, dwPatch);
Patch2MIDILOCALE(dwPatch, &This->header.Locale);
@@ -148,11 +148,11 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)
hr = IStream_Read(stream, data, size, &bytes_read);
if(FAILED(hr)){
- TRACE("IStream_Read failed: %08x\n", hr);
+ TRACE("IStream_Read failed: %08lx\n", hr);
return hr;
}
if (bytes_read < size) {
- TRACE("Didn't read full chunk: %u < %u\n", bytes_read, size);
+ TRACE("Didn't read full chunk: %lu < %lu\n", bytes_read, size);
return E_FAIL;
}
@@ -162,7 +162,7 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)
static inline DWORD subtract_bytes(DWORD len, DWORD bytes)
{
if(bytes > len){
- TRACE("Apparent mismatch in chunk lengths? %u bytes remaining, %u bytes read\n", len, bytes);
+ TRACE("Apparent mismatch in chunk lengths? %lu bytes remaining, %lu bytes read\n", len, bytes);
return 0;
}
return len - bytes;
@@ -177,7 +177,7 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes)
ret = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL);
if (FAILED(ret))
- WARN("IStream_Seek failed: %08x\n", ret);
+ WARN("IStream_Seek failed: %08lx\n", ret);
return ret;
}
@@ -187,7 +187,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
HRESULT ret;
DMUS_PRIVATE_CHUNK chunk;
- TRACE("(%p, %p, %p, %u)\n", This, stream, region, length);
+ TRACE("(%p, %p, %p, %lu)\n", This, stream, region, length);
while (length)
{
@@ -200,7 +200,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
switch (chunk.fccID)
{
case FOURCC_RGNH:
- TRACE("RGNH chunk (region header): %u bytes\n", chunk.dwSize);
+ TRACE("RGNH chunk (region header): %lu bytes\n", chunk.dwSize);
ret = read_from_stream(stream, ®ion->header, sizeof(region->header));
if (FAILED(ret))
@@ -210,7 +210,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
break;
case FOURCC_WSMP:
- TRACE("WSMP chunk (wave sample): %u bytes\n", chunk.dwSize);
+ TRACE("WSMP chunk (wave sample): %lu bytes\n", chunk.dwSize);
ret = read_from_stream(stream, ®ion->wave_sample, sizeof(region->wave_sample));
if (FAILED(ret))
@@ -228,7 +228,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
break;
case FOURCC_WLNK:
- TRACE("WLNK chunk (wave link): %u bytes\n", chunk.dwSize);
+ TRACE("WLNK chunk (wave link): %lu bytes\n", chunk.dwSize);
ret = read_from_stream(stream, ®ion->wave_link, sizeof(region->wave_link));
if (FAILED(ret))
@@ -238,7 +238,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
break;
default:
- TRACE("Unknown chunk %s (skipping): %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Unknown chunk %s (skipping): %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
ret = advance_stream(stream, chunk.dwSize);
if (FAILED(ret))
@@ -297,7 +297,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
ULONG i = 0;
ULONG length = This->length;
- TRACE("(%p, %p): offset = 0x%s, length = %u)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length);
+ TRACE("(%p, %p): offset = 0x%s, length = %lu)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length);
if (This->loaded)
return S_OK;
@@ -305,7 +305,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
hr = IStream_Seek(stream, This->liInstrumentPosition, STREAM_SEEK_SET, NULL);
if (FAILED(hr))
{
- WARN("IStream_Seek failed: %08x\n", hr);
+ WARN("IStream_Seek failed: %08lx\n", hr);
return DMUS_E_UNSUPPORTED_STREAM;
}
@@ -325,7 +325,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
{
case FOURCC_INSH:
case FOURCC_DLID:
- TRACE("Chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
/* Instrument header and id are already set so just skip */
hr = advance_stream(stream, chunk.dwSize);
@@ -337,7 +337,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
case FOURCC_LIST: {
DWORD size = chunk.dwSize;
- TRACE("LIST chunk: %u bytes\n", chunk.dwSize);
+ TRACE("LIST chunk: %lu bytes\n", chunk.dwSize);
hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID));
if (FAILED(hr))
@@ -348,7 +348,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
switch (chunk.fccID)
{
case FOURCC_LRGN:
- TRACE("LRGN chunk (regions list): %u bytes\n", size);
+ TRACE("LRGN chunk (regions list): %lu bytes\n", size);
while (size)
{
@@ -358,7 +358,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
if (chunk.fccID != FOURCC_LIST)
{
- TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
goto error;
}
@@ -368,12 +368,12 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
if (chunk.fccID == FOURCC_RGN)
{
- TRACE("RGN chunk (region): %u bytes\n", chunk.dwSize);
+ TRACE("RGN chunk (region): %lu bytes\n", chunk.dwSize);
hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID));
}
else
{
- TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID));
}
if (FAILED(hr))
@@ -384,7 +384,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
break;
case FOURCC_LART:
- TRACE("LART chunk (articulations list): %u bytes\n", size);
+ TRACE("LART chunk (articulations list): %lu bytes\n", size);
while (size)
{
@@ -394,12 +394,12 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
if (chunk.fccID == FOURCC_ART1)
{
- TRACE("ART1 chunk (level 1 articulation): %u bytes\n", chunk.dwSize);
+ TRACE("ART1 chunk (level 1 articulation): %lu bytes\n", chunk.dwSize);
hr = load_articulation(This, stream, chunk.dwSize);
}
else
{
- TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
hr = advance_stream(stream, chunk.dwSize);
}
if (FAILED(hr))
@@ -410,7 +410,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
break;
default:
- TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID));
if (FAILED(hr))
@@ -423,7 +423,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
}
default:
- TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
hr = advance_stream(stream, chunk.dwSize);
if (FAILED(hr))
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index afdd0d7be63..9d58dd8924d 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -90,7 +90,7 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOW
IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
return ref;
}
@@ -100,7 +100,7 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO
IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref);
+ TRACE("(%p): new ref = %lu\n", iface, ref);
if (!ref)
{
@@ -177,7 +177,7 @@ static ULONG WINAPI synth_port_AddRef(IDirectMusicPort *iface)
struct synth_port *This = synth_from_IDirectMusicPort(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
DMUSIC_LockModule();
@@ -189,7 +189,7 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface)
struct synth_port *This = synth_from_IDirectMusicPort(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
if (!ref)
{
@@ -266,7 +266,7 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi
ULONG size;
ULONG i;
- TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges);
+ TRACE("(%p, %p, %p, %p, %ld)\n", iface, instrument, downloaded_instrument, note_ranges, num_note_ranges);
if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges))
return E_POINTER;
@@ -396,7 +396,7 @@ static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- FIXME("(%p/%p)->(%d, %p, %d, %p, %d, %p, %p): stub\n", iface, This, io_control_code, in_buffer, in_buffer_size, out_buffer, out_buffer_size, bytes_returned, overlapped);
+ FIXME("(%p/%p, %ld, %p, %ld, %p, %ld, %p, %p): stub\n", iface, This, io_control_code, in_buffer, in_buffer_size, out_buffer, out_buffer_size, bytes_returned, overlapped);
return S_OK;
}
@@ -405,7 +405,7 @@ static HRESULT WINAPI synth_port_SetNumChannelGroups(IDirectMusicPort *iface, DW
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, channel_groups);
+ FIXME("(%p, %ld): semi-stub\n", iface, channel_groups);
This->nrofgroups = channel_groups;
@@ -457,11 +457,11 @@ static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWO
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- FIXME("(%p/%p)->(%d, %d, %d): semi-stub\n", iface, This, channel_group, channel, priority);
+ FIXME("(%p/%p, %ld, %ld, %ld): semi-stub\n", iface, This, channel_group, channel, priority);
if (channel > 16)
{
- WARN("isn't there supposed to be 16 channels (no. %d requested)?! (faking as it is ok)\n", channel);
+ WARN("isn't there supposed to be 16 channels (no. %ld requested)?! (faking as it is ok)\n", channel);
/*return E_INVALIDARG;*/
}
@@ -473,7 +473,7 @@ static HRESULT WINAPI synth_port_GetChannelPriority(IDirectMusicPort *iface, DWO
{
struct synth_port *This = synth_from_IDirectMusicPort(iface);
- TRACE("(%p/%p)->(%u, %u, %p)\n", iface, This, channel_group, channel, priority);
+ TRACE("(%p, %lu, %lu, %p)\n", iface, channel_group, channel, priority);
*priority = This->group[channel_group - 1].channel[channel].priority;
@@ -614,7 +614,7 @@ static HRESULT WINAPI synth_port_download_GetBuffer(IDirectMusicPortDownload *if
{
struct synth_port *This = synth_from_IDirectMusicPortDownload(iface);
- FIXME("(%p/%p)->(%u, %p): stub\n", iface, This, DLId, IDMDownload);
+ FIXME("(%p/%p, %lu, %p): stub\n", iface, This, DLId, IDMDownload);
if (!IDMDownload)
return E_POINTER;
@@ -627,7 +627,7 @@ static HRESULT WINAPI synth_port_download_AllocateBuffer(IDirectMusicPortDownloa
{
struct synth_port *This = synth_from_IDirectMusicPortDownload(iface);
- FIXME("(%p/%p)->(%u, %p): stub\n", iface, This, size, IDMDownload);
+ FIXME("(%p/%p, %lu, %p): stub\n", iface, This, size, IDMDownload);
return S_OK;
}
@@ -636,7 +636,7 @@ static HRESULT WINAPI synth_port_download_GetDLId(IDirectMusicPortDownload *ifac
{
struct synth_port *This = synth_from_IDirectMusicPortDownload(iface);
- FIXME("(%p/%p)->(%p, %u): stub\n", iface, This, start_DLId, count);
+ FIXME("(%p/%p, %p, %lu): stub\n", iface, This, start_DLId, count);
return S_OK;
}
@@ -715,7 +715,7 @@ static HRESULT WINAPI synth_port_thru_ThruChannel(IDirectMusicThru *iface, DWORD
{
struct synth_port *This = synth_from_IDirectMusicThru(iface);
- FIXME("(%p/%p)->(%d, %d, %d, %d, %p): stub\n", iface, This, source_channel_group, source_channel, destination_channel_group, destination_channel, destination_port);
+ FIXME("(%p/%p, %ld, %ld, %ld, %ld, %p): stub\n", iface, This, source_channel_group, source_channel, destination_channel_group, destination_channel, destination_port);
return S_OK;
}
@@ -754,12 +754,12 @@ static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface)
static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *prop,
ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len)
{
- TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len);
- TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags);
+ TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, prop, prop_len, data, data_len, ret_len);
+ TRACE("prop = %s - %lu - %lu\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags);
if (prop->u.s.Flags != KSPROPERTY_TYPE_GET)
{
- FIXME("prop flags %u not yet supported\n", prop->u.s.Flags);
+ FIXME("prop flags %lu not yet supported\n", prop->u.s.Flags);
return S_FALSE;
}
@@ -776,7 +776,7 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p
static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *method,
ULONG method_len, void *data, ULONG data_len, ULONG *ret_len)
{
- FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, method, method_len, data, data_len, ret_len);
+ FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, method, method_len, data, data_len, ret_len);
return E_NOTIMPL;
}
@@ -784,7 +784,7 @@ static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *metho
static HRESULT WINAPI IKsControlImpl_KsEvent(IKsControl *iface, KSEVENT *event, ULONG event_len,
void *data, ULONG data_len, ULONG *ret_len)
{
- FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, event, event_len, data, data_len, ret_len);
+ FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, event, event_len, data, data_len, ret_len);
return E_NOTIMPL;
}
@@ -917,7 +917,7 @@ static ULONG WINAPI midi_IDirectMusicPort_AddRef(IDirectMusicPort *iface)
struct midi_port *This = impl_from_IDirectMusicPort(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %u\n", iface, ref);
+ TRACE("(%p) ref = %lu\n", iface, ref);
return ref;
}
@@ -927,7 +927,7 @@ static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface)
struct midi_port *This = impl_from_IDirectMusicPort(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %u\n", iface, ref);
+ TRACE("(%p) ref = %lu\n", iface, ref);
if (!ref) {
if (This->clock)
@@ -966,7 +966,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DownloadInstrument(IDirectMusicPort
IDirectMusicInstrument *instrument, IDirectMusicDownloadedInstrument **downloaded,
DMUS_NOTERANGE *ranges, DWORD num_ranges)
{
- FIXME("(%p, %p, %p, %p, %u) stub!\n", iface, instrument, downloaded, ranges, num_ranges);
+ FIXME("(%p, %p, %p, %p, %lu) stub!\n", iface, instrument, downloaded, ranges, num_ranges);
return E_NOTIMPL;
}
@@ -1021,7 +1021,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *if
DWORD io_control_code, void *in, DWORD size_in, void *out, DWORD size_out, DWORD *ret_len,
OVERLAPPED *overlapped)
{
- FIXME("(%p, %u, %p, %u, %p, %u, %p, %p) stub!\n", iface, io_control_code, in, size_in, out
+ FIXME("(%p, %lu, %p, %lu, %p, %lu, %p, %p) stub!\n", iface, io_control_code, in, size_in, out
, size_out, ret_len, overlapped);
return E_NOTIMPL;
@@ -1030,7 +1030,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *if
static HRESULT WINAPI midi_IDirectMusicPort_SetNumChannelGroups(IDirectMusicPort *iface,
DWORD cgroups)
{
- FIXME("(%p, %u) stub!\n", iface, cgroups);
+ FIXME("(%p, %lu) stub!\n", iface, cgroups);
return E_NOTIMPL;
}
@@ -1053,7 +1053,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_Activate(IDirectMusicPort *iface, BO
static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort *iface,
DWORD channel_group, DWORD channel, DWORD priority)
{
- FIXME("(%p, %u, %u, %u) stub!\n", iface, channel_group, channel, priority);
+ FIXME("(%p, %lu, %lu, %lu) stub!\n", iface, channel_group, channel, priority);
return E_NOTIMPL;
}
@@ -1061,7 +1061,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort
static HRESULT WINAPI midi_IDirectMusicPort_GetChannelPriority(IDirectMusicPort *iface,
DWORD channel_group, DWORD channel, DWORD *priority)
{
- FIXME("(%p, %u, %u, %p) stub!\n", iface, channel_group, channel, priority);
+ FIXME("(%p, %lu, %lu, %p) stub!\n", iface, channel_group, channel, priority);
return E_NOTIMPL;
}
@@ -1135,7 +1135,7 @@ static ULONG WINAPI midi_IDirectMusicThru_Release(IDirectMusicThru *iface)
static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, DWORD src_group,
DWORD src_channel, DWORD dest_group, DWORD dest_channel, IDirectMusicPort *dest_port)
{
- FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group,
+ FIXME("(%p, %lu, %lu, %lu, %lu, %p) stub!\n", iface, src_group, src_channel, dest_group,
dest_channel, dest_port);
return S_OK;
--
2.34.1
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmsynth/Makefile.in | 1 -
dlls/dmsynth/synth.c | 68 ++++++++++++++++++++--------------------
dlls/dmsynth/synthsink.c | 14 ++++-----
3 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index 870f93d39f2..276597db5ad 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dmsynth.dll
IMPORTS = dxguid uuid ole32 advapi32
diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index f05f769761e..c69d7a340b1 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(IDirectMusicSynth8 *iface)
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
return ref;
}
@@ -81,7 +81,7 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface)
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
if (!ref) {
if (This->latency_clock)
@@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(IDirectMusicSyn
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(%d): stub\n", This, groups);
+ FIXME("(%p, %ld): stub\n", This, groups);
return S_OK;
}
@@ -142,10 +142,10 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface,
if (TRACE_ON(dmsynth))
{
TRACE("Dump DMUS_DOWNLOADINFO struct:\n");
- TRACE(" - dwDLType = %u\n", info->dwDLType);
- TRACE(" - dwDLId = %u\n", info->dwDLId);
- TRACE(" - dwNumOffsetTableEntries = %u\n", info->dwNumOffsetTableEntries);
- TRACE(" - cbSize = %u\n", info->cbSize);
+ TRACE(" - dwDLType = %lu\n", info->dwDLType);
+ TRACE(" - dwDLId = %lu\n", info->dwDLId);
+ TRACE(" - dwNumOffsetTableEntries = %lu\n", info->dwNumOffsetTableEntries);
+ TRACE(" - cbSize = %lu\n", info->cbSize);
}
/* The struct should have at least one offset corresponding to the download object itself */
@@ -176,14 +176,14 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface,
if (TRACE_ON(dmsynth))
{
TRACE("Dump DMUS_WAVE struct\n");
- TRACE(" - ulFirstExtCkIdx = %u\n", wave->ulFirstExtCkIdx);
- TRACE(" - ulCopyrightIdx = %u\n", wave->ulCopyrightIdx);
- TRACE(" - ulWaveDataIdx = %u\n", wave->ulWaveDataIdx);
+ TRACE(" - ulFirstExtCkIdx = %lu\n", wave->ulFirstExtCkIdx);
+ TRACE(" - ulCopyrightIdx = %lu\n", wave->ulCopyrightIdx);
+ TRACE(" - ulWaveDataIdx = %lu\n", wave->ulWaveDataIdx);
TRACE(" - WaveformatEx:\n");
TRACE(" - wFormatTag = %u\n", wave->WaveformatEx.wFormatTag);
TRACE(" - nChannels = %u\n", wave->WaveformatEx.nChannels);
- TRACE(" - nSamplesPerSec = %u\n", wave->WaveformatEx.nSamplesPerSec);
- TRACE(" - nAvgBytesPerSec = %u\n", wave->WaveformatEx.nAvgBytesPerSec);
+ TRACE(" - nSamplesPerSec = %lu\n", wave->WaveformatEx.nSamplesPerSec);
+ TRACE(" - nAvgBytesPerSec = %lu\n", wave->WaveformatEx.nAvgBytesPerSec);
TRACE(" - nBlockAlign = %u\n", wave->WaveformatEx.nBlockAlign);
TRACE(" - wBitsPerSample = %u\n", wave->WaveformatEx.wBitsPerSample);
TRACE(" - cbSize = %u\n", wave->WaveformatEx.cbSize);
@@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface,
}
wave_data = (DMUS_WAVEDATA*)(buffer + offsets[wave->ulWaveDataIdx]);
- TRACE("Found %u bytes of wave data\n", wave_data->cbSize);
+ TRACE("Found %lu bytes of wave data\n", wave_data->cbSize);
}
}
else if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT2)
@@ -208,12 +208,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface,
if (TRACE_ON(dmsynth))
{
TRACE("Dump DMUS_INSTRUMENT struct\n");
- TRACE(" - ulPatch = %u\n", instrument->ulPatch);
- TRACE(" - ulFirstRegionIdx = %u\n", instrument->ulFirstRegionIdx);
- TRACE(" - ulGlobalArtIdx = %u\n", instrument->ulGlobalArtIdx);
- TRACE(" - ulFirstExtCkIdx = %u\n", instrument->ulFirstExtCkIdx);
- TRACE(" - ulCopyrightIdx = %u\n", instrument->ulCopyrightIdx);
- TRACE(" - ulFlags = %u\n", instrument->ulFlags);
+ TRACE(" - ulPatch = %lu\n", instrument->ulPatch);
+ TRACE(" - ulFirstRegionIdx = %lu\n", instrument->ulFirstRegionIdx);
+ TRACE(" - ulGlobalArtIdx = %lu\n", instrument->ulGlobalArtIdx);
+ TRACE(" - ulFirstExtCkIdx = %lu\n", instrument->ulFirstExtCkIdx);
+ TRACE(" - ulCopyrightIdx = %lu\n", instrument->ulCopyrightIdx);
+ TRACE(" - ulFlags = %lu\n", instrument->ulFlags);
if (instrument->ulCopyrightIdx)
{
@@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface,
}
}
- TRACE("Number of regions = %u\n", nb_regions);
+ TRACE("Number of regions = %lu\n", nb_regions);
}
else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVEARTICULATION)
{
@@ -251,7 +251,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface,
}
else
{
- WARN("Unknown download type %u\n", info->dwDLType);
+ WARN("Unknown download type %lu\n", info->dwDLType);
return DMUS_E_UNKNOWNDOWNLOAD;
}
@@ -273,7 +273,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer(IDirectMusicSynth8 *ifac
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(0x%s, %p, %u): stub\n", This, wine_dbgstr_longlong(rt), buffer, size);
+ FIXME("(%p, 0x%s, %p, %lu): stub\n", This, wine_dbgstr_longlong(rt), buffer, size);
return S_OK;
}
@@ -397,7 +397,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Render(IDirectMusicSynth8 *iface, s
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(%p, %d, 0x%s): stub\n", This, buffer, length, wine_dbgstr_longlong(position));
+ FIXME("(%p, %p, %ld, 0x%s): stub\n", This, buffer, length, wine_dbgstr_longlong(position));
return S_OK;
}
@@ -418,7 +418,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(IDirectMusicSynt
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(%d, %d, %p): stub\n", This, channel_group, channel, priority);
+ FIXME("(%p, %ld, %ld, %p): stub\n", This, channel_group, channel, priority);
return S_OK;
}
@@ -451,7 +451,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(IDirectMusicSynth8 *iface
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(0x%s, %d, %d, %d, %d, %i, %i,0x%s, 0x%s, 0x%s): stub\n",
+ FIXME("(%p, 0x%s, %ld, %ld, %ld, %ld, %li, %li, 0x%s, 0x%s, 0x%s): stub\n",
This, wine_dbgstr_longlong(ref_time), voice_id, channel_group, channel, dwDLId, prPitch, vrVolume,
wine_dbgstr_longlong(stVoiceStart), wine_dbgstr_longlong(stLoopStart), wine_dbgstr_longlong(stLoopEnd));
@@ -463,7 +463,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice(IDirectMusicSynth8 *iface
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(0x%s, %d): stub\n", This, wine_dbgstr_longlong(ref_time), voice_id);
+ FIXME("(%p, 0x%s, %ld): stub\n", This, wine_dbgstr_longlong(ref_time), voice_id);
return S_OK;
}
@@ -473,7 +473,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState(IDirectMusicSynth8 *i
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(%p, %d, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState);
+ FIXME("(%p, %p, %ld, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState);
return S_OK;
}
@@ -483,7 +483,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh(IDirectMusicSynth8 *iface,
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(%d, %d): stub\n", This, download_id, flags);
+ FIXME("(%p, %ld, %ld): stub\n", This, download_id, flags);
return S_OK;
}
@@ -493,7 +493,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses(IDirectMusicSy
{
IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);
- FIXME("(%p)->(%d, %d, %p, %d): stub\n", This, channel_group, channel, pdwBuses, cBuses);
+ FIXME("(%p, %ld, %ld, %p, %ld): stub\n", This, channel_group, channel, pdwBuses, cBuses);
return S_OK;
}
@@ -555,13 +555,13 @@ static ULONG WINAPI DMSynthImpl_IKsControl_Release(IKsControl* iface)
static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData,
ULONG DataLength, ULONG* BytesReturned)
{
- TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
+ TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
- TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags);
+ TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags);
if (Property->u.s.Flags != KSPROPERTY_TYPE_GET)
{
- FIXME("Property flags %u not yet supported\n", Property->u.s.Flags);
+ FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags);
return S_FALSE;
}
@@ -606,7 +606,7 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR
static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData,
ULONG DataLength, ULONG* BytesReturned)
{
- FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
+ FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
return E_NOTIMPL;
}
@@ -614,7 +614,7 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETH
static HRESULT WINAPI DMSynthImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData,
ULONG DataLength, ULONG* BytesReturned)
{
- FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
+ FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
return E_NOTIMPL;
}
diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index 9d7096a032b..fe578086a23 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -66,7 +66,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(IDirectMusicSynthSink *ifac
IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
return ref;
}
@@ -76,7 +76,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa
IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", This, ref);
+ TRACE("(%p): new ref = %lu\n", This, ref);
if (!ref) {
if (This->latency_clock)
@@ -232,13 +232,13 @@ static ULONG WINAPI DMSynthSinkImpl_IKsControl_Release(IKsControl* iface)
static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData,
ULONG DataLength, ULONG* BytesReturned)
{
- TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
+ TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
- TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags);
+ TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags);
if (Property->u.s.Flags != KSPROPERTY_TYPE_GET)
{
- FIXME("Property flags %u not yet supported\n", Property->u.s.Flags);
+ FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags);
return S_FALSE;
}
@@ -263,7 +263,7 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P
static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData,
ULONG DataLength, ULONG* BytesReturned)
{
- FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
+ FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
return E_NOTIMPL;
}
@@ -271,7 +271,7 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKS
static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData,
ULONG DataLength, ULONG* BytesReturned)
{
- FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
+ FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
return E_NOTIMPL;
}
--
2.34.1
1
0
[PATCH v4 1/2] ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Jinoh Kang 04 Feb '22
by Jinoh Kang 04 Feb '22
04 Feb '22
Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>
---
Notes:
v2 -> v3: move some tests from om.c to pipe.c
v3 -> v4: fix and simplify STATUS_PENDING testing
dlls/ntdll/tests/om.c | 9 +++++
dlls/ntdll/tests/pipe.c | 90 ++++++++++++++++++++++++++++++++++++++++-
2 files changed, 98 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index f872d6709a1..04acf5b2241 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -1871,6 +1871,15 @@ static void test_query_object(void)
pNtClose( handle );
+ handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 );
+ ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+
+ test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE );
+ test_object_type( handle, L"File" );
+ test_file_info( handle );
+
+ pNtClose( handle );
+
RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" );
status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 );
ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status );
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
index 6940e0020b7..aab19ba5aa6 100644
--- a/dlls/ntdll/tests/pipe.c
+++ b/dlls/ntdll/tests/pipe.c
@@ -51,6 +51,13 @@ typedef struct {
ULONG NamedPipeEnd;
} FILE_PIPE_LOCAL_INFORMATION;
+typedef struct _FILE_PIPE_WAIT_FOR_BUFFER {
+ LARGE_INTEGER Timeout;
+ ULONG NameLength;
+ BOOLEAN TimeoutSpecified;
+ WCHAR Name[1];
+} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER;
+
#ifndef FILE_SYNCHRONOUS_IO_ALERT
#define FILE_SYNCHRONOUS_IO_ALERT 0x10
#endif
@@ -62,6 +69,10 @@ typedef struct {
#ifndef FSCTL_PIPE_LISTEN
#define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
#endif
+
+#ifndef FSCTL_PIPE_WAIT
+#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#endif
#endif
static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size);
@@ -177,6 +188,48 @@ static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb,
return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0);
}
+static NTSTATUS wait_pipe(HANDLE handle, PUNICODE_STRING name, const LARGE_INTEGER* timeout)
+{
+ HANDLE event;
+ NTSTATUS status;
+ OBJECT_ATTRIBUTES attr;
+ IO_STATUS_BLOCK iosb;
+ FILE_PIPE_WAIT_FOR_BUFFER *pipe_wait;
+ ULONG pipe_wait_size;
+
+ pipe_wait_size = offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + name->Length;
+ pipe_wait = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pipe_wait_size);
+ if (!pipe_wait) return STATUS_NO_MEMORY;
+
+ pipe_wait->TimeoutSpecified = !!timeout;
+ pipe_wait->NameLength = name->Length;
+ if (timeout) pipe_wait->Timeout = *timeout;
+ memcpy(pipe_wait->Name, name->Buffer, name->Length);
+
+ InitializeObjectAttributes(&attr, NULL, 0, 0, NULL);
+ status = NtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE);
+ if (status != STATUS_SUCCESS)
+ {
+ ok(0, "NtCreateEvent failure: %08x\n", status);
+ HeapFree(GetProcessHeap(), 0, pipe_wait);
+ return status;
+ }
+
+ memset(&iosb, 0, sizeof(iosb));
+ iosb.Status = STATUS_PENDING;
+ status = pNtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT,
+ pipe_wait, pipe_wait_size, NULL, 0);
+ if (status == STATUS_PENDING)
+ {
+ WaitForSingleObject(event, INFINITE);
+ status = iosb.Status;
+ }
+
+ NtClose(event);
+ HeapFree(GetProcessHeap(), 0, pipe_wait);
+ return status;
+}
+
static void test_create_invalid(void)
{
IO_STATUS_BLOCK iosb;
@@ -2420,6 +2473,7 @@ static void test_security_info(void)
static void test_empty_name(void)
{
+ static const LARGE_INTEGER zero_timeout = {{ 0 }};
HANDLE hdirectory, hpipe, hpipe2, hwrite, hwrite2, handle;
OBJECT_TYPE_INFORMATION *type_info;
OBJECT_NAME_INFORMATION *name_info;
@@ -2450,6 +2504,10 @@ static void test_empty_name(void)
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
ok(!status, "Got unexpected status %#x.\n", status);
+ pRtlInitUnicodeString(&name, L"nonexistent_pipe");
+ status = wait_pipe(hdirectory, &name, &zero_timeout);
+ todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %08x\n", status);
+
name.Buffer = NULL;
name.Length = 0;
name.MaximumLength = 0;
@@ -2462,6 +2520,17 @@ static void test_empty_name(void)
todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status);
if (!status)
CloseHandle(hpipe);
+
+ pRtlInitUnicodeString(&name, L"test3\\pipe");
+ attr.RootDirectory = hdirectory;
+ attr.ObjectName = &name;
+ timeout.QuadPart = -(LONG64)10000000;
+ status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE,
+ FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout);
+ ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %08x\n", status);
+ if (!status)
+ CloseHandle(hpipe);
+
CloseHandle(hdirectory);
pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\");
@@ -2475,6 +2544,10 @@ static void test_empty_name(void)
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
ok(!status, "Got unexpected status %#x.\n", status);
+ pRtlInitUnicodeString(&name, L"nonexistent_pipe");
+ status = wait_pipe(hdirectory, &name, &zero_timeout);
+ ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %08x\n", status);
+
name.Buffer = NULL;
name.Length = 0;
name.MaximumLength = 0;
@@ -2565,9 +2638,24 @@ static void test_empty_name(void)
CloseHandle(hwrite);
CloseHandle(hpipe);
- CloseHandle(hdirectory);
CloseHandle(hpipe2);
CloseHandle(hwrite2);
+
+ pRtlInitUnicodeString(&name, L"test3\\pipe");
+ attr.RootDirectory = hdirectory;
+ attr.ObjectName = &name;
+ timeout.QuadPart = -(LONG64)10000000;
+ status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE,
+ FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout);
+ todo_wine ok(!status, "unexpected failure from NtCreateNamedPipeFile: %08x\n", status);
+
+ handle = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, 0, 0 );
+ todo_wine ok(handle != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError());
+
+ CloseHandle(handle);
+ CloseHandle(hpipe);
+ CloseHandle(hdirectory);
}
START_TEST(pipe)
--
2.34.1
1
1
04 Feb '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/mf/tests/mf.c | 132 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index ebf42bcad9c..03d0250d51a 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -5492,9 +5492,103 @@ static IMFSample *create_sample(const BYTE *data, ULONG size)
return sample;
}
+#define check_sample(a, b, c) check_sample_(__LINE__, a, b, c)
+static void check_sample_(int line, IMFSample *sample, const void *expect_buf, ULONG expect_len)
+{
+ IMFMediaBuffer *media_buffer;
+ DWORD length;
+ BYTE *buffer;
+ HRESULT hr;
+ ULONG ret;
+
+ hr = IMFSample_ConvertToContiguousBuffer(sample, &media_buffer);
+ ok_(__FILE__, line)(hr == S_OK, "ConvertToContiguousBuffer returned %#x\n", hr);
+ hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length);
+ ok_(__FILE__, line)(hr == S_OK, "Lock returned %#x\n", hr);
+ ok_(__FILE__, line)(expect_len == length, "got length %u\n", length);
+ if (length && length == expect_len)
+ {
+ ok_(__FILE__, line)(!memcmp(expect_buf, buffer, expect_len),
+ "unexpected buffer data\n");
+ }
+ hr = IMFMediaBuffer_Unlock(media_buffer);
+ ok_(__FILE__, line)(hr == S_OK, "Unlock returned %#x\n", hr);
+ ret = IMFMediaBuffer_Release(media_buffer);
+ ok_(__FILE__, line)(ret == 1, "Release returned %u\n", ret);
+}
+
static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0};
static const BYTE wma_decoded_data[0x4000] = {0};
static const ULONG wma_block_size = 1487;
+static const BYTE wma_encoded_data[][1487] =
+{
+ {0x09,0x00,0x00,0x77,0xe9,0x48,0x0c,0x84,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x18,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x28,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x38,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x48,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x58,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x68,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x78,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x88,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x98,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xa8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xb8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xc8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xd8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xe8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xf8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x08,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x18,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x28,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x38,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x48,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x58,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x68,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x78,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x88,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x98,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xa8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xb8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xc8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xd8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xe8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43,
+ 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0xf8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x03,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+};
static void test_wma_encoder(void)
{
@@ -5552,10 +5646,12 @@ static void test_wma_encoder(void)
MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float};
MFT_OUTPUT_STREAM_INFO output_info;
MFT_INPUT_STREAM_INFO input_info;
+ MFT_OUTPUT_DATA_BUFFER output;
IMFMediaType *media_type;
IMFTransform *transform;
IMFSample *sample;
GUID class_id;
+ DWORD status;
ULONG i, ret;
HRESULT hr;
@@ -5612,6 +5708,42 @@ static void test_wma_encoder(void)
hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr);
+ status = 0xdeadbeef;
+ sample = create_sample(NULL, output_info.cbSize);
+ memset(&output, 0, sizeof(output));
+ output.pSample = sample;
+
+ i = 0;
+ while (SUCCEEDED(hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status)))
+ {
+ winetest_push_context("%u", i);
+ ok(hr == S_OK, "ProcessOutput returned %#x\n", hr);
+ ok(output.pSample == sample, "got pSample %p\n", output.pSample);
+ ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_INCOMPLETE ||
+ broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|5)) /* win7 */,
+ "got dwStatus %#x\n", output.dwStatus);
+ ok(status == 0, "got status %#x\n", status);
+ check_sample(sample, wma_encoded_data + i, wma_block_size);
+ winetest_pop_context();
+ i++;
+ }
+
+ ret = IMFSample_Release(sample);
+ ok(ret == 0, "Release returned %u\n", ret);
+
+ status = 0xdeadbeef;
+ sample = create_sample(NULL, output_info.cbSize);
+ memset(&output, 0, sizeof(output));
+ output.pSample = sample;
+ hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status);
+ ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr);
+ ok(output.pSample == sample, "got pSample %p\n", output.pSample);
+ ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus);
+ ok(status == 0, "got status %#x\n", status);
+ check_sample(sample, NULL, 0);
+ ret = IMFSample_Release(sample);
+ ok(ret == 0, "Release returned %u\n", ret);
+
ret = IMFTransform_Release(transform);
ok(ret == 0, "Release returned %u\n", ret);
--
2.34.1
2
5
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
---
dlls/diasymreader/Makefile.in | 2 +-
dlls/diasymreader/writer.c | 64 +++++++++++++++++++++++++++++++++--
2 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in
index e9d6fee09e8..34e1286a496 100644
--- a/dlls/diasymreader/Makefile.in
+++ b/dlls/diasymreader/Makefile.in
@@ -1,5 +1,5 @@
MODULE = diasymreader.dll
-IMPORTS = uuid
+IMPORTS = uuid rpcrt4
EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c
index 7970fbaca9a..638c3adec51 100644
--- a/dlls/diasymreader/writer.c
+++ b/dlls/diasymreader/writer.c
@@ -23,7 +23,9 @@
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
+#include "rpc.h"
+#include "wine/mscvpdb.h"
#include "wine/debug.h"
#include "wine/heap.h"
@@ -34,6 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(diasymreader);
typedef struct SymWriter {
ISymUnmanagedWriter5 iface;
LONG ref;
+ CRITICAL_SECTION lock;
+ GUID pdb_guid;
+ DWORD pdb_age;
+ WCHAR pdb_filename[MAX_PATH];
} SymWriter;
static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface)
@@ -87,6 +93,8 @@ static ULONG WINAPI SymWriter_Release(ISymUnmanagedWriter5 *iface)
if (ref == 0)
{
+ This->lock.DebugInfo->Spare[0] = 0;
+ DeleteCriticalSection(&This->lock);
heap_free(This);
}
@@ -213,15 +221,62 @@ static HRESULT WINAPI SymWriter_SetMethodSourceRange(ISymUnmanagedWriter5 *iface
static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *filename,
IStream *pIStream, BOOL fFullBuild)
{
+ SymWriter *This = impl_from_ISymUnmanagedWriter5(iface);
+
FIXME("(%p,%p,%s,%p,%u)\n", iface, emitter, debugstr_w(filename), pIStream, fFullBuild);
+
+ EnterCriticalSection(&This->lock);
+
+ if (filename)
+ wcsncpy_s(This->pdb_filename, MAX_PATH, filename, _TRUNCATE);
+
+ LeaveCriticalSection(&This->lock);
+
return S_OK;
}
static HRESULT WINAPI SymWriter_GetDebugInfo(ISymUnmanagedWriter5 *iface, IMAGE_DEBUG_DIRECTORY *pIDD, DWORD cData,
DWORD *pcData, BYTE data[])
{
- FIXME("(%p,%p,%lu,%p,%p)\n", iface, pIDD, cData, pcData, data);
- return E_NOTIMPL;
+ SymWriter *This = impl_from_ISymUnmanagedWriter5(iface);
+ DWORD name_length, data_size;
+ OMFSignatureRSDS *rsds_data = (OMFSignatureRSDS*)data;
+
+ TRACE("(%p,%p,%lu,%p,%p)\n", iface, pIDD, cData, pcData, data);
+
+ EnterCriticalSection(&This->lock);
+
+ name_length = WideCharToMultiByte(CP_UTF8, 0, This->pdb_filename, -1, NULL, 0, NULL, NULL);
+ data_size = FIELD_OFFSET(OMFSignatureRSDS, name) + name_length;
+ if (pcData)
+ *pcData = data_size;
+
+ if (pIDD)
+ {
+ pIDD->Characteristics = 0;
+ pIDD->MajorVersion = 0;
+ pIDD->MinorVersion = 0;
+ pIDD->Type = IMAGE_DEBUG_TYPE_CODEVIEW;
+ pIDD->SizeOfData = data_size;
+ }
+
+ if (data)
+ {
+ if (data_size > cData)
+ {
+ LeaveCriticalSection(&This->lock);
+ return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ }
+
+ memcpy(rsds_data->Signature, "RSDS", 4);
+ rsds_data->guid = This->pdb_guid;
+ rsds_data->age = This->pdb_age;
+ WideCharToMultiByte(CP_UTF8, 0, This->pdb_filename, -1, rsds_data->name, name_length, NULL, NULL);
+ }
+
+ LeaveCriticalSection(&This->lock);
+
+ return S_OK;
}
static HRESULT WINAPI SymWriter_DefineSequencePoints(ISymUnmanagedWriter5 *iface, ISymUnmanagedDocumentWriter *document,
@@ -367,6 +422,11 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv)
This->iface.lpVtbl = &SymWriter_Vtbl;
This->ref = 1;
+ InitializeCriticalSection(&This->lock);
+ This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SymWriter.lock");
+ UuidCreate(&This->pdb_guid);
+ This->pdb_age = 1;
+ This->pdb_filename[0] = 0;
hr = IUnknown_QueryInterface(&This->iface, iid, ppv);
--
2.30.2
1
4