- wine-devel - winehq.org

[PATCH v2 5/5] comctl32: LVM_INSERTITEM handler should send notifications with uChanged = LVIF_STATE.
by Dmitry Timoshkov 11 Feb '22

11 Feb '22

According to the tests uChanged in the notification for a new item has only LVIF_STATE flag set. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 8 +++++++- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 137ca7c6529..e65d86f1ccc 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4257,7 +4257,13 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; } - nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; + /* According to the tests uChanged in the notification for a new item + * has only LVIF_STATE flag set. + */ + if (isNew) + nmlv.uChanged = LVIF_STATE; + else + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; /* Send LVN_ITEMCHANGING notification: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4521158d141..2dc77a78b75 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6017,7 +6017,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, FALSE); } else { @@ -6094,7 +6094,7 @@ static void test_insertitem(void) item.lParam = 0xdeadbeef; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 3, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE); /* insert item 4 */ item.mask = LVIF_PARAM; -- 2.34.1

1 0

[PATCH v2 3/5] comctl32/tests: Add more LVM_INSERTITEM tests.
by Dmitry Timoshkov 11 Feb '22

11 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 176 ++++++++++++++++++++++++++++++--- 1 file changed, 163 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index bc89e8938be..a53fec81c90 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -413,15 +413,6 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; -static const struct message parent_insert_focused_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, - { 0 } -}; - static const struct message parent_report_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, @@ -5920,6 +5911,130 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static const struct message parent_insert_focused0_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_focused1_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_item_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_selected_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +#define LVIS_ALL (LVIS_FOCUSED | LVIS_SELECTED | LVIS_CUT | LVIS_DROPHILITED | LVIS_ACTIVATING) + +static void test_LVM_INSERTITEM(void) +{ + static const struct + { + UINT mask, state, stateMask; + } insert_item[] = + { + { LVIF_STATE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE, LVIS_FOCUSED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED }, + + { LVIF_STATE, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE, LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_SELECTED }, + + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED | LVIS_SELECTED }, + + { LVIF_STATE, LVIS_ALL, LVIS_ALL }, + { LVIF_STATE, LVIS_ALL, 0 }, + { LVIF_STATE, 0, LVIS_ALL }, + + { LVIF_STATE | LVIF_PARAM, 0, 0 }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_SELECTED }, + + { LVIF_STATE, 0, 0 }, + { LVIF_PARAM, 0, 0 }, + + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, 0 }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_ALL, LVIS_ALL }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_ALL, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_ALL }, + }; + LVITEMA item; + UINT state; + HWND hwnd; + INT ret, i; + char buf[256]; + + for (i = 0; i < ARRAYSIZE(insert_item); i++) + { + hwnd = create_listview_control(LVS_REPORT); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.mask = insert_item[i].mask; + item.state = insert_item[i].state; + item.stateMask = insert_item[i].stateMask; + item.pszText = (LPSTR)"Hello World!"; + item.iImage = I_IMAGECALLBACK; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "%d: got %d\n", i, ret); + + if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) + { + sprintf(buf, "%d: insert focused", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + } + else + { + sprintf(buf, "%d: insert item", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, buf, FALSE); + } + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_ALL); + if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) + ok(state == insert_item[i].state, "%d: expected %#x, got %#x\n", i, insert_item[i].state, state); + else + ok(state == 0, "%d: expected 0, got %#x\n", i, state); + + DestroyWindow(hwnd); + } +} + static void test_insertitem(void) { LVITEMA item; @@ -5929,6 +6044,8 @@ static void test_insertitem(void) hwnd = create_listview_control(LVS_REPORT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* insert item 0 focused */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5937,12 +6054,11 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); - flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* insert item 1, focus shift */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5951,8 +6067,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -5965,10 +6080,44 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 2, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert focused 2", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + /* insert item 3 */ + item.mask = LVIF_STATE | LVIF_PARAM; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + item.iItem = 3; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 3, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + + /* insert item 4 */ + item.mask = LVIF_PARAM; + item.state = 0; + item.stateMask = 0; + item.iItem = 4; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 4, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert param", FALSE); + + /* insert item 5 */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = 0; + item.iItem = 5; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 5, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert state", FALSE); + DestroyWindow(hwnd); } @@ -6718,6 +6867,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_LVM_INSERTITEM(); test_header_proc(); test_oneclickactivate(); test_callback_mask(); -- 2.34.1

1 0

[PATCH v2 2/5] comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context.
by Dmitry Timoshkov 11 Feb '22

11 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5485cd4b4e2..bc89e8938be 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */ -- 2.34.1

1 0

[PATCH] mfplat/buffer: Avoid two copies when locking a D3D9 buffer if possible.
by Giovanni Mascellani 11 Feb '22

11 Feb '22

Running CHRONO TRIGGER with this commit saves at least 3 ms per frame in the sample copier on my computer. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..e20961169f8 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -57,6 +57,7 @@ struct buffer int pitch; unsigned int locks; p_copy_image_func copy_image; + BOOL copy; } _2d; struct { @@ -380,17 +381,28 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { D3DLOCKED_RECT rect; - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) - hr = E_OUTOFMEMORY; + hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); if (SUCCEEDED(hr)) { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); - if (SUCCEEDED(hr)) + if (rect.Pitch == buffer->_2d.width) { - copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, - buffer->_2d.width, buffer->_2d.height); - IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); + buffer->_2d.linear_buffer = rect.pBits; + buffer->_2d.copy = FALSE; + } + else + { + if ((buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + { + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, + buffer->_2d.width, buffer->_2d.height); + IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); + buffer->_2d.copy = TRUE; + } + else + { + hr = E_OUTOFMEMORY; + } } } } @@ -425,14 +437,22 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) { D3DLOCKED_RECT rect; - if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) + if (buffer->_2d.copy) + { + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) + { + copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + buffer->_2d.width, buffer->_2d.height); + IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); + } + + free(buffer->_2d.linear_buffer); + } + else { - copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, - buffer->_2d.width, buffer->_2d.height); IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } - free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; } -- 2.34.1

2 3

[PATCH 01/23] dlls/iccvid: enable compilation with long types
by Eric Pouech 11 Feb '22

11 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/iccvid/Makefile.in | 1 - dlls/iccvid/iccvid.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 835935c1162..77254521fae 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = iccvid.dll IMPORTS = user32 diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 67967a0fb38..4dc418c590b 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -743,8 +743,8 @@ static void ICCVID_dump_BITMAPINFO(const BITMAPINFO * bmi) TRACE( "planes = %d\n" "bpp = %d\n" - "height = %d\n" - "width = %d\n" + "height = %ld\n" + "width = %ld\n" "compr = %s\n", bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount, @@ -759,7 +759,7 @@ static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLOR COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue); COLORREF realGreenMask = MAKECOLOUR32(bmiColors[2].rgbRed, bmiColors[2].rgbGreen, bmiColors[2].rgbBlue); - TRACE("\nbmiColors[0] = 0x%08x\nbmiColors[1] = 0x%08x\nbmiColors[2] = 0x%08x\n", + TRACE("\nbmiColors[0] = 0x%08lx\nbmiColors[1] = 0x%08lx\nbmiColors[2] = 0x%08lx\n", realRedMask, realBlueMask, realGreenMask); if ((realRedMask == redMask) && @@ -888,7 +888,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si LONG width, height; BOOL inverted; - TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); + TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; @@ -913,7 +913,7 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR LONG width, height; BOOL inverted; - TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); + TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; @@ -979,7 +979,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, { ICCVID_Info *info = (ICCVID_Info *) dwDriverId; - TRACE("%ld %p %d %ld %ld\n", dwDriverId, hdrvr, msg, lParam1, lParam2); + TRACE("%Id %p %d %Id %Id\n", dwDriverId, hdrvr, msg, lParam1, lParam2); switch( msg ) { @@ -1043,14 +1043,14 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, return ICERR_UNSUPPORTED; default: - FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); + FIXME("Unknown message: %04x %Id %Id\n", msg, lParam1, lParam2); } return ICERR_UNSUPPORTED; } BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved); + TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved); switch (dwReason) {

2 24

[PATCH v2] mscms: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 11 Feb '22

11 Feb '22

v2: Rebase. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 4 +- dlls/mscms/profile.c | 38 ++-- dlls/mscms/stub.c | 30 +-- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 372 +++++++++++++++++------------------ dlls/mscms/transform.c | 25 ++- 7 files changed, 232 insertions(+), 239 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index f28f90327f4..d57cc54e3c6 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32 diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 1ea2eaef832..8c7e7c9e498 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -37,9 +37,9 @@ static void lcms_error_handler(cmsContext ctx, cmsUInt32Number error, const char TRACE("%u %s\n", error, debugstr_a(text)); } -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); + TRACE( "(%p, %lu, %p)\n", hinst, reason, reserved ); switch (reason) { diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 83bfcb50143..2c20b857a81 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -328,7 +328,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, BOOL ret; struct profile *profile = grab_profile( handle ); - TRACE( "( %p, 0x%08x, %d, %p, %p, %p )\n", handle, type, offset, size, buffer, ref ); + TRACE( "( %p, %#lx, %lu, %p, %p, %p )\n", handle, type, offset, size, buffer, ref ); if (!profile) return FALSE; @@ -366,7 +366,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty struct profile *profile = grab_profile( handle ); struct tag_entry tag; - TRACE( "( %p, %d, %p )\n", handle, index, type ); + TRACE( "( %p, %lu, %p )\n", handle, index, type ); if (!profile) return FALSE; @@ -507,7 +507,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile BOOL ret = FALSE; DWORD sizeW; - TRACE( "( 0x%08x, %p, %p )\n", id, profile, size ); + TRACE( "( %#lx, %p, %p )\n", id, profile, size ); if (machine) { @@ -567,7 +567,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi WCHAR rgbprofile[MAX_PATH]; DWORD len = sizeof(rgbprofile); - TRACE( "( 0x%08x, %p, %p )\n", id, profile, size ); + TRACE( "( %#lx, %p, %p )\n", id, profile, size ); if (machine) { @@ -663,15 +663,15 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_MEDIATYPE) { - FIXME( "ET_MEDIATYPE: 0x%08x\n", rec->dwMediaType ); + FIXME( "ET_MEDIATYPE: %#lx\n", rec->dwMediaType ); } if (rec->dwFields & ET_DITHERMODE) { - FIXME( "ET_DITHERMODE: 0x%08x\n", rec->dwDitheringMode ); + FIXME( "ET_DITHERMODE: %#lx\n", rec->dwDitheringMode ); } if (rec->dwFields & ET_RESOLUTION) { - FIXME( "ET_RESOLUTION: 0x%08x, 0x%08x\n", + FIXME( "ET_RESOLUTION: %#lx, %#lx\n", rec->dwResolution[0], rec->dwResolution[1] ); } if (rec->dwFields & ET_DEVICECLASS) @@ -710,7 +710,7 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_PROFILEFLAGS) { - TRACE( "ET_PROFILEFLAGS: 0x%08x\n", rec->dwProfileFlags ); + TRACE( "ET_PROFILEFLAGS: %#lx\n", rec->dwProfileFlags ); if (rec->dwProfileFlags != hdr->phProfileFlags) return FALSE; } if (rec->dwFields & ET_MANUFACTURER) @@ -725,14 +725,14 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_ATTRIBUTES) { - TRACE( "ET_ATTRIBUTES: 0x%08x, 0x%08x\n", + TRACE( "ET_ATTRIBUTES: %#lx, %#lx\n", rec->dwAttributes[0], rec->dwAttributes[1] ); if (rec->dwAttributes[0] != hdr->phAttributes[0] || rec->dwAttributes[1] != hdr->phAttributes[1]) return FALSE; } if (rec->dwFields & ET_RENDERINGINTENT) { - TRACE( "ET_RENDERINGINTENT: 0x%08x\n", rec->dwRenderingIntent ); + TRACE( "ET_RENDERINGINTENT: %#lx\n", rec->dwRenderingIntent ); if (rec->dwRenderingIntent != hdr->phRenderingIntent) return FALSE; } if (rec->dwFields & ET_CREATOR) @@ -1095,7 +1095,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese struct profile *profile = grab_profile( handle ); struct tag_entry tag; - TRACE( "( %p, 0x%08x, %p )\n", handle, type, present ); + TRACE( "( %p, %#lx, %p )\n", handle, type, present ); if (!profile) return FALSE; @@ -1164,7 +1164,7 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, BOOL ret; struct profile *profile = grab_profile( handle ); - TRACE( "( %p, 0x%08x, %d, %p, %p )\n", handle, type, offset, size, buffer ); + TRACE( "( %p, %#lx, %lu, %p, %p )\n", handle, type, offset, size, buffer ); if (!profile) return FALSE; @@ -1286,7 +1286,7 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing HPROFILE handle = NULL; PROFILE profileW; - TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); + TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; @@ -1331,7 +1331,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing HANDLE handle = INVALID_HANDLE_VALUE; DWORD size; - TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); + TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; @@ -1381,7 +1381,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing } if (handle == INVALID_HANDLE_VALUE) { - WARN( "Unable to open color profile %u\n", GetLastError() ); + WARN( "Unable to open color profile %lu\n", GetLastError() ); return NULL; } if ((size = GetFileSize( handle, NULL )) == INVALID_FILE_SIZE) @@ -1413,7 +1413,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing } else { - ERR( "Invalid profile type %u\n", profile->dwType ); + ERR( "Invalid profile type %lu\n", profile->dwType ); return NULL; } @@ -1476,7 +1476,7 @@ BOOL WINAPI WcsGetDefaultColorProfileSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, P COLORPROFILETYPE type, COLORPROFILESUBTYPE subtype, DWORD profile_id, PDWORD profile_size) { - FIXME( "%d %s %d %d %d %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); + FIXME( "%d, %s, %d, %d, %lu, %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1500,7 +1500,7 @@ HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp PROFILE cdmW, campW = {0}, gmmpW = {0}; HPROFILE ret = NULL; - TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags ); if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL; if (camp && !profile_AtoW( camp, &campW )) goto done; @@ -1521,7 +1521,7 @@ done: HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, DWORD creation, DWORD flags ) { - TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags ); FIXME("no support for WCS profiles\n" ); return OpenColorProfileW( cdm, access, sharing, creation ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 28c08e20868..6ac777a86f7 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -35,7 +35,7 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma DWORD height, DWORD stride, PBYTE result, PBMCALLBACKFN callback, LPARAM data ) { - FIXME( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, %p, 0x%08lx ) stub\n", + FIXME( "( %p, %p, %#x, %#lx, %#lx, %#lx, %p, %p, %#Ix ) stub\n", transform, srcbits, format, width, height, stride, result, callback, data ); return FALSE; @@ -44,21 +44,21 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma BOOL WINAPI CheckColors( HTRANSFORM transform, PCOLOR colors, DWORD number, COLORTYPE type, PBYTE result ) { - FIXME( "( %p, %p, 0x%08x, 0x%08x, %p ) stub\n", transform, colors, number, type, result ); + FIXME( "( %p, %p, %#lx, %#x, %p ) stub\n", transform, colors, number, type, result ); return FALSE; } BOOL WINAPI ConvertColorNameToIndex( HPROFILE profile, PCOLOR_NAME name, PDWORD index, DWORD count ) { - FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, name, index, count ); + FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, name, index, count ); return FALSE; } BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME name, DWORD count ) { - FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, index, name, count ); + FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, index, name, count ); return FALSE; } @@ -66,7 +66,7 @@ BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME BOOL WINAPI CreateDeviceLinkProfile( PHPROFILE profiles, DWORD nprofiles, PDWORD intents, DWORD nintents, DWORD flags, PBYTE *data, DWORD index ) { - FIXME( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x ) stub\n", + FIXME( "( %p, %#lx, %p, %#lx, %#lx, %p, %#lx ) stub\n", profiles, nprofiles, intents, nintents, flags, data, index ); return FALSE; @@ -90,7 +90,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize, LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags ) { - FIXME( "( %s, %s, %p, 0x%08x, %p, %p, %p, %p, 0x%08x ) stub\n", + FIXME( "( %s, %s, %p, %#lx, %p, %p, %p, %p, %#lx ) stub\n", debugstr_w(printer), debugstr_w(directory), clientinfo, level, sourcedir, sourcedirsize, targetdir, targetdirsize, flags ); return ERROR_SUCCESS; @@ -98,7 +98,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c DWORD WINAPI GetCMMInfo( HTRANSFORM transform, DWORD info ) { - FIXME( "( %p, 0x%08x ) stub\n", transform, info ); + FIXME( "( %p, %#lx ) stub\n", transform, info ); return 0; } @@ -113,14 +113,14 @@ BOOL WINAPI GetNamedProfileInfo( HPROFILE profile, PNAMED_PROFILE_INFO info ) BOOL WINAPI GetPS2ColorRenderingDictionary( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size, PBOOL binary ) { - FIXME( "( %p, 0x%08x, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary ); + FIXME( "( %p, %#lx, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary ); return FALSE; } BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size ) { - FIXME( "( %p, 0x%08x, %p, %p ) stub\n", profile, intent, buffer, size ); + FIXME( "( %p, %#lx, %p, %p ) stub\n", profile, intent, buffer, size ); return FALSE; } @@ -128,7 +128,7 @@ BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE bu BOOL WINAPI GetPS2ColorSpaceArray( HPROFILE profile, DWORD intent, DWORD type, PBYTE buffer, PDWORD size, PBOOL binary ) { - FIXME( "( %p, 0x%08x, 0x%08x, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary ); + FIXME( "( %p, %#lx, %#lx, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary ); return FALSE; } @@ -156,33 +156,33 @@ BOOL WINAPI SelectCMM( DWORD id ) BOOL WINAPI SetColorProfileElementReference( HPROFILE profile, TAGTYPE type, TAGTYPE ref ) { - FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, ref ); + FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, ref ); return TRUE; } BOOL WINAPI SetColorProfileElementSize( HPROFILE profile, TAGTYPE type, DWORD size ) { - FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, size ); + FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, size ); return FALSE; } BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile ) { - FIXME( "( 0x%08x, %p ) stub\n", id, profile ); + FIXME( "( %#lx, %p ) stub\n", id, profile ); return TRUE; } BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile ) { - FIXME( "( 0x%08x, %p ) stub\n", id, profile ); + FIXME( "( %#lx, %p ) stub\n", id, profile ); return TRUE; } BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event ) { - FIXME( "( %s, %s, 0x%08x ) stub\n", debugstr_w(printer), debugstr_w(key), event ); + FIXME( "( %s, %s, %#lx ) stub\n", debugstr_w(printer), debugstr_w(key), event ); return TRUE; } diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index e9ff9724e2f..2d229c049ab 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscms.dll IMPORTS = advapi32 diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index be4eaa66c00..e0bfbd70e10 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -161,29 +161,25 @@ static void test_GetColorDirectoryA(void) /* Parameter checks */ ret = pGetColorDirectoryA( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); } static void test_GetColorDirectoryW(void) @@ -195,33 +191,27 @@ static void test_GetColorDirectoryW(void) /* Parameter checks */ /* This one crashes win2k - ret = pGetColorDirectoryW( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); - + ok( !ret, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); */ size = 0; - ret = pGetColorDirectoryW( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); } static void test_GetColorProfileElement( char *standardprofile ) @@ -241,15 +231,15 @@ static void test_GetColorProfileElement( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); size = 0; ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); @@ -260,7 +250,7 @@ static void test_GetColorProfileElement( char *standardprofile ) size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); @@ -283,27 +273,26 @@ static void test_GetColorProfileElementTag( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElementTag( NULL, index, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 0, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, index, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 18, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; - ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", - GetLastError() ); + ok( ret && tag == expect, "GetColorProfileElementTag() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -325,40 +314,40 @@ static void test_GetColorProfileFromHandle( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ size = 0; ret = pGetColorProfileFromHandle( handle, NULL, &size ); - ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, size ); if (buffer) { ret = pGetColorProfileFromHandle( NULL, buffer, &size ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileFromHandle( handle, buffer, NULL ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetColorProfileFromHandle( handle, buffer, &size ); - ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); header = (PROFILEHEADER *)buffer; - ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); - ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); - ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); - ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); - ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); - ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); - ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); - ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); - ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); + ok( header->phClass == 0x72746e6d, "wrong phClass %lx\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %lx\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %lx\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %lx\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %lx\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %lx\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %lx\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %lx\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %lx\n", header->phIlluminant.ciexyzZ ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -381,36 +370,36 @@ static void test_GetColorProfileHeader( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileHeader( NULL, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( NULL, &header ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); if (0) /* Crashes on Vista */ { ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); } /* Functional checks */ ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - - ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); - ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); - ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); - ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); - ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); - ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); - ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); - ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); - ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); + + ok( header.phClass == 0x6d6e7472, "wrong phClass %#lx\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %#lx\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %#lx\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %#lx\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %#lx\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %#lx\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %#lx\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -430,23 +419,21 @@ static void test_GetCountColorProfileElements( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetCountColorProfileElements( NULL, &count ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); ret = pGetCountColorProfileElements( handle, NULL ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); ok( ret && count > 15 && count < 20, - "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); + "GetCountColorProfileElements() failed (%lu) %lu\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -466,28 +453,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -495,30 +486,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); @@ -527,14 +520,14 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) skip("Not enough rights for SetStandardColorSpaceProfileA\n"); return; } - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); } static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) @@ -552,19 +545,21 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ @@ -572,12 +567,13 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ @@ -586,7 +582,7 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); /* Several invalid parameter checks: */ @@ -594,11 +590,12 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ @@ -607,24 +604,25 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); } /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); @@ -633,14 +631,14 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) skip("Not enough rights for SetStandardColorSpaceProfileW\n"); return; } - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); } static void test_EnumColorProfilesA( char *standardprofile ) @@ -663,7 +661,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total ); size = total; @@ -678,7 +676,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); @@ -689,7 +687,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -714,7 +712,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); size = total; @@ -729,7 +727,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -740,7 +738,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -752,18 +750,18 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Parameter checks */ ret = pInstallColorProfileA( NULL, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( machine, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( NULL, machine ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); if (standardprofile) { ret = pInstallColorProfileA( NULL, standardprofile ); - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -781,10 +779,10 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -793,11 +791,11 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Check if the profile is really there */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } } @@ -808,18 +806,18 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Parameter checks */ ret = pInstallColorProfileW( NULL, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( machineW, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( NULL, machineW ); - ok( !ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); if (standardprofileW) { ret = pInstallColorProfileW( NULL, standardprofileW ); - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -837,10 +835,10 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -849,11 +847,11 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Check if the profile is really there */ handle = CreateFileW( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); } } @@ -871,27 +869,27 @@ static void test_IsColorProfileTagPresent( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ tag = 0; ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); tag = 0x63707274; /* 'cprt' */ ret = pIsColorProfileTagPresent( NULL, tag, &present ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); ret = pIsColorProfileTagPresent( handle, tag, NULL ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( ret && present, "IsColorProfileTagPresent() failed (%d)\n", GetLastError() ); + ok( ret && present, "IsColorProfileTagPresent() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -910,16 +908,16 @@ static void test_OpenColorProfileA( char *standardprofile ) /* Parameter checks */ handle = pOpenColorProfileA( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -929,31 +927,31 @@ static void test_OpenColorProfileA( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -970,16 +968,16 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) /* Parameter checks */ handle = pOpenColorProfileW( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -989,21 +987,21 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) profile.cbDataSize = lstrlenW(standardprofileW) * sizeof(WCHAR); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -1027,41 +1025,41 @@ static void test_SetColorProfileElement( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( NULL, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(data); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( ret, "SetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "SetColorProfileElement() failed %lu\n", GetLastError() ); size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( data, buffer, sizeof(data) ), - "Unexpected tag data, expected %s, got %s (%u)\n", data, buffer, GetLastError() ); + "Unexpected tag data, expected %s, got %s (%lu)\n", data, buffer, GetLastError() ); pCloseColorProfile( handle ); } @@ -1105,32 +1103,32 @@ static void test_SetColorProfileHeader( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pSetColorProfileHeader( handle, &header ); - ok( ret, "SetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "SetColorProfileHeader() failed (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); @@ -1145,10 +1143,10 @@ static void test_UninstallColorProfileA( char *testprofile ) /* Parameter checks */ ret = pUninstallColorProfileA( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( machine, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1165,10 +1163,10 @@ static void test_UninstallColorProfileA( char *testprofile ) skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -1176,11 +1174,11 @@ static void test_UninstallColorProfileA( char *testprofile ) lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); /* Check if the profile is really gone */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1192,10 +1190,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) /* Parameter checks */ ret = pUninstallColorProfileW( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileW( machineW, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1214,10 +1212,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -1225,13 +1223,13 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); ok( bytes_copied > 0 , "WideCharToMultiByte() returns %d\n", bytes_copied); /* Check if the profile is really gone */ handle = CreateFileA( destA, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1258,56 +1256,56 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pInstallColorProfileA( NULL, testprofile ); - ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, profile, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, basename ); lstrcatA( profile, "\\" ); lstrcatA( profile, basename ); ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + ok( ret, "AssociateColorProfileWithDevice() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } else skip("Unable to obtain monitor name\n"); @@ -1343,17 +1341,17 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp profile.cbDataSize = strlen(standardprofile); handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[0] != NULL, "got %u\n", GetLastError() ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[1] != NULL, "got %u\n", GetLastError() ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); - ok( transform != NULL, "got %u\n", GetLastError() ); + ok( transform != NULL, "got %lu\n", GetLastError() ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); @@ -1390,7 +1388,7 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); - ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", ret, GetLastError()); ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 8296341f7b7..0d48e217d66 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -48,13 +48,13 @@ static DWORD from_bmformat( BMFORMAT format ) default: if (!quietfixme) { - FIXME( "unhandled bitmap format %08x\n", format ); + FIXME( "unhandled bitmap format %#x\n", format ); quietfixme = TRUE; } ret = TYPE_RGB_8; break; } - TRACE( "color space: %08x -> %08x\n", format, ret ); + TRACE( "color space: %#x -> %#lx\n", format, ret ); return ret; } @@ -76,7 +76,7 @@ static DWORD from_type( COLORTYPE type ) break; } - TRACE( "color type: %08x -> %08x\n", type, ret ); + TRACE( "color type: %#x -> %#lx\n", type, ret ); return ret; } @@ -85,13 +85,12 @@ static DWORD from_type( COLORTYPE type ) * * See CreateColorTransformW. */ -HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, - HPROFILE target, DWORD flags ) +HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, HPROFILE target, DWORD flags ) { LOGCOLORSPACEW spaceW; DWORD len; - TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); + TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags ); if (!space || !dest) return FALSE; @@ -119,8 +118,7 @@ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, * Success: Handle to a transform. * Failure: NULL */ -HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, - HPROFILE target, DWORD flags ) +HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, HPROFILE target, DWORD flags ) { HTRANSFORM ret = NULL; cmsHTRANSFORM transform; @@ -129,7 +127,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmsHPROFILE input; int intent; - TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); + TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags ); if (!space || !(dst = grab_profile( dest ))) return FALSE; @@ -140,7 +138,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, } intent = space->lcsIntent > 3 ? INTENT_PERCEPTUAL : space->lcsIntent; - TRACE( "lcsIntent: %x\n", space->lcsIntent ); + TRACE( "lcsIntent: %#lx\n", space->lcsIntent ); TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); @@ -186,8 +184,7 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil cmsHTRANSFORM transform; struct profile *profile0, *profile1; - TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", - profiles, nprofiles, intents, nintents, flags, cmm ); + TRACE( "( %p, %#lx, %p, %lu, %#lx, %#lx )\n", profiles, nprofiles, intents, nintents, flags, cmm ); if (!profiles || !nprofiles || !intents) return NULL; @@ -265,7 +262,7 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu BOOL ret; cmsHTRANSFORM transform = grab_transform( handle ); - TRACE( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x )\n", + TRACE( "( %p, %p, %#x, %lu, %lu, %lu, %p, %#x, %lu, %p, %#lx )\n", handle, srcbits, input, width, height, inputstride, destbits, output, outputstride, callback, data ); @@ -300,7 +297,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, unsigned int i; cmsHTRANSFORM transform = grab_transform( handle ); - TRACE( "( %p, %p, %d, %d, %p, %d )\n", handle, in, count, input_type, out, output_type ); + TRACE( "( %p, %p, %lu, %d, %p, %d )\n", handle, in, count, input_type, out, output_type ); if (!transform) return FALSE; -- 2.30.2

1 0

[PATCH 2/2] mscms: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 11 Feb '22

11 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 4 +- dlls/mscms/profile.c | 38 ++-- dlls/mscms/stub.c | 30 +-- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 373 +++++++++++++++++------------------ dlls/mscms/transform.c | 25 ++- 7 files changed, 232 insertions(+), 240 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index f28f90327f4..d57cc54e3c6 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32 diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 1ea2eaef832..8c7e7c9e498 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -37,9 +37,9 @@ static void lcms_error_handler(cmsContext ctx, cmsUInt32Number error, const char TRACE("%u %s\n", error, debugstr_a(text)); } -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); + TRACE( "(%p, %lu, %p)\n", hinst, reason, reserved ); switch (reason) { diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 5bc5df0712d..b6c2b5cb797 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -327,7 +327,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, BOOL ret; struct profile *profile = grab_profile( handle ); - TRACE( "( %p, 0x%08x, %d, %p, %p, %p )\n", handle, type, offset, size, buffer, ref ); + TRACE( "( %p, %#lx, %lu, %p, %p, %p )\n", handle, type, offset, size, buffer, ref ); if (!profile) return FALSE; @@ -365,7 +365,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty struct profile *profile = grab_profile( handle ); struct tag_entry tag; - TRACE( "( %p, %d, %p )\n", handle, index, type ); + TRACE( "( %p, %lu, %p )\n", handle, index, type ); if (!profile) return FALSE; @@ -506,7 +506,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile BOOL ret = FALSE; DWORD sizeW; - TRACE( "( 0x%08x, %p, %p )\n", id, profile, size ); + TRACE( "( %#lx, %p, %p )\n", id, profile, size ); if (machine) { @@ -565,7 +565,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi WCHAR rgbprofile[MAX_PATH]; DWORD len = sizeof(rgbprofile); - TRACE( "( 0x%08x, %p, %p )\n", id, profile, size ); + TRACE( "( %#lx, %p, %p )\n", id, profile, size ); if (machine) { @@ -661,15 +661,15 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_MEDIATYPE) { - FIXME( "ET_MEDIATYPE: 0x%08x\n", rec->dwMediaType ); + FIXME( "ET_MEDIATYPE: %#lx\n", rec->dwMediaType ); } if (rec->dwFields & ET_DITHERMODE) { - FIXME( "ET_DITHERMODE: 0x%08x\n", rec->dwDitheringMode ); + FIXME( "ET_DITHERMODE: %#lx\n", rec->dwDitheringMode ); } if (rec->dwFields & ET_RESOLUTION) { - FIXME( "ET_RESOLUTION: 0x%08x, 0x%08x\n", + FIXME( "ET_RESOLUTION: %#lx, %#lx\n", rec->dwResolution[0], rec->dwResolution[1] ); } if (rec->dwFields & ET_DEVICECLASS) @@ -708,7 +708,7 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_PROFILEFLAGS) { - TRACE( "ET_PROFILEFLAGS: 0x%08x\n", rec->dwProfileFlags ); + TRACE( "ET_PROFILEFLAGS: %#lx\n", rec->dwProfileFlags ); if (rec->dwProfileFlags != hdr->phProfileFlags) return FALSE; } if (rec->dwFields & ET_MANUFACTURER) @@ -723,14 +723,14 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_ATTRIBUTES) { - TRACE( "ET_ATTRIBUTES: 0x%08x, 0x%08x\n", + TRACE( "ET_ATTRIBUTES: %#lx, %#lx\n", rec->dwAttributes[0], rec->dwAttributes[1] ); if (rec->dwAttributes[0] != hdr->phAttributes[0] || rec->dwAttributes[1] != hdr->phAttributes[1]) return FALSE; } if (rec->dwFields & ET_RENDERINGINTENT) { - TRACE( "ET_RENDERINGINTENT: 0x%08x\n", rec->dwRenderingIntent ); + TRACE( "ET_RENDERINGINTENT: %#lx\n", rec->dwRenderingIntent ); if (rec->dwRenderingIntent != hdr->phRenderingIntent) return FALSE; } if (rec->dwFields & ET_CREATOR) @@ -1084,7 +1084,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese struct profile *profile = grab_profile( handle ); struct tag_entry tag; - TRACE( "( %p, 0x%08x, %p )\n", handle, type, present ); + TRACE( "( %p, %#lx, %p )\n", handle, type, present ); if (!profile) return FALSE; @@ -1153,7 +1153,7 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, BOOL ret; struct profile *profile = grab_profile( handle ); - TRACE( "( %p, 0x%08x, %d, %p, %p )\n", handle, type, offset, size, buffer ); + TRACE( "( %p, %#lx, %lu, %p, %p )\n", handle, type, offset, size, buffer ); if (!profile) return FALSE; @@ -1271,7 +1271,7 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing HPROFILE handle = NULL; PROFILE profileW; - TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); + TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; @@ -1316,7 +1316,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing HANDLE handle = INVALID_HANDLE_VALUE; DWORD size; - TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); + TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; @@ -1366,7 +1366,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing } if (handle == INVALID_HANDLE_VALUE) { - WARN( "Unable to open color profile %u\n", GetLastError() ); + WARN( "Unable to open color profile %lu\n", GetLastError() ); return NULL; } if ((size = GetFileSize( handle, NULL )) == INVALID_FILE_SIZE) @@ -1398,7 +1398,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing } else { - ERR( "Invalid profile type %u\n", profile->dwType ); + ERR( "Invalid profile type %lu\n", profile->dwType ); return NULL; } @@ -1461,7 +1461,7 @@ BOOL WINAPI WcsGetDefaultColorProfileSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, P COLORPROFILETYPE type, COLORPROFILESUBTYPE subtype, DWORD profile_id, PDWORD profile_size) { - FIXME( "%d %s %d %d %d %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); + FIXME( "%d, %s, %d, %d, %lu, %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1485,7 +1485,7 @@ HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp PROFILE cdmW, campW = {0}, gmmpW = {0}; HPROFILE ret = NULL; - TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags ); if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL; if (camp && !profile_AtoW( camp, &campW )) goto done; @@ -1506,7 +1506,7 @@ done: HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, DWORD creation, DWORD flags ) { - TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags ); FIXME("no support for WCS profiles\n" ); return OpenColorProfileW( cdm, access, sharing, creation ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 28c08e20868..6ac777a86f7 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -35,7 +35,7 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma DWORD height, DWORD stride, PBYTE result, PBMCALLBACKFN callback, LPARAM data ) { - FIXME( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, %p, 0x%08lx ) stub\n", + FIXME( "( %p, %p, %#x, %#lx, %#lx, %#lx, %p, %p, %#Ix ) stub\n", transform, srcbits, format, width, height, stride, result, callback, data ); return FALSE; @@ -44,21 +44,21 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma BOOL WINAPI CheckColors( HTRANSFORM transform, PCOLOR colors, DWORD number, COLORTYPE type, PBYTE result ) { - FIXME( "( %p, %p, 0x%08x, 0x%08x, %p ) stub\n", transform, colors, number, type, result ); + FIXME( "( %p, %p, %#lx, %#x, %p ) stub\n", transform, colors, number, type, result ); return FALSE; } BOOL WINAPI ConvertColorNameToIndex( HPROFILE profile, PCOLOR_NAME name, PDWORD index, DWORD count ) { - FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, name, index, count ); + FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, name, index, count ); return FALSE; } BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME name, DWORD count ) { - FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, index, name, count ); + FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, index, name, count ); return FALSE; } @@ -66,7 +66,7 @@ BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME BOOL WINAPI CreateDeviceLinkProfile( PHPROFILE profiles, DWORD nprofiles, PDWORD intents, DWORD nintents, DWORD flags, PBYTE *data, DWORD index ) { - FIXME( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x ) stub\n", + FIXME( "( %p, %#lx, %p, %#lx, %#lx, %p, %#lx ) stub\n", profiles, nprofiles, intents, nintents, flags, data, index ); return FALSE; @@ -90,7 +90,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize, LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags ) { - FIXME( "( %s, %s, %p, 0x%08x, %p, %p, %p, %p, 0x%08x ) stub\n", + FIXME( "( %s, %s, %p, %#lx, %p, %p, %p, %p, %#lx ) stub\n", debugstr_w(printer), debugstr_w(directory), clientinfo, level, sourcedir, sourcedirsize, targetdir, targetdirsize, flags ); return ERROR_SUCCESS; @@ -98,7 +98,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c DWORD WINAPI GetCMMInfo( HTRANSFORM transform, DWORD info ) { - FIXME( "( %p, 0x%08x ) stub\n", transform, info ); + FIXME( "( %p, %#lx ) stub\n", transform, info ); return 0; } @@ -113,14 +113,14 @@ BOOL WINAPI GetNamedProfileInfo( HPROFILE profile, PNAMED_PROFILE_INFO info ) BOOL WINAPI GetPS2ColorRenderingDictionary( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size, PBOOL binary ) { - FIXME( "( %p, 0x%08x, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary ); + FIXME( "( %p, %#lx, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary ); return FALSE; } BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size ) { - FIXME( "( %p, 0x%08x, %p, %p ) stub\n", profile, intent, buffer, size ); + FIXME( "( %p, %#lx, %p, %p ) stub\n", profile, intent, buffer, size ); return FALSE; } @@ -128,7 +128,7 @@ BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE bu BOOL WINAPI GetPS2ColorSpaceArray( HPROFILE profile, DWORD intent, DWORD type, PBYTE buffer, PDWORD size, PBOOL binary ) { - FIXME( "( %p, 0x%08x, 0x%08x, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary ); + FIXME( "( %p, %#lx, %#lx, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary ); return FALSE; } @@ -156,33 +156,33 @@ BOOL WINAPI SelectCMM( DWORD id ) BOOL WINAPI SetColorProfileElementReference( HPROFILE profile, TAGTYPE type, TAGTYPE ref ) { - FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, ref ); + FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, ref ); return TRUE; } BOOL WINAPI SetColorProfileElementSize( HPROFILE profile, TAGTYPE type, DWORD size ) { - FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, size ); + FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, size ); return FALSE; } BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile ) { - FIXME( "( 0x%08x, %p ) stub\n", id, profile ); + FIXME( "( %#lx, %p ) stub\n", id, profile ); return TRUE; } BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile ) { - FIXME( "( 0x%08x, %p ) stub\n", id, profile ); + FIXME( "( %#lx, %p ) stub\n", id, profile ); return TRUE; } BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event ) { - FIXME( "( %s, %s, 0x%08x ) stub\n", debugstr_w(printer), debugstr_w(key), event ); + FIXME( "( %s, %s, %#lx ) stub\n", debugstr_w(printer), debugstr_w(key), event ); return TRUE; } diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index e9ff9724e2f..2d229c049ab 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscms.dll IMPORTS = advapi32 diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 7083b56f11d..a3082500fe7 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -161,29 +161,25 @@ static void test_GetColorDirectoryA(void) /* Parameter checks */ ret = pGetColorDirectoryA( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); } static void test_GetColorDirectoryW(void) @@ -195,33 +191,27 @@ static void test_GetColorDirectoryW(void) /* Parameter checks */ /* This one crashes win2k - ret = pGetColorDirectoryW( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); - + ok( !ret, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); */ size = 0; - ret = pGetColorDirectoryW( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); } static void test_GetColorProfileElement( char *standardprofile ) @@ -241,15 +231,15 @@ static void test_GetColorProfileElement( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); size = 0; ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); @@ -260,7 +250,7 @@ static void test_GetColorProfileElement( char *standardprofile ) size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); @@ -283,27 +273,26 @@ static void test_GetColorProfileElementTag( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElementTag( NULL, index, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 0, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, index, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 18, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; - ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", - GetLastError() ); + ok( ret && tag == expect, "GetColorProfileElementTag() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -325,38 +314,37 @@ static void test_GetColorProfileFromHandle( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ size = 0; - ret = pGetColorProfileFromHandle( handle, NULL, &size ); - ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); if ((buffer = malloc( size ))) { ret = pGetColorProfileFromHandle( NULL, buffer, &size ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileFromHandle( handle, buffer, NULL ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetColorProfileFromHandle( handle, buffer, &size ); - ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); header = (PROFILEHEADER *)buffer; - ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); - ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); - ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); - ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); - ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); - ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); - ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); - ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); - ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); + ok( header->phClass == 0x72746e6d, "wrong phClass %#lx\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %#lx\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %#lx\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %#lx\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %#lx\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %#lx\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %#lx\n", header->phIlluminant.ciexyzZ ); free( buffer ); } @@ -378,36 +366,36 @@ static void test_GetColorProfileHeader( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileHeader( NULL, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( NULL, &header ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); if (0) /* Crashes on Vista */ { ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); } /* Functional checks */ ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - - ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); - ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); - ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); - ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); - ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); - ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); - ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); - ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); - ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); + + ok( header.phClass == 0x6d6e7472, "wrong phClass %#lx\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %#lx\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %#lx\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %#lx\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %#lx\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %#lx\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %#lx\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -427,23 +415,21 @@ static void test_GetCountColorProfileElements( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetCountColorProfileElements( NULL, &count ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); ret = pGetCountColorProfileElements( handle, NULL ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); ok( ret && count > 15 && count < 20, - "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); + "GetCountColorProfileElements() failed (%lu) %lu\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -463,28 +449,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -492,30 +482,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); @@ -524,14 +516,14 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) skip("Not enough rights for SetStandardColorSpaceProfileA\n"); return; } - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); } static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) @@ -549,19 +541,21 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ @@ -569,12 +563,13 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ @@ -583,7 +578,7 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); /* Several invalid parameter checks: */ @@ -591,11 +586,12 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ @@ -604,24 +600,25 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); } /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); @@ -630,14 +627,14 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) skip("Not enough rights for SetStandardColorSpaceProfileW\n"); return; } - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); } static void test_EnumColorProfilesA( char *standardprofile ) @@ -660,7 +657,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = malloc( total ); size = total; @@ -675,7 +672,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); @@ -686,7 +683,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); free( buffer ); } @@ -711,7 +708,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = malloc( total * sizeof(WCHAR) ); size = total; @@ -726,7 +723,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -737,7 +734,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); free( buffer ); } @@ -749,18 +746,18 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Parameter checks */ ret = pInstallColorProfileA( NULL, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( machine, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( NULL, machine ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); if (standardprofile) { ret = pInstallColorProfileA( NULL, standardprofile ); - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -778,10 +775,10 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -790,11 +787,11 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Check if the profile is really there */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } } @@ -805,18 +802,18 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Parameter checks */ ret = pInstallColorProfileW( NULL, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( machineW, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( NULL, machineW ); - ok( !ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); if (standardprofileW) { ret = pInstallColorProfileW( NULL, standardprofileW ); - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -834,10 +831,10 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -846,11 +843,11 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Check if the profile is really there */ handle = CreateFileW( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); } } @@ -868,27 +865,27 @@ static void test_IsColorProfileTagPresent( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ tag = 0; ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); tag = 0x63707274; /* 'cprt' */ ret = pIsColorProfileTagPresent( NULL, tag, &present ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); ret = pIsColorProfileTagPresent( handle, tag, NULL ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( ret && present, "IsColorProfileTagPresent() failed (%d)\n", GetLastError() ); + ok( ret && present, "IsColorProfileTagPresent() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -907,16 +904,16 @@ static void test_OpenColorProfileA( char *standardprofile ) /* Parameter checks */ handle = pOpenColorProfileA( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -926,31 +923,31 @@ static void test_OpenColorProfileA( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -967,16 +964,16 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) /* Parameter checks */ handle = pOpenColorProfileW( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -986,21 +983,21 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) profile.cbDataSize = lstrlenW(standardprofileW) * sizeof(WCHAR); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -1024,41 +1021,41 @@ static void test_SetColorProfileElement( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( NULL, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(data); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( ret, "SetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "SetColorProfileElement() failed %lu\n", GetLastError() ); size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( data, buffer, sizeof(data) ), - "Unexpected tag data, expected %s, got %s (%u)\n", data, buffer, GetLastError() ); + "Unexpected tag data, expected %s, got %s (%lu)\n", data, buffer, GetLastError() ); pCloseColorProfile( handle ); } @@ -1102,32 +1099,32 @@ static void test_SetColorProfileHeader( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pSetColorProfileHeader( handle, &header ); - ok( ret, "SetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "SetColorProfileHeader() failed (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); @@ -1142,10 +1139,10 @@ static void test_UninstallColorProfileA( char *testprofile ) /* Parameter checks */ ret = pUninstallColorProfileA( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( machine, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1162,10 +1159,10 @@ static void test_UninstallColorProfileA( char *testprofile ) skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -1173,11 +1170,11 @@ static void test_UninstallColorProfileA( char *testprofile ) lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); /* Check if the profile is really gone */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1189,10 +1186,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) /* Parameter checks */ ret = pUninstallColorProfileW( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileW( machineW, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1211,10 +1208,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -1222,13 +1219,13 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); ok( bytes_copied > 0 , "WideCharToMultiByte() returns %d\n", bytes_copied); /* Check if the profile is really gone */ handle = CreateFileA( destA, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1255,56 +1252,56 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pInstallColorProfileA( NULL, testprofile ); - ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, profile, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, basename ); lstrcatA( profile, "\\" ); lstrcatA( profile, basename ); ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + ok( ret, "AssociateColorProfileWithDevice() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } else skip("Unable to obtain monitor name\n"); @@ -1340,17 +1337,17 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp profile.cbDataSize = strlen(standardprofile); handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[0] != NULL, "got %u\n", GetLastError() ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[1] != NULL, "got %u\n", GetLastError() ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); - ok( transform != NULL, "got %u\n", GetLastError() ); + ok( transform != NULL, "got %lu\n", GetLastError() ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); @@ -1387,7 +1384,7 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); - ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", ret, GetLastError()); ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 8296341f7b7..0d48e217d66 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -48,13 +48,13 @@ static DWORD from_bmformat( BMFORMAT format ) default: if (!quietfixme) { - FIXME( "unhandled bitmap format %08x\n", format ); + FIXME( "unhandled bitmap format %#x\n", format ); quietfixme = TRUE; } ret = TYPE_RGB_8; break; } - TRACE( "color space: %08x -> %08x\n", format, ret ); + TRACE( "color space: %#x -> %#lx\n", format, ret ); return ret; } @@ -76,7 +76,7 @@ static DWORD from_type( COLORTYPE type ) break; } - TRACE( "color type: %08x -> %08x\n", type, ret ); + TRACE( "color type: %#x -> %#lx\n", type, ret ); return ret; } @@ -85,13 +85,12 @@ static DWORD from_type( COLORTYPE type ) * * See CreateColorTransformW. */ -HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, - HPROFILE target, DWORD flags ) +HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, HPROFILE target, DWORD flags ) { LOGCOLORSPACEW spaceW; DWORD len; - TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); + TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags ); if (!space || !dest) return FALSE; @@ -119,8 +118,7 @@ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, * Success: Handle to a transform. * Failure: NULL */ -HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, - HPROFILE target, DWORD flags ) +HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, HPROFILE target, DWORD flags ) { HTRANSFORM ret = NULL; cmsHTRANSFORM transform; @@ -129,7 +127,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmsHPROFILE input; int intent; - TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); + TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags ); if (!space || !(dst = grab_profile( dest ))) return FALSE; @@ -140,7 +138,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, } intent = space->lcsIntent > 3 ? INTENT_PERCEPTUAL : space->lcsIntent; - TRACE( "lcsIntent: %x\n", space->lcsIntent ); + TRACE( "lcsIntent: %#lx\n", space->lcsIntent ); TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); @@ -186,8 +184,7 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil cmsHTRANSFORM transform; struct profile *profile0, *profile1; - TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", - profiles, nprofiles, intents, nintents, flags, cmm ); + TRACE( "( %p, %#lx, %p, %lu, %#lx, %#lx )\n", profiles, nprofiles, intents, nintents, flags, cmm ); if (!profiles || !nprofiles || !intents) return NULL; @@ -265,7 +262,7 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu BOOL ret; cmsHTRANSFORM transform = grab_transform( handle ); - TRACE( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x )\n", + TRACE( "( %p, %p, %#x, %lu, %lu, %lu, %p, %#x, %lu, %p, %#lx )\n", handle, srcbits, input, width, height, inputstride, destbits, output, outputstride, callback, data ); @@ -300,7 +297,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, unsigned int i; cmsHTRANSFORM transform = grab_transform( handle ); - TRACE( "( %p, %p, %d, %d, %p, %d )\n", handle, in, count, input_type, out, output_type ); + TRACE( "( %p, %p, %lu, %d, %p, %d )\n", handle, in, count, input_type, out, output_type ); if (!transform) return FALSE; -- 2.30.2

2 1

[PATCH 1/2] msv1_0: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 11 Feb '22

11 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msv1_0/Makefile.in | 1 - dlls/msv1_0/main.c | 50 ++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index 8367caede9c..439d74d7bb9 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msv1_0.dll UNIXLIB = msv1_0.so IMPORTS = netapi32 advapi32 diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 32783f2f6cf..77dcfa3b67d 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -111,7 +111,7 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC LSA_STRING *str; char *ptr; - TRACE( "%08x, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), + TRACE( "%#lx, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), package_name ); if (ntlm_check_version()) @@ -135,7 +135,7 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC static NTSTATUS NTAPI ntlm_SpInitialize( ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table ) { - TRACE( "%lu, %p, %p\n", package_id, params, lsa_function_table ); + TRACE( "%#Ix, %p, %p\n", package_id, params, lsa_function_table ); if (ntlm_check_version()) { @@ -192,7 +192,7 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal WCHAR *domain = NULL, *user = NULL, *password = NULL; SEC_WINNT_AUTH_IDENTITY_W *id = NULL; - TRACE( "%s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, + TRACE( "%s, %#lx, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, get_key_fn, get_key_arg, cred, expiry ); switch (cred_use & ~SECPKG_CRED_RESERVED) @@ -298,7 +298,7 @@ static NTSTATUS NTAPI ntlm_SpFreeCredentialsHandle( LSA_SEC_HANDLE handle ) { struct ntlm_cred *cred = (struct ntlm_cred *)handle; - TRACE( "%lx\n", handle ); + TRACE( "%#Ix\n", handle ); if (!cred) return SEC_E_OK; @@ -589,7 +589,7 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA unsigned int len, bin_len; int idx; - TRACE( "%lx, %lx, %s, 0x%08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target), + TRACE( "%#Ix, %#Ix, %s, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target), ctx_req, data_rep, input, new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data ); /* when communicating with the client there can be the following reply packets: @@ -875,7 +875,7 @@ done: free( bin ); free( want_flags ); - TRACE( "returning %08x\n", status ); + TRACE( "returning %#lx\n", status ); return status; } @@ -890,9 +890,9 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L char *buf, *bin, *want_flags = NULL; unsigned int len, bin_len; - TRACE( "%lx, %lx, %08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input, + TRACE( "%#Ix, %#Ix, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input, new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data ); - if (ctx_req) FIXME( "ignoring flags %08x\n", ctx_req ); + if (ctx_req) FIXME( "ignoring flags %#lx\n", ctx_req ); if (!(buf = malloc( NTLM_MAX_BUF ))) return SEC_E_INSUFFICIENT_MEMORY; if (!(bin = malloc( NTLM_MAX_BUF ))) goto done; @@ -1088,7 +1088,7 @@ done: free( bin ); free( want_flags ); - TRACE( "returning %08x\n", status ); + TRACE( "returning %#lx\n", status ); return status; } @@ -1096,7 +1096,7 @@ static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle ) { struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; - TRACE( "%lx\n", handle ); + TRACE( "%#Ix\n", handle ); if (!ctx) return SEC_E_INVALID_HANDLE; ntlm_cleanup( ctx ); @@ -1124,7 +1124,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULONG attr, void *buf ) { - TRACE( "%lx, %u, %p\n", handle, attr, buf ); + TRACE( "%#Ix, %lu, %p\n", handle, attr, buf ); if (!handle) return SEC_E_INVALID_HANDLE; @@ -1171,7 +1171,7 @@ static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULON } #undef X default: - FIXME( "unknown attribute %u\n", attr ); + FIXME( "unknown attribute %lu\n", attr ); break; } @@ -1221,7 +1221,7 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_FUNCTION_TABLE **table, ULONG *table_count ) { - TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + TRACE( "%#lx, %p, %p, %p\n", lsa_version, package_version, table, table_count ); *package_version = SECPKG_INTERFACE_VERSION; *table = &ntlm_table; @@ -1231,7 +1231,7 @@ NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, S static NTSTATUS NTAPI ntlm_SpInstanceInit( ULONG version, SECPKG_DLL_FUNCTIONS *dll_functions, void **user_functions ) { - TRACE( "%08x, %p, %p\n", version, dll_functions, user_functions ); + TRACE( "%#lx, %p, %p\n", version, dll_functions, user_functions ); return STATUS_SUCCESS; } @@ -1400,9 +1400,9 @@ static NTSTATUS NTAPI ntlm_SpMakeSignature( LSA_SEC_HANDLE handle, ULONG qop, Se struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; int idx; - TRACE( "%lx, 0x%08x, %p, %u\n", handle, qop, msg, msg_seq_no ); - if (qop) FIXME( "ignoring quality of protection %08x\n", qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %#lx, %p, %lu\n", handle, qop, msg, msg_seq_no ); + if (qop) FIXME( "ignoring quality of protection %#lx\n", qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) @@ -1456,8 +1456,8 @@ static NTSTATUS NTAPI ntlm_SpVerifySignature( LSA_SEC_HANDLE handle, SecBufferDe struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; int idx; - TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %p, %lu, %p\n", handle, msg, msg_seq_no, qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) @@ -1472,9 +1472,9 @@ static NTSTATUS NTAPI ntlm_SpSealMessage( LSA_SEC_HANDLE handle, ULONG qop, SecB int token_idx, data_idx; struct ntlm_ctx *ctx; - TRACE( "%lx, %08x, %p %u\n", handle, qop, msg, msg_seq_no ); - if (qop) FIXME( "ignoring quality of protection %08x\n", qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %#lx, %p %lu\n", handle, qop, msg, msg_seq_no ); + if (qop) FIXME( "ignoring quality of protection %#lx\n", qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; @@ -1514,8 +1514,8 @@ static NTSTATUS NTAPI ntlm_SpUnsealMessage( LSA_SEC_HANDLE handle, SecBufferDesc int token_idx, data_idx; struct ntlm_ctx *ctx; - TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %p, %lu, %p\n", handle, msg, msg_seq_no, qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; @@ -1559,7 +1559,7 @@ static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = NTSTATUS NTAPI SpUserModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_USER_FUNCTION_TABLE **table, ULONG *table_count ) { - TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + TRACE( "%#lx, %p, %p, %p\n", lsa_version, package_version, table, table_count ); *package_version = SECPKG_INTERFACE_VERSION; *table = &ntlm_user_table; -- 2.30.2

1 0

[PATCH 0/3] Fix for BZ52048
by eric.pouech＠gmail.com 11 Feb '22

11 Feb '22

https://bugs.winehq.org/show_bug.cgi?id=52048 Basically, when calling CreateProcess with current console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS), and that the child is a CUI program, native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for this case (which requires to extend makedep to support creation of exe sub-modules) - fixes kernelbase accordingly - but also requires to fix the usage of CreateProcess that will now force the creation of a console + one patch of wow64 redirection (only for CUI executables) + after quickly auditing all CreateProcess calls, I fixed a couple of them. --- Eric Pouech (4): tools/makedep: extend submodule in testdll to support exe as well as dll dlls/kernel32/tests: add tests about CreateProcess on CUI programs with console inheritance programs: don't recreate a console when redirecting a program to wow64 dlls/kernelbase: in CreateProcess, allocate a console for CUI process dlls/kernel32/tests/Makefile.in | 4 ++ dlls/kernel32/tests/console.c | 56 ++++++++++++++++++++++++++++ dlls/kernel32/tests/console_cui.c | 31 +++++++++++++++ dlls/kernel32/tests/console_cui.spec | 0 dlls/kernelbase/process.c | 6 ++- programs/services/services.c | 2 +- programs/uninstaller/main.c | 6 ++- programs/winedbg/winedbg.c | 3 +- programs/wusa/main.c | 3 +- tools/makedep.c | 10 +++-- 10 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 dlls/kernel32/tests/console_cui.c create mode 100644 dlls/kernel32/tests/console_cui.spec

4 6

[PATCH 8/8] light.msstyles: Do not use transparent treeview parts.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52434 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../blue_treeview_expand_collapse_11px.bmp | Bin 1106 -> 930 bytes .../blue_treeview_expand_collapse_11px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_13px.bmp | Bin 1490 -> 1178 bytes .../blue_treeview_expand_collapse_13px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_16px.bmp | Bin 2186 -> 1674 bytes .../blue_treeview_expand_collapse_16px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_18px.bmp | Bin 2730 -> 2154 bytes .../blue_treeview_expand_collapse_18px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_20px.bmp | Bin 3338 -> 2538 bytes .../blue_treeview_expand_collapse_20px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_23px.bmp | Bin 4370 -> 3450 bytes .../blue_treeview_expand_collapse_23px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_9px.bmp | Bin 786 -> 642 bytes .../blue_treeview_expand_collapse_9px.svg | 15 ++++++++++----- 14 files changed, 67 insertions(+), 32 deletions(-) diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp index ca04c0d291fc37479da3b6e7c21741c61ec5074b..ec33b3c461b841ab98e3138fcbc0edc6d066e1ce 100644 GIT binary patch literal 930 zcmZ?rUBt`)23<h128g+VSPY0686<!t1A_!q9?XFg{}~t{2qf~~$vvnTE=44R1x?*L zLI9{9sN_Fx0F)gNHE14zaDmPoDEHtBA-H>h3_Ji5hIkYJr66kl{r`^(VO0avg{+<y fY9N7+MglFRg<WvJ5aTbnVh9879v}k`0GbQ{TRBrM literal 1106 zcmbu;K?;IE6b9h2f}kK;wTPgO-~oa{h*oVpNf6Ygh0ADPi?(foP%%O90%6cCqB=uu zrvFufPL2u<{XXWs&q)_*BfZ4lYl-U|sUi(TVI5XP4e0W-IAfn5O}IAHCqE>k@%`Hj zB_BUls_|T_To&=pG%s4(%Y2fRd6`Y}X;$=EHtO@((C4-PI?J*)p68YGoCC{|lWCf* zEKk<9?J4RFwV&q6(j2viT#*^)TuHhov^1mVKmwe<^L?K_m)MG08sI%^=v|O~3}O?t zj^i}3KjQ2I&aTTWOc$Z&T^NQ@5FPC?<2YxGdPfFHChU<#&hYK9C#!H<*L5qhIrU#w Cztr~t diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg index 59df40cb0e4..b94a832605f 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:11-32" width="11" height="22" version="1.1" viewBox="0 0 2.9104 5.8209" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:11-24" width="11" height="22" version="1.1" viewBox="0 0 2.9104 5.8209" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m0.66143 2.6368 1.5026-1.1842-1.5026-1.1842z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26456 5.5563h2.1167v-2.1167z" fill="#3096fa" stroke-width=".19844"/> + <g transform="matrix(1 0 0 1 -.1323 -.13229)" stroke="#aeaeae" stroke-width=".26458"> + <rect x=".26456" y=".26458" width="2.6458" height="2.6458" fill="#fffffe"/> + <rect x=".26456" y="3.175" width="2.6458" height="2.6458" fill="#fff"/> + </g> + <g transform="matrix(1 0 0 1 -.1323 -.13229)" stroke-width=".26458"> + <path d="m0.66145 1.4552h1.8521v0.26458h-1.8521z"/> + <path d="m1.7198 0.66147v1.8521h-0.26458v-1.8521z"/> + <path d="m0.66144 4.3656h1.8521v0.26458h-1.8521z"/> + </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp index 9edaf18e26b4b5158398e2ca307a90b2127a62de..0e8978b69a478239893a76832216bc4b5db00dbd 100644 GIT binary patch literal 1178 zcmZ?royEcc23<h128elqSPF<486<!t1A_om9?XFg{}~t{2qf~~$vvnTE=42*-Pm=+ z0S2J5|AYWg%@9$CC$NB?96J8MA0tqI04ah16mP@;kh*{W|KmqMHCWUE!yHZ9z^lWP a4uEbQc=sU(7_s4ptOvq|`U6N21PlP{%TUt* literal 1490 zcmcJPziPuU5XP1NOOvH!Ng?zR@(fwpB}-nVLzhrAmMn!p3MLsl6jRxoA!JB120E2M zpCwt;@6rgwA<Hr}!k<rf_x&VWU=K&%4RIP%+$T^Q>OmE8D{6@M=RT&^&_euORMW$| z@q^V2n%09{moXjY19^NMXrEj=7jZ6zYCbNH@o_#Tk1JwaTnNLtP{!uUForA3{I@?z zl4q@TrOdiuG_;80m_Dtbab{MCD$BA~2t*9_Xr^iUj`;>$r-&nlJoHZBUXXubjjoR~ zjPW3Ugnq#FO^rv+P#-mVzfbNpxy{h?A)i8f>~mv0JQ@a`no??sd<R`~pPds!XAJ)b n&R`Ap%I>@7#6Vl<Es7%N-;#60VEvhtvdVjTIhd!so?ZV1Nxc7- diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg index f63653a8430..f2cb889813f 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:13-32" width="13" height="26" version="1.1" viewBox="0 0 3.4396 6.8792" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:13-24" width="13" height="26" version="1.1" viewBox="0 0 3.4396 6.8792" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m0.92604 3.1357 1.5306-1.4107-1.5306-1.4107z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26458 6.35h2.3813v-2.3813z" fill="#3096fa" stroke-width=".19844"/> + <g transform="matrix(1 0 0 1 -.059604 -.068297)" stroke="#aeaeae" stroke-width=".26458"> + <rect x=".19189" y=".20059" width="3.175" height="3.175" fill="#fffffe"/> + <rect x=".19189" y="3.6402" width="3.175" height="3.175" fill="#fff"/> + </g> + <g transform="matrix(1 0 0 1 -.059604 -.068297)" stroke-width=".26458"> + <path d="m0.58877 1.6558h2.3812v0.26458h-2.3812z"/> + <path d="m1.9117 0.59746v2.3812h-0.26458v-2.3812z"/> + <path d="m0.58877 5.0954h2.3812v0.26458h-2.3812z"/> + </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp index ab9813146d6dab88842b00214be7ad7446b89fb3..d9604ddcda24ee0567b997625265517c1ddd6516 100644 GIT binary patch literal 1674 zcmZ?r?P6m9gDxOh1H=MAtN_G}3=%*R2%z#14vhTIzyLuYf&WhKLB%i`VrdpMh3iNM z|A__=vx!#zf7qx;3uLTZV6edbi&X)dAhLQQgA{K5h*A&nHSNfM|Nj$-Aa1}^42fAx o@nNGLE$L$A0=*CSFIEL;g2?L8f)1h*O>h{i$Mh*ggp4!~005K3O8@`> literal 2186 zcmZ?r?c!hngDxOh1H=MAtN_G}K$00qGeG4*Oa%DPzyLuYq5n?qLB$9;;#e%iDWkip zpHmGQeoZs@PYlN8IAYDfr5_|tj2Za!6JrJ;{e;XQMn66?h}DnF3{v!CGlNw9=w^_k zAK46Y^~21dME_vcyLRo``I|Ry<|5aP>(;IN55!kCY}lYhju{~R>({SO0Mf63IG$89 zK>9&?)~s2h0c2kSnzd->&Yj%Engi1hQom}|Do!AO77$+t`bU=-Gm!Pe)C0xhfcP~K zr^3W=(b)8Z)Dr6-T>3#~0OiDh_!TfrR)F}}051KM*bhuou|RWQ1MN-2W+$>3vi<Yt z&*uR0Cjv3a;lFX?Ms=XRi{!*Vl6&)!-9`)><bEK&1`IE4V$`Fn0l62L?s(9}X~_ow DJIPeq diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg index caf7ddf36b5..25496924a86 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:16-32" width="16" height="32" version="1.1" viewBox="0 0 4.2333 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:16-24" width="16" height="32" version="1.1" viewBox="0 0 4.2333 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m0.92602 3.969 2.2916-1.7207-2.2916-1.7207z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.52914 7.9375h2.9104v-2.9104z" fill="#3096fa" stroke-width=".19844"/> + <g transform="translate(-.059625 -.0683)" stroke="#aeaeae" stroke-width=".26458"> + <rect x=".19189" y=".20059" width="3.9688" height="3.9688" fill="#fffffe"/> + <rect x=".19189" y="4.4339" width="3.9688" height="3.9688" fill="#fff"/> + </g> + <g transform="translate(-.059625 -.0683)" stroke-width=".26458"> + <path d="m0.58877 1.9204h3.175v0.52917h-3.175z"/> + <path d="m0.58877 6.1537h3.175v0.52917h-3.175z"/> + <path d="m2.4409 0.59747v3.175h-0.52917v-3.175z"/> + </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp index ed6ba251404c7859d402cad390a54b4d0d686f29..90a5ce7a5795c9896f2656024dca57008e9d735e 100644 GIT binary patch literal 2154 zcmZ?r&EjAHgDxOh1H?i=tOCT03=%++f#Cr=m_j4|GcZ69Nc_K(dr&c&0)ku?G!^T} z0t^g5ZU0FGKrN&Cu!I?P!UZi}v2r1nquPg6A(|jIeONq#LkQJA9Ez|AkLtq`C_o`t zxBzKV0XYAWstKqbtnc6d|0E%r=!2w8tnR>T->}n%mPN60A;E+iE?5<!31ZWS7UU2e aXo92q@Z}KHc)%KTSOsDFfHbLqfdK$|wM;Gm literal 2730 zcmeIxJqp4w6bJB#F6!ps?BF1X&@*&#a`6D-<m%w+;Owr0lQ@RbcI`C;@eX<db*TTR z7DDOAYtli%(ARvt<VTWHdn6m;Rn~Yf5iLX)Q4t+cMcw)2(Nsz(#QUMK&>oH#N|M#A zv1WbGq}#??-M3cAiM(BNtvrYF9E;;{EUuGh6>+kxqE4En<0M(SPTVqaRLj(ftTLRx zVSWRy>+XXfXqrlJLd3~&oW6+#<KcPU6!nE_U5gxAi~aP_KEgWaoHKIBl2X>u-yzPv z?+<8<TT~}ngRu$XioMOEvAjCTp*2O%ndXp%TpMvgNa|;mG^dRHz&5&{GQL;QbHwk8 Y?ngPtJf7$FVU+TJ>HY`Yeg4wCClAF{T>t<8 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg index 727a373970a..1eeb7f300fd 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:18-32" width="18" height="36" version="1.1" viewBox="0 0 4.7624 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:18-24" width="18" height="36" version="1.1" viewBox="0 0 4.7624 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> - <path d="m0.66082 2.3416 1.1469-0.83167-1.1469-0.83167z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> - <path d="m0.46353 4.5126h1.4552v-1.4055z" fill="#3096fa" stroke-width=".097511"/> + <g transform="matrix(1 0 0 1 .20492 .19629)" stroke="#aeaeae" stroke-width=".26458"> + <rect x="-.072682" y="-.064004" width="4.4979" height="4.4979" fill="#fffffe"/> + <rect x="-.072682" y="4.6985" width="4.4979" height="4.4979" fill="#fff"/> + </g> + <g transform="matrix(1 0 0 1 .20492 .19629)" stroke-width=".26458"> + <path d="m0.58878 1.9204h3.175v0.52917h-3.175z"/> + <path d="m0.58878 6.6829h3.175v0.52917h-3.175z"/> + <path d="m2.4409 0.59746v3.175h-0.52917v-3.175z"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp index 30982d5d41380915caa2201148c10626791e7b8c..d8bc9546e78e71713edb18cb44e35580052b2b16 100644 GIT binary patch literal 2538 zcmZ?reZ|QD23<h128cy~SObU|86<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?*L z%D{iJ0K`tRwEiE}OMJLdE3DAc3?44TZOHcGQH&;qsh4=4j_Ms+VFgJc^e6xQ|4#;j zxRVTxKrQ(7Lb3oZlSlO;hYayyg;ucO;X=$u4re@y(WEf-BD)sChG@YQAJvN)CX|E~ TrfJ9`$nlFTP7E8OmuwOMct77Z literal 3338 zcmeI!yGp}Q9LMoUb&+-ubQcHFt-I(@1P68T5!6j|ad2_yC=TMFg0E0W)7VZr6#5Jb zinAB6FW?2@_pd$lk|sGPIfH|tznt`3J~>HG)0Wo93(n7W%>Ix}k~uQsOglNsa-Lmi z3moV7B`rZ|Wn(|oC81(8q5ZEmzn>S&9~Z^IG;!CH#*Fi%&D2ctOidln#MJe4O%qSY zH1(3qG+vyU){8Q;c*D%B-k@p2>osk8%CzbITj4uUtya&P&8D@V8N7g8HyVwJ@Y&33 zu)fF%xhJ#cLjMSiPpR=dZ;Rts*L9csdzigbo{Yj;;QbTXGgG>~d%cc1L)|U*CEHlH zr{2+^C!;ErN}hV3wCeS`{FTw(hIuj=Ge_GI^L(V7*9D_IHJ<iO@`k&r>f*{IPsY}2 zwMF{9kexV7+H^eTwj>_qZdR|eF57r(NmktaY<?cT?-#hXE9TU~ozj_?>N9x%aAZB- zQD$Dx81j94CI{+#rlp!6);7m&O09Jkbsh|PUY(K$V&i!guqJM7Jx|l#cXhqr07>y| diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg index e6b567d5e94..cabc2fd2876 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:20-32" width="20" height="40" version="1.1" viewBox="0 0 5.2916 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:20-24" width="20" height="40" version="1.1" viewBox="0 0 5.2916 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> - <path d="m0.52855 2.5873 1.4194-1.1412-1.4194-1.1412z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> - <path d="m0.19896 5.0236h1.8521v-1.7888z" fill="#3096fa" stroke-width=".097512"/> + <g transform="matrix(.99999 0 0 .99999 .20497 .19619)" stroke="#aeaeae" stroke-width=".26458"> + <rect x="-.072682" y="-.064004" width="5.0271" height="5.0271" fill="#fffffe"/> + <rect x="-.072682" y="5.2277" width="5.0271" height="5.0271" fill="#fff"/> + </g> + <g transform="matrix(.99999 0 0 .99999 .28401 .32966)" stroke-width=".26458"> + <path d="m0.50973 2.0515h3.7042v0.52917h-3.7042z"/> + <path d="m0.50973 7.3431h3.7042v0.52917h-3.7042z"/> + <path d="m2.6264 0.46399v3.7042h-0.52917v-3.7042z"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp index 3c42111b2dfd36a9bc3d201e27bde024a2a51626..61dee08bf96e63cae8a79258e701fa9f86babd21 100644 GIT binary patch literal 3450 zcmZ?rt>R?>gDxOh1H|G$tOvx53=%++f#CxWm_j4|GcZ69Nc_K(dr&c&0)ku?G!^Tp z0f1%#jrmU*0Gcpr4xS(!4Iey#1C&AwAGCB%3>RYlAU6kpAmEWj^A{eK_@ze88R6jr zOaK%DNI6fTAwcaAbN>DRPYI%@Iq*^lkAsPE&!{=TP{I?20~kJVtBGeoJc1VQ#A}DE pq^UVrLmSO%tZLBwg;mX{IfFJmV~sCj1c`}vlFR`bNFe|wGXQlH3^@P* literal 4370 zcmeI!ze^io7{Kw1wxCk522s(a6sHz6(52uOhfcOoJLo^)Kj7fvaAU}>;FO`I!;$0? z0&WgcXu*z!4z(bN7V{_g1FqjkbCBfT_uls|m(7<vxy$oB@8{lJ?vfPO@>9<JDD%8a z%o0mP&UxXCvMoL5DKY}bd3Z=AD8Bo+9ceKno*3$n<=!)Jy;pE=_6tGU=+&aH2Jxd> zG?UhkO6p7+UoEM#Nqx1V&nEHpioRm&>xKA=jUO+>S51EWY;!fvH_tYA=zQ}`yAG9a zH`A`G-?y7(-_`Bg&$90feft^7I>k>m<FPwD1D@x}UyY%RdcA&#KRFB>J0N~Ho6W_n zecW5$_qW(yv0cs57hAkqt+vAcKVl~<KeRjkOJ4utI0uZUgC3*X7K_jI8MaUU8!<D8 z-*1Z*1VIkprS`X4t-em{tL)ICwn4Os4`D9JHqI7@^}nU(Qr<@rS9(ph^l<IZ(|1CA z<?|SqoXxPY#i>*(WAuI|e&Ek#X^SOm#{MJMQI>YA)tbgVCOq~hva<1(i8G?)y6%XL zD?Rkz-}AbD-v1|h+I-in>w0u~oh|ndwH@Ld_l<6TTwY~&u8A+yzS~|Cs$=xqSPQK4 zC;3FzvdQk;gBQ4&e9wmKX04m-xAEVr){rKLcSn>lPaBQKt2Bmg4zB!O9&w)Yx}LOo J)|<(1%zsjeaS;Fj diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg index 6bd39dbfc67..87ad74eda29 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:23-32" width="23" height="46" version="1.1" viewBox="0 0 6.0853 12.17" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:23-24" width="23" height="46" version="1.1" viewBox="0 0 6.0853 12.17" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> - <path d="m0.66084 2.9897 1.6823-1.3432-1.6823-1.3432z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> - <path d="m0.33125 5.6625h2.1166v-2.0444z" fill="#3096fa" stroke-width=".097511"/> + <g transform="matrix(.99998 0 0 .99998 .33049 .33087)" stroke="#aeaeae" stroke-width=".26458"> + <rect x="-.19821" y="-.19888" width="5.8208" height="5.8208" fill="#fffffe"/> + <rect x="-.19821" y="5.8865" width="5.8208" height="5.8208" fill="#fff"/> + </g> + <g transform="matrix(.99998 0 0 .99998 .40953 .46434)" stroke-width=".26458"> + <path d="m0.38421 2.1812h4.4979v0.79375h-4.4979z"/> + <path d="m0.38421 8.2666h4.4979v0.79375h-4.4979z"/> + <path d="m3.03 0.3291v4.4979h-0.79375v-4.4979z"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp index 239cf2d779f9e59e69198996b7eef8da472a4123..6348199b5ef6da5c6b7e13a1ec86c3d7933c3589 100644 GIT binary patch literal 642 zcmZ?rZDL{ogDxOh1H_y_ECj@i3=%++f#C-um_j4|GcZ69Nc_K(dr&c&0)ku?G!^S` z0|ubfe{29KPN5u{BY>7rZYHKnp=JUptN`Q(T!3i*0eu3u7-$%ZKJ0RY{f=E9#2S2Z NaEAaHP`BXp9{>W&hA034 literal 786 zcmZ?r6=G%pgDxOh1H_y_ECj@i3<?Y&sSYL}fdT$AFhCGU=D(ABP%(xQ0s<@q<Z(&= zoNCbUYns7-bd0VZn>utgAU?V}Y--Te;ZlRF4xbvBIznp5m0!1RUGM+@{~7V=2deqM ze*OBTt5&UI!=(<S28cmm*T#(-d9kSj%KZnL!Mt|u+G#-cC7?Pfbafy#Ffkze2oUdt b@nJMb4Kd~b)qwzB_YmQ)i46@6SW`9tD$0)A diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg index 15ba25f8094..a47f9101a5b 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg @@ -1,16 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:9-24" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g> - <path d="m0.66146 2.0842 0.99269-0.89372-0.99269-0.89372z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26458 4.4979h1.5875v-1.5875z" fill="#3096fa" stroke-width=".19844"/> + <g stroke-linejoin="round" stroke-width=".26458"> + <rect x="-2.5e-5" width="2.3812" height="4.7625" fill="#fff"/> + <rect x=".13227" y=".13229" width="2.1167" height="2.1167" fill="none" stroke="#aeaeae" stroke-linejoin="miter"/> + <rect x=".13227" y="2.5135" width="2.1167" height="2.1167" fill="none" stroke="#aeaeae" stroke-linejoin="miter"/> + </g> + <g stroke-width=".26458"> + <path d="m0.52914 1.0583h1.3229v0.26458h-1.3229z"/> + <path d="m0.52914 3.4396h1.3229v0.26458h-1.3229z"/> + <path d="m1.3229 0.52917v1.3229h-0.26458v-1.3229z"/> </g> </svg> -- 2.32.0

1 0

[PATCH 7/8] light.msstyles: Do not use transparent edges for trackbar horizontal and vertical thumb.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../blue_trackbar_thumb_horizontal.bmp | Bin 2418 -> 3918 bytes .../blue_trackbar_thumb_horizontal.svg | 14 +++++++------- .../blue_trackbar_thumb_vertical.bmp | Bin 4758 -> 3658 bytes .../blue_trackbar_thumb_vertical.svg | 14 +++++++------- dlls/light.msstyles/light.rc | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp index f3c8f55a9b2041f5d6b551124fb5d518218cb718..5a548024b186ab32f53fa15bd2903c46e5324526 100644 GIT binary patch literal 3918 zcmeH}u}*_P7{|}V%|usULG925AE1kq4kpI>0IfPZ2|j_lh^Fxo8pJmcM(Yf7>)fPG z2cgI3A4n;85OgAjaJjqQ_y7J}dtZK`*Ev4fVR5_1e21}xagDLTb}=*NY{wtcM2sap z(y4QFdLtQr4L2pnVlj6d+ceFg*q}g17Je*T*X5j(*q}g179RNXhQtmXS$Oab;s!#5 zY~v9sA_n!Y&tLel?RU@f@|a~g1hKGTHxcI{l$7U&d6BGjRBy&`y7f_WtLo2QCG#{L zlinq@MYnrGhw^wq(+S?aq@R;^AY@ZBbiEsS@;js+EVNeS$tp$b##3IRI@hP1A2sIZ z;f&P%;u5JV4#6{QT8?KZz&PePoJ|7j(l-=eZwuW}g14)1{)IXRR-cas#C`dFz<vJl zjK|@@4h4qff#tXVbQpQ`w!A|oMz--}>LD*{UY~M)3?<_5wZ}hS3NQnQqX8&|C!CD~ gt5?jk)d%hHG<O@BtyNt8|NDQtZ&dkvs=V9$07S=Y-T(jq literal 2418 zcmeHJOHPD95XESW-ol*_H=}`tMqSLtl^ZYM9drX3PvG89GR_Sc2(VEPq9nTG=NW)b zSp`!)lNmcRCMIs^@S2y`1tjl5HU0CeZLJx%INu;P5toQHZAV+j^Vb$m3j;K*J!l2` zXBXECB};^jAJ)g?u@wYCPH<h<<dP_g;xtVmNfJQ*&bsgWwGaXb#98+|4|ovobbwWS zQ2D9ypYsaCFq_Sb^)AQ%c@O_8M;PpyU>jKj<oq3ht;gUP(7-m{r0(do)R9m1N$upC zPH+8K?t{Wl+nD<A=&~Pzy=P%o1!j;F=lhqB`(`yf$_T`zK01lT=L?9BXDCOfGRN}a zpaxL^fw-){?{Qm&5_zY?YCfp^d^$$|Ux6|}|7DKlUC*k9hXv-96K9{P$5OAI@3(XP kS>~wf1Ks}EI{I55RDQDm^p7(8e?t2pW>wHWNSvPf4R_|o;s5{u diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg index d1063507dd0..4aa6c26b068 100644 --- a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg +++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:6-32" width="6" height="95" version="1.1" viewBox="0 0 1.5875 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:11-24" width="11" height="105" version="1.1" viewBox="0 0 2.9104 27.781" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect y="-.00023066" width="2.9104" height="27.781" fill="#fdffff" stroke-linejoin="round" stroke-width=".070004"/> <g stroke-width=".26458"> - <rect x=".39688" y=".13229" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".39688" y="5.1594" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> - <rect x=".39688" y="10.186" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".39688" y="15.214" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".39688" y="20.241" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y=".13206" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="16.801" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="22.357" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp index b5c9d0f78a528afc15f2073d17e0a8fce6e1884a..32315aa00da3ac5ece65c2c7aa140f85b892cca5 100644 GIT binary patch literal 3658 zcmeHKy-LGS82toS-2`7j?cfsKyA%W$L0TW6)!oU)Cvb0!QhbCG;|qxCXq}VQ)YX8c zgNe7FCrznsK*E;}BF*Lg<c4#;bGhFkxwm|HuukK0h5iz418pB|g*MR>J+6(1RL4X~ zjo)**a&(>oWKLI8h~aS1?K+labtDCNu)rk@uInnLSW<uo3tU1ZDLD}W3tYmgCBk!9 zaF?FH=>9v-ljnKT6#nEN9zqDLLSnxT@Du+P{#|bW|9Ag#;ImQVW{EGh1Qqz}6At>s zMwRs)0dpz?mQf?I@|2GUy+nDGXF?QwY364(54j_59dmO#PZr|*SBc+W;}E*gf55|d zfls54eq^79rWP8zf@*5f!`W!?Mv>i6y*8_G?$4Y#QK5Rig)l)`OirSIeTFxCgf(Z1 z{RRNH;4iZOrbf|yUA^3iQ;7Wc+VBqi=SOxukN@ljyi3LTp*TMXFE7dGU~>QX>+|n7 Di7IQU literal 4758 zcmeHJKTpC?5U<hE$;7qo*y@5|aFT(=$;GeYAgG_f*+7W)3y>6s_A~UK#u+{dv3)P+ zUEu}7guT}$L@pdx+TO44?tVY|x_5&!qqJB2enCG+zeYbYY~vW?>FPQjZWtKG@<ZpK zdwc(|adD@^lb!D3-Q@ee6^3CloleDMGJ&d2`9ToG<MG(Un9k>Oi3S{_{Ml?);u1a= zPpyS;RK4n)j;MO41507lg;_&Ci#q0B2S0g=X)c>;Crv4?DlYsrQa<8Dq)pN~X^N|* znzdO_jXF*BY#%Ud&?e14)A^sgdS}?Ac^&*DJmPzE>f${Ko?Q!iZVWv~K;MPRzRZu{ z@zO+$1f7SsUW?GOzBS&m#;1#-a;@7~`}mtX@9mmPJST&`BQ^Dv_>&+nZH%cVekR0s zo?@EIUc6md`9~+thi#D$T2R?3-|Iw+QQOSDn?!!S3y?YQ6@vNlb0pOI*m!C+;s>za zf@;-is&{*ViSyFjPnv%wzdgyurMV-2h)0WI%f^`M;V0rD-<wkx?@5O}tv)3k_O$<Z GPx}k^i?<a3 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg index 0ea443d89ef..f15c9fd1baa 100644 --- a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg +++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:21-32" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:21-24" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect x="-9.0909e-6" y="2.2204e-16" width="5.5562" height="14.552" fill="#fdffff" stroke-linejoin="round" stroke-width=".070003"/> <g stroke-width=".26458"> - <rect x=".13229" y=".39688" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".13229" y="3.3073" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> - <rect x=".13229" y="6.2177" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".13229" y="9.1281" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".13229" y="12.039" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y=".13229" width="5.2916" height="2.6458" rx=".52916" ry=".52916" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="8.8635" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="11.774" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 4b196716171..4596f0f0458 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1091,13 +1091,13 @@ BLUE_INI TEXTFILE "ImageFile = blue_trackbar_thumb_horizontal.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" -"SizingMargins = 2, 3, 2, 3\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Tile\r\n" "[TrackBar.ThumbVert]\r\n" "BgType = ImageFile\r\n" "ImageFile = blue_trackbar_thumb_vertical.bmp\r\n" -"SizingMargins = 2, 3, 2, 3\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Stretch\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" -- 2.32.0

1 0

[PATCH 6/8] light.msstyles: Do not use transparent tab pane edges.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 9354 -> 7050 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_tab_pane_edge.bmp b/dlls/light.msstyles/blue_tab_pane_edge.bmp index 0ee90aca9c540376d512f607da8aefd74ec87961..0fe3e1cd2eb65b65927a39eaac72bbf5c21a1187 100644 GIT binary patch literal 7050 zcmeI1u?@m76hw{05J)V+3~8unScR4eG7L&qaE6Enh&+WYbHquJ6bId>xUcv}_C?C+ z`MTfS+OwOhMSo&lmUVEa`P?mf-K@PhSD(*8X|DIjs{Hys?mmn$dhffgdzlst48s63 z=;Ju%oQr9}0BpbvjG3FMBvML!-{Y1{!EAnBBeOX&-N+BeFFxYK32;^U5g$%~tICh~ zZ~|Oae#D0p;HvT?KAZqol^^lp1h}gFhz}>gRpm!~I03FIKjOm)a8>#F%IDwa1sGw3 c5X?syFaR4cGfh*Ss?;o5bzBq1UYIw%0jZ}x;Q#;t literal 9354 zcmeI2El<Nx6oxMW0TMd_3&CMXu&8Cp)C>t0iA5kV2qc+9Vv$YSiq_2_2w%UT{VlAy zdtd0AnUUZQH#s+ZcA9?N^Y&?{c1P3MVfY?1eBXlOo{caJn>^AV=jLj}5Pm+~6-Se^ z>(#NpZEdYNEylP5cEJD~fFp1MPQe&V!3DSkSKtQRfqU=(9>EjHKm}fY;Tikq{W(0B z*YH}-!MQjm=VlM~I|uB|49vnz%*Kq&x}E3wepOX(WmztYqKGNLtjPSDW!YX`*Y8c! zEV{14?W8f7m6_!|rR*}y%y<r8d|y%>de=R_jRE&><6T|dzf9Ov_iy7}UERM-*i`p# z<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7} zUERM-*i`p#<6T|dzf9Ov_iy7}UFn}|2@?MQoofg_+qT6mq__ToYd7G3h<o_pbI|YM MzgK2ucCMXS0_lekzyJUM diff --git a/dlls/light.msstyles/blue_tab_pane_edge.svg b/dlls/light.msstyles/blue_tab_pane_edge.svg index 73f3fc2d2c7..2a950c9087d 100644 --- a/dlls/light.msstyles/blue_tab_pane_edge.svg +++ b/dlls/light.msstyles/blue_tab_pane_edge.svg @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:48-32" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:48-24" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="#fff"> - <rect x=".13229" y=".13229" width="12.435" height="12.171" rx=".52917" ry=".52917" stroke="#aeaeae" stroke-width=".26458"/> - <rect transform="matrix(1 0 .99934 .036434 0 0)" x="-341.09" y="341.31" width="5.4429" height="7.262"/> + <rect y="-2.2204e-16" width="12.7" height="12.7" rx=".52919" ry=".54067" stroke-linejoin="round" stroke-width=".26458"/> + <rect x=".13229" y=".13229" width="12.435" height="12.435" rx=".52919" ry=".54067" stroke="#aeaeae" stroke-width=".26458"/> </g> </svg> -- 2.32.0

1 0

[PATCH 5/8] light.msstyles: Fill combo box background with white pixels.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_combobutton.bmp | Bin 6858 -> 5178 bytes dlls/light.msstyles/blue_combobutton.svg | 6 +++--- dlls/light.msstyles/light.rc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp index a2b12ba3e1f3c3506f30c0dd75e567612a6e526c..77ddc24e2964ebff7ed90f5b14b9f1b1e7094ebf 100644 GIT binary patch literal 5178 zcmeH~J5Iwu6h)214xnHQe2O$sP|{G*Aif(&pr#_Q0(#6xh$SFnmXMT$I_ddzAO)qs z#u;uh(bdBe^M*ts1s*xhao#-{`$;oOR@RoMgZ?<d`53R><py38!3@qp5KZ;pawii6 z_UL_XR#w*!asl;nGM6x;jZUXiuh*j}y73r@Aq>UN32ru<S(f?S0%8b5v0;3br)cvC zL$QoI^_fv-s1Rh;%~S~PysT0o$f}#E5ZrlLr9zNZH&Y?F^Rh~XAggYsLU8A0l?p*t z-Askx&dVwlf~>lk3c;P1RVt&bqgt)jYPCF<VQ&3m6M&A{aVP3POzs=<LH?BAo=mu7 zste|DRzDCs+cj^`gF6hj&C$GW@tYCGTy}WQNEdLlFmUCE{%mFcyi69Z?1r0*Ub*`t ztE2a7h;;<Tj?+z3o%`kb-5$8FkLGl%w<P7`{KSZ1ufSF_*3oT0r}18LzL<n1{WxDt z@AkXzFZPzxxRN!lOqO^(L6&6qmzc|jF{7_&h0l-VVrk%pC9fGp2#;2{q8~0SdgbcQ z_uBY-HN-lC(jVz<IeWPFU4~e{jVmm9>vr2uX<Yurz7bcj)qHQ>UtbmfVbzY~C%VlL zRD}U51eR2wLQoY3s1R6EfeJxY7@$I6Nd+ndRbhY%fh85F5LAT$Dg>5Pph8d;2B`e2 G|FB<8h73{w literal 6858 zcmeI1&raJw5XN1B$_sGf(B#lVLJm0M1rV2>dO>}Y9_svgf*vdCh*yY|<Q9n}TxrS+ zrA|Q03}&29-pkA;m2$AfFrRn7`DMMa2H9MHeL9QYj-T|qPjO1|jp9R8kB%r`z0Z?` z!$nd4!(;CH%guL~RLNtNYd6zqG^&lq;~7Op;f%pG_ru}vldNJgnaqjVrLm7Prp;VK z^?hQ_q=s}B!jk&wbb3OJe{xQmzLnh$WS|bEA_H~B)9nE68ERd%??MJ@->Dlx25Mck z??MJ@->Dlx25Mck??MJ@->Dlx25Mck??MLYee{=1K81J->S3Lbp2am(-=iq{-+O;v z@H#2X{h9kQaf|*e>pax#dd-?kntxo<cy^tpGeutW=zg?{>!tc7g`Kti>}Ot&>{rmb zwygYmy62mMSDp(zuXx6LrL@o0{#E;D={5iDehKM&rF)rs)OLN1C)a7bSgx()<=(k0 zcuAv9=YNCxV18{&?(xDq^t`%l*Vez|**c9g3TKQgOXK_1-DUCji0bE?H14`#%lv%A zHJkLJ&+CzW<8_6wq~87dd_s)k`G~Ji=0Y<vP**(N4&a`l)>Zp1WT5t)x)Efc)>Zp1 zWT5t)x)Efc)>Zp1WT5t)x)Efc)>Zp1WT5t)x)EfM-ba5ao{!dP`(ZO^Cm}s6?|*TZ z)-;zZSq<X)dT_Deb@IB6!8LR4@xnXwT)nTee?$D-ELEsw%$kvb+R70>GEmFBH6sJH zl_P#+pq6=SMh0ptNBqb@E%Vll4AfSR_>qBH=B*hSsI46FBLlU}TQf3HTRGxK2I+mj guX`Y768gT5|JT9q*krAw>%`mXeI56B;q5cO0viV@SpWb4 diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg index aab7ff06812..07293de0ba8 100644 --- a/dlls/light.msstyles/blue_combobutton.svg +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:20-24" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g stroke-width=".26458"> + <rect y="-7e-5" width="5.2917" height="22.225" fill="#fff" stroke-width=".26458"/> + <g transform="translate(5.0184e-6 -6.4982e-5)" stroke-width=".26458"> <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index a8e35f9c5d7..4b196716171 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -398,7 +398,6 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" -"Transparent = True\r\n" "TransitionDurations = 4, " "0, 100, 100, 100, " "100, 0, 100, 100, " -- 2.32.0

1 0

[PATCH 4/8] light.msstyles: Fill radio button background with white pixels.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 5546 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 27 +++++++++--------- dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 8330 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 27 +++++++++--------- dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 11690 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 19 ++++++------ dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 15626 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 17 ++++++----- dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 20138 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 25 ++++++++-------- dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 25226 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 17 ++++++----- dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 30890 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 17 ++++++----- 14 files changed, 82 insertions(+), 67 deletions(-) diff --git a/dlls/light.msstyles/blue_radiobutton_13px.bmp b/dlls/light.msstyles/blue_radiobutton_13px.bmp index 636992294934772b6821a1bdebbc8c625c46c738..ee19cf265c401af8b872fb8b2c37e9a6f16bded7 100644 GIT binary patch literal 5546 zcmeHJO-x)>6vl|U0G95mc4xGWHq!z5nIQ&EOspoxL>Fpwp=rB!VW_4|Nb16MfdK8; z6(S6O!$53eL|`MjmDr6#jfHl_5SSrl?#w%W-+k{6@8^!i*hLqdaOb>p&Uel|=iJMC zr|0d7ryDeVgWs>PTCgr+J=Sot;c@Vjo*j=ql7<HNk2>jj<K54F#v?s8{tIe)dOCsi z9o8MJ1FXNX#-^sGy25TtOG}N=55m3yeqmx_;#sUG$)USQJ=Rs?jIW2kIX5@Qaw9}N zd~VW@M(_lD@&=FRbI`3}?U83PnKy~^{Fq1A%*@O<)_LkZyZ{?m#t(YtIfk`0J3IRf zec=0B81KnzUd-np>;AA_>LBmd@!6$)adGh}*zaR)BBvA7J!l`Vk9Yj_!2d1VKES-g zn23D=_A%6w1pgB;nyL5veuce=XYzB@vu}9LLzke8=Rw5!!T3?<Cv!f;8NIm&j04~E z?Bnq8@Dq?vP^O-E|2;6i%oCV#?7xXsCii5WkHPu5d~qrv{q6H|IkqjAPFExa-rt^; z-sdBCR8p@tN-Ca~D~Y14eeXzNOQcd3&3_qpv_2KTMx5D0<3~O&$^D{OiF(@MM<1Qf zm1MDozxA`o!22S7XI*}4*$qQK=7Bt=|COB1hZf>{Ux+T_$2?iz<=Bqw+;wAJeJ_e< z4DL%RY)Y*^te2FE+kL1fsRNNOPb=w*6^_0S`pI+f*Yn4ceV_Fo^)|Y0eO@mn<?HUE z9F$x={RU81U(Ds~3rY74{l&TKe)Bv>J}K4wT-4$3;rXNw&(z!l#Nj<)A1g{Ur_A$X zT;DyY`Sv1D*2lhFI#tn}vX_s+`MDZ+Iiap6=haBZc6sP*MU8fDt8{l(4V|&x(eh|# zT7BD7tgcTw&K`2BmW90f`=mpCd9*8VM>T%-(~^{Nr)&hhf}MWMOXqXrwW7g0w^u}E zJ`%*y-1%$OjY2={$2`^b?p$>}<Iq5SdGJhR89$vT>MM`5@96yDqb5Iy;2DGa>X^G* zV*0~+NyyjgL%pWTfuNsCjdm2Ay?a{qz<tn1?h~wM*}6|P|C5f%bI|8C_)=2ccpZIn z@2GQo8To&RJUcXJUo^3A=r8-se!J)M8P3PM+b-(xw{||Afjg@G5Qlwt?}5TSxF?hu zpLW|FRm>CT#lDn>Vz_S|1uc8|FsCr_oj(uCX0zLP=T^um;$0oNqkMP6o?cj3DCYBd zr&KCQwOSQ&%GASt&Hs)ker08)q!j+oEJQu+^kZ(!hj9!(m&-|8TbndDH){@?jzT+e z%oCX0#>R%eqr@XjWEnr^$@=gO+u7gW*RkU9cm&TF+?T}qke}`k>m{|cv{-$pClQB! zD(qAEulxAxL9W()5L@qK>ftvO^F^(1^lNQxm8Pa9&Dj@{=^OjZe)D`*S67d6KD9f_ z^Q9mA&%U!h)=N&AdfJKO9)4n;tdD)+eIuuA^6_KMGi_Lp>^y4n40F`RIW{tnhH+sT zK9PAej0wy5KZwkuVN6)I&7)yVShmfhVN6&?Zq|7;j59L(2A|`3)HjFx?|D@J_gjAI z&7&4*KxLap0|1L)n@26MfXX(H1^^a;^L=<8wZH-@&VROfGyw7m$MfhzpGSS&4L;VH zM}wfKWSd8$sG!EN%%eesMY7DJ7F0mRxh_191^^bJ-aKl7x~k)O^r6qA^?GgQDtxyB z^JqQ1(VO`V-@Mv9YHanmZ62+MHG11TYHanm*@yF)nXl_%jo#D~o=1&6%uU}o<MI3d IsLrGR0FDk<@&Et; literal 5546 zcmeHLyG~m{5OowDO;V;KkOB#8B76}gMv7=6#YBqo5jIV#NCbxz)F}~M$3<FWSv(tr zD{9O)a9v>Y0f2a1kT&P+Biz?Qq@;j|D<-ouduDfb_K2M@^}hZhCBN_Z_Z#FnWCrpi z^(yrg`jwu?Fz|^~O8w9$rrv)19GLv0Vb?9F_4V}}WChZOTtW^Z)wQ*?iD=mF?rs<S zF6LX%#d^Ko59y(XZ-#!z5^*M0;~QIBTRd*;qaQI1#&HrlhZxV`G0wxc2RWf$U0r=g zoQ`826B`>FHAsPejTgX%#KghRJgbnS&CSi1j6v*v6tC?)z2*RHSs$L4KG?^Wm}Aaw zZ*TWv{sPiLPJQ&<wU4f2J9r+%PbcjI%m=QCwTqaq;w+QU2Uz17{W`9R`BRLk^YpWB z7<=&LXk+YRtsN6bU+^>cL!9v&9&jDR7FfqhrP2+%k2d|p2YFy(nI|wc?B9X-)Y_K$ z7+g?`FC#foO0PiLkV{b-K7_7{(ol?}V&P2}=3Gcilrlxc_KSs)9;xRtGs>S{BF^lg z@eMIMl*m!~foVV_M|D1)!HciyJm&TwCt6F6>Nw;vGy#82%neJ9YP^6iDk@IpiSwn8 z#QbZ?QH=K!@Qjxn74zu<j8%PbUY-s1u_Z=wRD2rj#ry@NBW4FBM=`#AAJ$Xtb90{3 z@HBkUv(T0tmG>a;D>I4l0q#R`6!(a@;U;jWQlpMCZ&h!Pb=K#=eP(t{9DTtra6i8} z8sLG)y0ea=Fy75`O1qTyu&*2BfmsuKAy3>F>rzVlTGvcI1{c&<%h{aoW>>CUr|rAW z<yF}^^vg~aI+3HmxR91#&KA!r<NcyO(nIaLV>8n4Iw6h{f9X06@zcUl_&E=p<fzKW z@eKajb@G_ogPc%b|8Nx75C^-(Jh68TW64pC7qCNO;$)sUAND*tTUH$Pm!176UfYtR z=SyP)ran9`>xcPcON`>^;$Sc4FA&!`TO5@fy>lPbQSB2rPdPiCv=8!^9OXU8`*KGo zfjbb(ilf&mt_j~Mq{+H4Z`KvI$2#kC;C{w-OdNf|k9d7QA&z1V^1y=>SVvJA@8&sa zYkwj~uVkKMHP!_<UuoDnpWxnR%-{Ktd;8WSPu7-PInnyow_fAX9kD|SiHyTpV{bih z`w^^(wZ8ShlZyry)YiBDu6>f;dc;gy_PO<~*KtkgQwX)>=tF$#9{@*D-uP$hN8`w_ z$HLJtC}N?viuI!rNX$&?M`NIf!@|)BDr_RR#C|l4y0IQ2M|J;qZ~M`k>V`+Qel(1V zTOy$!jibVzq<%Dvh+9ehXdD&x;4WhQXc!T<Z2f2)sXV%FkNs%i|4isP{;D6f*4omK z+VIAo)Q_4un@;LSZCK+M3H_*<vuXDA(SFp1HGW$^YUZQ*u^;{Se|w77*w~M6y{g3j H`quvf$~kDv diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg index 41f2b6e976a..c47a790cd42 100644 --- a/dlls/light.msstyles/blue_radiobutton_13px.svg +++ b/dlls/light.msstyles/blue_radiobutton_13px.svg @@ -5,24 +5,25 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> <g fill="none"> - <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> - <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> - <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + </g> <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/> - <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> - <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> - <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + </g> <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/> </g> - <g> - <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> - <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> - <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> - </g> + <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> + <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> + <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> + <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_radiobutton_16px.bmp b/dlls/light.msstyles/blue_radiobutton_16px.bmp index 9b8ffe570b308de67845223ad0c3d1d409f430ac..80192a72f150d9cee1203c5aee7e507a101d57f6 100644 GIT binary patch literal 8330 zcmeHL&2Lmy6fbIE(GUC+Sg??`!)M!sQUY}2LWqewAyIc~B5qtXl)+9lBnGv7ly=%q zX>r>xzG`EYfoilZxWv-Bl2X1RCVZ4>XWqQd_4m8)-Qm60Gc&M5!wqNNz32YUx#ym9 z9(ljk?>VxjNRK1<4MSdsL?A1Q))c*pCmzC3MMcg(?y34W-}y`c<yF0wceki$U|^u) z%$YMshlYm!fXusc4bK+t<udQ<>svWEIM@o@Jv<LVHbYlJ;T-zUxd-1Ti1qs68hdfb z;K;~GnRm}S2W~Ym92dPl;Ij>93`8Q4SBS^{ZpbBwi9e40x41_P^h1op#a3c@*PM&_ zVTh6hKE9-l8^^t~XU~=ccMSSN)MLFzvh(Up95}xT`WDC(WCQK-ybKY~_UPlpq86K= z(=|GG?p&#B&-)g#e?%<r3+yAvJnmES9QKcir44K!L#{(i{9~9GI{y;wasQ3LUV|Ki z9Hb7<w;_e>ce_~jQwwq)!t;(N2Vdp!ahSI5-S3)yMorpb)320T;reDAW6(dLV1Ajk z<(}I=P!G0p%>jR_fMLJ&n>d^u|1Zyl-2iZLZ~qz}*kc@bk()5{Gden2Oku65bNAYU zw%$|Rd>jXM3jR#|>@nuK(u<Yms-e6>MYgo7FKTY8gQ29B=9*d6w55%Ek_~k#Qn6A+ zs$;6TdO=-mv(@b>rBVq;IKOz()_cSN>-D2;o2w?(>5mdBIgc{r7>kdUI{je+=S+Bg zz;BQG?&E~YEIEeLmz9crpb)bo-I&jeIeWx7K4LoV#&wmje|qldQKb&7ljX<bjt|BW zsY<8=73DZ1s_)C4=}WSm*Pn^wr&e3%w7F(Z-I;Ox#@;V%&%1EkzOJ%0N<MLPys!5x zX&$L|u*`FK{i3cf>%{R)_Eip+HsSS2#BeJcf7g43&u3jY?o2D?^i@>Fqqf#f#S7cB zwjAsy-IH&G;0N_{bMV8rxqYy<9K1Vg?)EeKsn_YBjI+-;c$cQlj<7DQEr;$O^l5WV zx9MTEf9)#xxT1ZSI2^S9m*=ui+3Ue~!12+m<BGT2IzOoeygv}unmWeJUJuxsICMWZ zARm#<9f)sEg+nPVoU>2S>t3uhPo3OQVa00Oty9}?S{+qME#2E^t?t@3?nyTK+`fvH zR%~0$iq$PF{oZM3{zl9edIZAx($x-|dsg?hm;%=8hij|5ZqojKe?q0)I{Gu`tWxvJ z9{wZ&9}`|5)~UK4ZR@`OnHxW=bpJkOb=GJ}5A0K!8^1U{fN_23_dgX~UkQKNbM4>0 zQC4iLvf4NLrE9CQ$6K;-;I4^O$EI>%qr5LSmi`)pZLQzV>jyqe97|WDHglTp-aeQ4 z=TGf7-M=@tt?MT}uvcR<_otPqk+Phe>HB)mljg{Y9>}xRS-r^m>N-LBT=uA|)lr>H zpQ^i+jlb{R!ttXn9GUww%3@#X{B=FeA9A!T_vRj`3v0`v`-wf-8VaFz5R8)p``53P zCHX*ISX(`KchubUGv>Ya$fsyl=ly3L)4WS(wHDTeIz8Aw=u`Ca)A#?x+Es|*iuU2g z;eZ3bI9J=E*S-C#-yiK`TQB3%?+@~$EWG;=)|xu*vDbsP-gimoqibsi`^xI9N>TJ2 zd1kMBvC^F1L>DexXouXyw?vYH`Rw`g=iAKpl4Qqk5@2GGh3V;O`@w?;DxFSi;hZ|| z!B;H!{lYc$ljGy#3EJcumSrho;Ag_?1GYWXXEILxuvWWv?NTKrC0gq1>(%h^uy#uf zv5bTF;5QNG*>f8k8^N&1vX)CY9M(P<2VzJdH|6-=i}G&VfKIgY`Z962`Dnx0a}OUr z)P8sF+*#0`ci~`8VXJFoa>o05&ywb4Wo6o)Hi&<b^?e@u($Z3|J$vJpiGRnA9R<&4 zT{vh1+gavsW@bj`53v-qhmE#3`GZXex@`R#8X9u?U~M^gU)q>{M%{WRCMNLyJA-lX zF2%*gT38p>mc#T9*4g);-~aG;g+5F!9Z&vW?zz1;>Fr<CNplFs!MK<Y=Et^eEvz+l z+=KK4ZE0@?^8r5{z|Da(q$r#-&(HGx&z!*KD6s!o{%>+2Jqz)F$tI{n{#PSE%lLl~ zmv4<6H^D~>B+LKv;e&gq(=z@a#N=DM9N5SI^WlSg$iXuHAH?Ka<NnL|e?EM04|x;$ ze-J0F-Mi=H|B{W-z2yHU6aJ^>@GlDg_y4!+UupiP|Arv*e?MAY<>LP`TGmSZUq;GW ziT}$;Su62>87XTe{x2hCt;GLjq^!-w|7EmaTZsSr(f*b0pO^gK|Muf!`32(t{(=Qo z1^9meEidtR2#Np8U|B2ie;FxjCH^lXb7%$rp93kY1^zDsWv#^jWu&al#s6h=KwE(S z2hjfIOa32x_4S&Z1ia&g;Q#)D`B#R&ffI@R-;b78x%j_~mbHezlA9U+EF)#D#Q$Za ztR)u(SM>3J87XUBdmsOok+N3e|1wh6n*0U%zl`>489VZxlmGkC{*~#U{|o>B7eFS< A2><{9 literal 8330 zcmeHM%}yLg5MB}o4#p;rU`3X^KfunAL!`*EB9bVFU|Gt0<d8TDEWay7NXU@@13QpI zUI5s|zF4xv0`CCJ3nXE=E|A0S9y;GwGadI1JwK76C~+9M=$@+js;jE2HC^8E$ItF% z<avg_v!M4uWl&${Uglkl7%Y#<Wc+`WsqrtqdTLRMW!;LEW-`0GyM?{Iy_H(6b^^K# z=osTNWl`|$?d|?*wYm<ybBuGKG4KXSoP$448Emgn*R;cT$m*c#t5>h?nlf_^y&>rE z**9&#W(8~PmdoXLs1NxB=m4bsuS5PNWz+$`Mn3}GVZ1i=x|lD5l#O8H2Vw$0&R@KE zk%!(Y_;cjr{jm*a^0XgVe*yeuPy<vX9^)a%y0*cuQx|*Tf+u_Q^5x4r0iN+D;ak*Y zywGidE)mb*U%+2bml$9#K&K$>{}JX%>mLx0_#NmTgH}N^<Y9aQO2SVBx~!*V<a`9< znURB~7#oYk2C+AFJ!4NiV0M&JeSvNIaRmMq3G+klEoDLdfL&eZJ0I8^fDY?zNBiMR zdjE1=;C7)`H|tm1fQ)`Lk(*iO=k@E?w@KV<@&Z{Uj5SvY^6?zH4cOEEv&NX`VN=&O zSCjdID&<x{C!ouKj@49dnKB!OJXJ3At5SX)`sdJ{Q`5OI@CJoAFJ<RNR?4nX*R<nf zvvtU;s(e54{Hw_ihG4e_y?xULcoj9B-&N&|oPVq}0bdTF7x)j`(>Xc+)bVX(<@{ql z485ja7uZF-s|b?wFMcr2QX!96R~fJ5U?%%G0{6zA_G2o$AUQ4N8fvm2=LgusM0_bL z=U+|bUFiCI^!)=l|9EG-Z`QKU<@_^V=(YrdeG>oE;pP0xzLs(q$ls~q|55V#c{%@T zy5K;Ub;bP2`A2;{Nyca8{7XGaO=d@cIa4|Z)48Q+8(BI3LF`Rk&(QZ^ZwH@NIsbtl zjO8kzLxsJS9I<{_r>J#Z!|Ln%1Ae{1M&O5*nWL=BI>jEE^(%J82K_)SmU6R_pYKL* zE0Vw0vm#@yht5yW8k5XN_BnJLAnkuc@{C$Hb#3$ZMzPTGoE6Xs=rW+=&Ze_WnGHjp z+Aj2WD(-rx;+%Ik-MP-j=$NYD{DU~}dhR@B9j~}XUDJ+WJ+}^>s#^Q#t}1_W3-ix9 zmEt#~?uPp*dFrPRhq@J~*4ZrXn>OHErRx>t{C6wGhh5M4t>d|^w&!$6oOd^!Ux59X z=U;5V5BkvF935_Z#U|G!7V%zzR0Lg#4fw%W+FNcOYp*h1`1YQ^ZX{N0(hrGm(^+6n zu}-72<re*TomRxUhChsDbR0Qwp(}f&etvKVK0Iw#7;F6ckhhVmZy7J<T<?;5lpgQ; zc<!s`T!2o+|1Ib9z@Fi&%@_EO{Y3s8=(Da?k<*zVe`nyu;*q~!gZh|f{@Uv!BiQ3J z$-##E2=m`#Y+(P24;ef6T-P)7J=n$fKhp=_9$_EP;2(11vUZr$7WY=LtRK`VYhBl{ zTDw00oddCfy^vUt59V3w7jvm!))?v(HtS~n(oSH*qhHXOWq#C;IQt;(HF=aF=1Lf= z{ou%aV9n?7rvYLulN!u3Yu(hf&3PxnU1J4zh5zjRA93*;!SBpvK>TK=y8lCu-w1pP ztQ33y2ZrB>D6Hm-AIR|na=Z-s^ZpO)VG4ZY{U2DytJjGdBk%ty@sam`;Ez(QA9?== z_DKr7eE*R*>-``2r5GEj?*D-wM;NaH;=cSZ?*DJe`NwwIpQQfZj_T#2{~AL5UF-jQ zwc_6*&VM|}kg_L)4?X?AAx@my`u{|bp<wI(4RPWW@n7rz6G4VT%=tI8?9-(F-;VOR zH~qgoJM2mRE&adUL!X<}|HomqEUN$4@-(Be^#5saTF2J^YgwAn*8iu$X&qbtuVraQ zTmPR1r*)$Ge=Uz2lluR7>`nh~%a8Q%e^dW&vrk@{{yz$<`EmWf)=3)aN4Wn_!i44M z6?^*susrEK-2W%(hvnh^KP*prm;cu>`u`;Tusq!VhviA{=)te`|4A4vkL&-nPShy% plhFT1VsHBYf8_VSsQi<EbN~0Vb94W%MgIPmqJHqx+S~E_-yax7=H&nY diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg index 158279ee557..abc996e08cf 100644 --- a/dlls/light.msstyles/blue_radiobutton_16px.svg +++ b/dlls/light.msstyles/blue_radiobutton_16px.svg @@ -5,24 +5,25 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> <g fill="none"> - <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> - <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> - <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + </g> <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/> - <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> - <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> - <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + </g> <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/> </g> - <g> - <path d="m13 88a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#3096fa" stroke="#3096fa"/> - <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> - <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> - </g> + <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> + <path d="m12.5 88a4.5 4.5 0 0 1-4.5 4.5 4.5 4.5 0 0 1-4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3096fa" stroke="#3096fa"/> + <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> + <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_radiobutton_19px.bmp b/dlls/light.msstyles/blue_radiobutton_19px.bmp index a8f0d8e369e091c4a70bc0738a13df37ea5213d3..e9859c35ddfb43658c20f31795ccdea0535ff364 100644 GIT binary patch literal 11690 zcmeHMS#wm!6~=K`QU$!ELYzcMq>2}pfdnK{lBf!TR3KGJUh*SY>_B421rm~x92R2( zu_Q2Ju~9HoIaUCPO$MrxfB{LiSw=Iw#BnIGFLJap3p3Yq@_jwicY3bo&Rh+8q|5ET zefpg5o<4p0jPA$c-?q#ir`kLCe+~L~(RZUiH*Utb=P}MmuH(^YGHzVrKgwkB(%=2b zSoHMxZ4X*4EiHvdj~=Z={}lZmdNet5zP7EcZF(-4=H})}(A|pOi{5bL$dN_BeW9+d z?pquoTin{(+Q@aRz1`m4J~0y})~BI&LicZc&ZMJd$BrHQK6E}t?{MnUAH1gv@=YT0 zoVLj}QV%wpiD&u;U$)U769;-l&})MHCdMZmA=|}R>UU5dYkx=ILRm7-z4Tk_z-|fF zhtMTMAB60eS{L{~z?|_bfL#@ycj~p{$B+LQb2l7~J!twze_^v0{UW;go;{dr8`qKc z`u&FwA6^O@l|OjLkF*@JTVAlB)1z&eZ<yaff5LOra?a6R{V~=e+6KOS2l5E|eZ>8T zT8{Z`L*EsX=c;WOci7xT&nsTAYtmRcUOY$O?$Gk&IS%LWZ3s3++6EZ!L4U2zFFf1# zCixyWydl^w(Kx_V`K9kW*0urbBQx*mAM}_Xj34U+$K8}`oMhg&K+bZfnsFaDns|CW z(?~tMi}$h9ypPm{Y#P>hzdyphzn95g%czUJu%2}CS<B5aS--Ypo%O38`W3)^0sVQ7 zc-JDx8<Oi=&Ac>m%xBmX0jCN!7trsaGk-a9UI|>gR+x5~o@MPzg;F!8S~iq+%ldf( zvhF2IjhwHWRVCH4a@J_6n=wi1iW|{Ga_r9$`EQrVP_Ib*o5c7P=523Aq;_5qI`y(@ zX2u#Vug{q#btQf|v??US|HCn5X~SQO9Q=I<`rWiM_m=RdBp|1^M<pK50%9ytkNU(j z{FB;}9m*dQr|*tPYpuwZMItq`6JuMQNdMgwAoUNd#C}WOrEe<Ej1T?R?aK>-b&;wU zM|R4;yr?x1$48>#w`OJm&ZSz8)`soHzT56N8oO?Ox_?LB2&?nmP!^E?T(Y6mzO+rY zk^9w+`_TC__&`e&amj|E*WO;7vKhE9$iF`LW=SlPlGn@`86$0Pj&J-VWfMh+s%OOz zw?P?vn38X)@P_5|t9D+$jAgv4XV<8Ep*_pz99!2%)H(7VtNb$VO|JYh&t2zN^1dhX zesw7A{?I==?{OZ?f93)2gKo_GgRg{ehV}YR+V}CyU-G$+e)B%6yQJzwv0o0Z3d&<+ zzuE_LWF28Wshb~g)(MAyI}`P51M1gjiMsWTl^9viSl1X|Rp(~de>-Rl=P1=L775RH zL#aPeSCP-Gubi{q;=G(TZu9V-;=<UTpH)XcSlAuiTRISJnrEpI^Vsg<s?d8LYIJkO zr0Bl##^~O%kad1@B!1^}ksxXjYc$6AozKKNzbOLTVD$a+dTDg2(M@xv0mpBB@>)nj zIbt9BTCDb0L(zQ;x&?OT{)GO#zaU_BHbmisd16_f<6?EzM-`soANI6E`D5V32XBjY zwo+pIe=b<ZxJayju9x^@qYgmdYF`}$o~qG|Gvg!hTeo=6g#<>^T#4@bX{t9BLtY{A zyO*^p;@FFKl?FqNa|&WjCDqos4R(#DKT+tXVVHP)Zblsp_1SpVzupY<e53mp`s24d zQ}WZV1IOWy6Ki*gSf9RS+r)2O5}iM03}OeCWcMkF8$0xy6xQ&4iR~@xi#8QoVm-0t z(ZBw}6IK-Ov>R$XaS*q`_+$LWC0p#kQcqa1L%-H05+8mbv3+Iz*k>R;Ua#ejSJOP^ ze+nxZuh{PSHP*RJ_773w92aKyO`T)vZXgdLJjYairPks-=Op$4@G|DtLgd#Mwoi6` zCGUI2ydStF)|oX%-dBkA59B>!lWNTSKZanRs?qvBb~Wa4AItsDdcpgis1vUS&74m8 zU_7CY@cyzMIO~M28LD3FTd<S&6L}p`aY?IRpX2;Cqkfg4-jp{|U)#Ek;hl4fc)q+} zs-7nDaDa2xTb`Gjty9jwx$%8ded5H4ZhQ|8;O}#bBj@~EU4Q#H?aVp<_Q&^5BkV#x zpD*(0(IW|m!}tk~tC4fcu^vRPcYeEQEPMk@!+ZT*U0tC_#7<o!;HgKhcXoD$@ZN6P zX$+1@e*)L9Uq?=OZ-GD{N<7m)__Krlm?%9xJ+flO3MnislnE0isBz`Wm2&guO;e5j z1%an(G~>+pnEN_&=8R04G6jqlS*`Rwb?Q_(d-kl2$9OV+_=YOrd0oAF)vnPuZrpIi z(YVAj{kwAIN|@(+^5jYX!-uKgmSxM9jqpWdm?QVA+k*!WMCVT^lnT}K>C-)76%`d} zD4{)K*2g?Vv*nDl`F^+Oi4!N<Hnb-W@CF$_-3kf{JYn&Cb)#R1e?Q_C$R}RR7u}3_ z)m*!F%}#Wl<K)Scv--w-VgBhxd!A#a{5pO5v@0HQn18zI{L=S5Q{K}*<_F_9e*Abf zE?>S}C^sALCGR=TNVTWAkE{pgeIy|7JMdX2g64fPebCQb=lumvz*#2}-X-b<@OGlB z`qkUp>sG&5ZyLEDZR<9Y>i}L2?-xe9u5!-%I~uNoX9C~Hf{%U&I63)f=xlMuT<?=H zL?>@Vo;j`VY8^dd-{hlP5Q|ILZyG1X7!n6-n{ig2`Doa@MLg3#$hM+?>=j4*M}1%& zCMIP(6FjH!(OTEb2rR`HVk9rh^RoG9FZNCy;OxTPUIUy97;RqCspn-5j9;OjN54n^ zyx6$uB=d0uAMK`}O^%q8k0uY8#z$wfaa&8qeFPuvrk_pj#z$wfaa+ULx$@C&Hkstu zpUN*?qk%hukIrQ0lrirS?`M4USn|=}pA?_9v8)@sUBBW174KH=Q*!X1&U0|i72i}_ z+@SbU^3LR+$!{q>2jf@xmTs#Ht99_RPJT(_*?cs4W|OzY!H;O<yFYvxeD8dpRLxAQ z(MkTxKWaYulWpLmfoJm3<e%t|$w!ZHCWC<bAHE!t+T!ippW>s*$LHEt1}G)cd?ESh z>RId3_-HqqY;y9^)w3%VKW6gY*=*d_{;l|EpW@rdCqGSd<D>JzBp*#)+sQ}ggGIkG z@zMEUY5v~HN9Ti;jgKA;p3bjqe6$z5XMD6OXJg4nlW$hMWHb0@@@?Qv)VROGr}${_ zpSp&+jR`)dyn%cvd1vy^<hK%hbg#s3gO5J9G0b)Hvrc|V<JvqEcxIEg&6pbCi>&rP zfZtx=lg7E}H9EnM`^hiEiHznWh2YUT-i;>kQhYi2C-UCjaWpdUPOSznSE_1sf-fuu zf0p8-wWg=h<fHeLtTXv&PxcNa#YZ<4S1LaGR)=GCbkq1v@X`Ah`pCPbbCaXPp?2Jb zj~+b|EL`~Le6Za3=)AC8_~?AFvhmTQ!qfScg^%`z_l%EbJsV3tn%_3~uBke4>Qp!Q zgMK`dkM2Kl@}!S)FW;_7zNrCr!7JdM?}2|F0{<7mZz@O5FM~hjI{8_XOVIV1BfgOo zAAJdY)-ZS^{)>@YCvHcA@AYNkI>=-Bz%RSmXOdGN{`pM*$Uo7aO!~QG7dtx0%c&Yo zu7mr}wJ$eJ?w9sF51iRL#?wvLi~I}l(ZH!BKXw;<v=<vUojc&8f#ZXJ1B2jg-SoW3 zX^)sIK00JsPlZK$mCxX#89y)YchjL?*dOmjU@YQ={Okr^&1LY(ZtwIWr#<f}^Q#Sf z>eJ?z<~rctjt=m+UVL!s@V;PgBlzfU{QHnoH`|=|k@wiVkGf6(-w*$SLpkaM<H3C# j_rOOpeym^j!ACP+%=$$+*I5r(@65WD=^6JlFFyMJ)|}cr literal 11690 zcmeI2%Wo9f6~;Y7q`-O<9tndXL4h`p?jDpyHVGJIK#Gz@r1>+lh>~EpnS~cKybKW- zy4qHxkewfx=Yln0!2A=DCOnK1&n)mHjJuoU=J(yId;7ZRs;)3z+L|+`>fUp{d+OYC zkE=d2_^a6iefH-Z|Nj*E0GUAE>)YA40lhPs=Q8*)eSPtN8Z(2(e)Icave4ys3Rum~ z&hEHz<Hj)Z09iy@iPrtlty{M~>;-f6>eY?djv-6PrR&$P9|3pk=;-MC(u@t>ym@n6 z^UR&Sd-v{lyJ0fF8Ck$~TG!od+}Q2gx3^$3gFH^#DjwE(!uaRLnD?Ado|YXxr-T>A zM=a+RPl$tEKXwhq|Bh}-GZrbAZVlNpcMUnCu_Vt+ird-X_c8O!i0LA)82g2@1%Dg& z%HMYUYFuA&b9e6C*~NVpj>CQx#;17k8A2W+;X0GtJD*G~f4BbJ+}tsIZ2hpt58OCo zPm5q-^M&(Ky>b5>X=)$cxbBh6c!IeV=R+);7+*nNlK1bsaqgc5_L-R4SLdU=<MRS} zr+nepa9A#1+DC9NyYXZnzwQy+GCuvz2aG!QL$1EK_U9&9Ckt;G-;W&*n6|#$d1vlC zSW{u$D?aR0AIhKlg!F{Q9ZpjBvy7|V*`MG%eiq`n`EFWvtflj~5S~ZbGPapHo$o20 z`+ME|-I#277WI<_UAys6C;jUJ^Xgw0u|Ev%R%C-TYaL<yQZhdl)@6tjUgOgbP7R-V zWD!yQO6z_YT;D4~zi!uNXx|P~+dFJ(r3c6&(n|CLGh7-nC-?X4(Pnh#Mli<ANNEXu z$&BndV*a>qs~PQk-|FFggN%>I^QE)qx4XOcX!D1In^|*#^`~{+EnYWfM)q&PZU%Xr zwvFQ{Jz>qy`88LpM`LG322NSLAU-oZaNfof;F#gPJHeh{{3)V*J>}UN=48pA9j%Ma zHO6g^ws}^5h`aL)dynC}jF>L6%sT!IfwRr#@5JuyjMuRDJ=%P_XIBo6!+y0YzFH}= z`&%1$2(ItZ<Y2N(EDocidEV4>#PxIX$G%5{qx^JyvafwFRK4Nz9BFDF{TjN@_7B(a zJ=*+k`zCx=keBAf9^a$cmuCgBI&mrQwbBc-mie;#IN*EqJMH60sc!dC=UDX>oEtOJ zqrO({ds1J?c~9zoDm*`Ne7^3rA93At9{fJpb5xooCf}p|c^oNy7UDUdZrYw7ok#V9 z;5^FK_KBL#cWKJhcIWo!#CF=^1i1;<jN==)VDmRzy2$xDZ2Q(HeH*M+KeK(!_P4RH zE<>E~T4&9k(~;6VajLH>UyH24J^hyb3hnc*znMI=qur<ux1#EUW>i^hMU_^ps}I^y zdFXY$K##t9cq2Yz_%5~T<xA~)`G~3iB<|7ZcH`h+D=Lp`zS*dpHRBmQx^Zwbb_>KZ zZMe>h+x&U|mR7wogFH^#8scHCC&a{ibip2t9rmXzUJxJ8bKb@i;H*Rke%Or4Q|(6i zEA0Q(j;c$<{g>B`a;HCG-)>Z{HKVHS(aN))UvazVdNY3Lmlh)`|A#r_rCw>X=9ld& z2Y%*k&E%nN@_#*kaC<wd)VTINTJbPO3;{;!n)!d2@v5(9Y$NS2dcHkT@jbd-uUy0S zzj;{1)^1I7*5?_HF=p#0%mMj)o{tm9+pJgq=AKja#`^MWY9HM=`F>dhi=01mKITt9 z-6S0O{`+#(_h{J^!NR5!SDg13j6GbHuc&&xSH8%@8}bvmxLm&QtF`J?-=kM15B-RG z`Z71RdgY&Cy|)^by7tl6S8#6LMActYmtP^P>np0h(K_wuz|UPwzP^(49@l-D_vp^~ zS*d@t8^0OyXX{=yN`3!THR*9w_fch*XYTZ9cODxR-lIEs&ZnD}ojs5AgLJ>p^OK_| zJl9lM(_L|_ZFL&kg)ncSZQL)a7r<O1pBH()!?u6TezHMY{Y-sL^Tae3)@6tjUVn3? z+Hd!l^M#N4Ds^b}y!x&7E40tM);qV}y^(dUqafEoKKl{9N9sMRnP{CspZDaOFPH1U zUhm1v2(Jxq$t%Wu@8sLbev6{t;ySR~g=FD4Y~lI%z;RrMzP<c9*i0hMCr|sH<G$U& zS)`u)?<sJe7R34jJNuKxbug(s=f&gZ{ChO9i0jZd<|?iO9QAQ$pQrtMwDJzlTU-Y? zMf2sqJ6yi>Eex*j(O_vGzwQy6_PHOiKVW2X9T*%#vhalCztf1r)>j_afxY6>^D2L> zM2oi7xcyn@I^sN#&o$#Zk~6UuJ^CCq+>?*S=1iJjO19VXOw5Zn63?9b9-Z*fv*h9t zXVJeO3M=847MMHr|L|X|d0Kd3e2k4Lo}xJJS!55^oG>+({4QL@M?2dh8Z6(V!PI{F z_vj-2X&dk&&i4s$=F$GFrtON{gK-?Wk1T@g->HiDrfqV1blSA%eNK<=>6<ptbMbuL zdUV>f=Y39(?&+I0=+UFo=9%}dzIycNOn*1A-lOA8kk2*i(U$)c?>thv4_^Y`W_c6o zdzR;dhjaPQ(w5JGf3kdzcxUm?;!nlrSRQrYC_LU}I}bmb=9e6<<&I)LdM4y;-F&EH zp2+fEkJ6k}63>F=mjfO-^iN;&G6jD;aGGa+6vhX4G)69FG@tg#ySI2F19QTZT{k{D z&p$mE=Mg^4@}l<d2j8kk^Gp$P0^IqK_fD@{<evRL4vy+)QSlY=$+F4fqqFSu#uGkT zJm4xmI?pF-F3$Vgd~}w5-gv?j^Y<S8U7^EA=lNvKk@rkKI?JcqxUa7qKDwJ<dMvK{ zbv}A6`RJJcgO_Yn?!%vmZ)+y{p5>zht|`4A?q2*1T+2Dj=fFFQe-^)G#OI*fSE@(F zyTyD?^-P*y@;H_|f{%vt3VB;MA8N}J!Fz%ED9uU5{8D*=n0Sva)>|$ARWF~8@j84t z7-Ke`f;cWl;gP?&CYT!Yd||*xJKG}K^M&F??cWbNd~gx}v<=T0!9AZq&%?KUtM}-3 z{iEZmAMtG=H<@0u$bA+cUBowSlf_4;?TXwde+PJrk1pbyw#nk7({@Gf^Z4i@{?5kN zR}LTTZ1Z$n_v?K0TJq7!x266KmcCW>Ehqj?`W`Y=<l8mj7A)7nx0n8n-Jrgm_}1JY z&Dc@&WyZyY6yiF<f1}o|Ccxeb);ibGEjb0o*pGFtqd=aV3He&*I$Sbx^g7oOCx?1@ HC$8gvq=Xj^ diff --git a/dlls/light.msstyles/blue_radiobutton_19px.svg b/dlls/light.msstyles/blue_radiobutton_19px.svg index 116c68b5fdc..9d2528e61eb 100644 --- a/dlls/light.msstyles/blue_radiobutton_19px.svg +++ b/dlls/light.msstyles/blue_radiobutton_19px.svg @@ -5,21 +5,24 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/> <g transform="matrix(1.2106 0 0 1.189 -.18477 -.17782)" fill="none" stroke-width=".83352"> - <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> - <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" stroke="#3096fa"/> - <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <g> + <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" fill="#fffff9" stroke="#aeaeae"/> + <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" fill="#fff" stroke="#3096fa"/> + <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" fill="#fff" stroke="#2979ff"/> + </g> <ellipse cx="8" cy="56.08" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> - <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> - <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/> - <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/> + <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + </g> <ellipse cx="8" cy="120" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> </g> + <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/> <g transform="matrix(1.0159 0 0 1.1881 1.3728 -.10631)"> <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" fill="#3096fa" stroke="#3096fa" stroke-width=".76202"/> <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#2979ff" stroke-width=".76202"/> diff --git a/dlls/light.msstyles/blue_radiobutton_22px.bmp b/dlls/light.msstyles/blue_radiobutton_22px.bmp index 580b466b2c9fedc9626edd2f66e8d1b5acde1e0e..c489a5171dc9fa637fcb63bd2f4dd80d0adaf9a6 100644 GIT binary patch literal 15626 zcmeHOYj9Op6~<936ebRgcE*7pwK6mbElFhr;tOPSs-vxs(N;%<5GnNsFgkQ3Ng11Q z937eZ0ERHFv{8%H(!6-c@bVF$g@jbvV#^y;Ql|-&BqY!zH_7t*_Sx&)eb2e~o^wt4 zfs;L~?0xrM>)Y$Bz1BL(UYGgz-TJ99rmexx)u7uzji7gpxqZyL(N}#EKSE8$jPd?) zMdsi8wUr^3h>7<^tn2d5ojWHsG&Gdfd+h|e9!nh8bB#R8AJx~?)Qp8#Ij9RH5!8wG zRg}qwyLIc<$>3{ou=Yc*rTAQcwF#ug#>PTB_h*N%nX>7yEoPhLJq_7;>G<5ay1Kg0 zfX-N%i$QEY2XKzs^`>0x2CPYtJ78s7T$^CeO3tG{zhlRa52#L%xdr<z!`fkxp4*F@ z<C?=a$<cci=k0!aMspor+WHvx%Rt8<>)RAO^DSQ|pBLlB{0trTDdw(SyWWSnY?!(i zv3<QEqi4AY`Zo|4{Sw8+csb|d5N)Dz7}IwsR|h)9@wRQ-?$mXBZsuG}I;?WFwYB+H z<|KNahv0c8=(^5Xo+$iom4p5AtW39Ji~zSsafxAZsq2lhLnHTa&kdhfa4rsII5&va zms$C}`aIUpUXFo#jJzrb{{57}UZt=J<B)cy&YxBu%rh>sVW-3eu;vj1)TMa<cqWc9 zcS`4oZ}nb*^&_BOOB^qE^`vf?)BIEJ=r#_Rt#-e^x!B5+skbrPWMxzG4rQ?46s&2U zJcZA`O)_DEe=g{>#cZSP((zhs)tk23i@7C?#XWoWj3?QcdI<L1XYt6_nh8_)!TLC0 z(cb1P9a+i;sf)anQTeDIyz~?LApQF!<juKpZ0E|z6NM98m#V3GQdzh_D)OI~%7WLW zqM#deP09;SN_pXS^h;#rH2)nCln;KEr8D0P`R{`+gCv4_u<wtgYUZs$9QU(4GUGPj z9PqK8__oO5Eh2B85$Wp@>Ax=0aZcoDtw_y7?w+s6>N`K|V(C~arhX83XAS1h=Zl;= zD3R@7e;4`Hmn?pMyOdA6L-E*~XRj=1GMF2_A=2|!B&5&K*DLb0ulsSSn(pUuDbHVK zFn=~zq`Tc0k--6x7dMMke^cbKnI3KYmN&;WZT;6o)_&R3yRzUXM%PDXjEC*p4ep7* zC@1jW6j}FG*M_NMu8~LE#p441A<s4V&xfR9`qvF+^@GYGlIYKlseVFiSMO(*d3#qD zE{7lf&fp%bN#gR^RW_<8ueMkIq;mTpf7D>`IkatfK-Z&t+Fl#a#?#|J=-bTLwH41O zN>5#{`k11M3=N7rdKYB}M~q7yw58(SC_DV#JhOXlFFX_94(ZQre`Y`XN;Ee8j6SJt z^KvUwxB|HbaZ%7=bUyJ{<*;#)1v?lQZK-i#Vou|j`KIS`5}UfvCXAWKKI#$2e0EpQ zlsGQ@DKXh>&h_#meK*&<lgyd_aPyAAHhHq}oUzB6&x)LRA*pw!(Z637`StyJ4jr=k zu8$Z+13$dHUU<l0)9;^LD01YFBJIfK%!dPSi(LMv$V>GizkOKq3~`SKb8i5844&f_ zsmxyq-nV>wjjeFsi`@0&;IjuY-OsY>j`u@mA#z`>R1}`T9#=tpZ=OcK137ys-!ZOC zoUv5jJ#k<|acN>has9xCq7wtv#XW{F_U4L9$rA^QJW?}nY+~a*<-q6yNd$E!s*6@p zCL8|sjYX4z)1p|3?Mr3owOSdzavo=fcMWLx$~iNa*tXQ&vzfB#usNToE^Z@c;t%)B z@Eb=nd6z#w+|~l#`wV_!WAVixHlG8wJZdl-%ivSpzHH>6uS*gQWvY9NYZK^MX)rf` zQRMB;B-GG=3>|+~5_R8^f!}=GP@-<3nG>w}jo7L;>}}3z)AUKeG-ovYMyt;{+}kdR ztq-amp`L5x(Kg)HtUR5@m#T{v8(p^}ezXntXT>DHkpZ@=w{w<@V1owo484xnv~B3s zXLaw$o_5kk-!c1D-&2SF6vxAz7j#(?wF@HgC}S{Sdu_z9^C!_Wjy(Ug4CaiioaIyg zaKGsj3X9)2dv(2g#JKPizaeg{9@O=Q*a30U$URceZHw+3*{3}>=BkZFWyDQv|DOLi zLO*-%fk;gHFnP5xpBOtJ4~iETv@>$TOUhz=J{xu@E|5<QCSpwUrys{#@Vl{_8=%Y3 zt6OXwmmrQy%$WY|>M3p<Bgbl9lV6sM!(Of2FVXnjRBZnVG7O+c0=dfSnv!>je|_DI zDSn=W-mXnDAcCjW<W!>%a%?b9s@}v_y$vtUl73=haR7f~fjAy|tq$k>u<FRZH4~;{ z(<av5<}8Vyg}TT~8I_Ofji0~=t$#D#do7(bb66u!6i#rR_Z7US!Qa?yH^qJR!Gj0o z!i5WR_3BkgBoc-=<{a1X97?h7tM~5RE0-=^%H&@Dd`Cxz;0{Hxv))%9IB-A)2Ap@I zkCJ}S-`_7yO-+iOa&KhsU1ay}-9kQX9Is!$Ugpf1BNHY}FjP`fV&;N;j^3gBYWLaO z+S;VJxER$ER!qXgHS%bqO{~3B?yC<SI;1Sp*VmU7Q}-dZtG9EO{(UviSlhaF>(c6| zcy3QSX(NW!*}t#u>FLpBnKf%xY+Tx28-38?`uElJPi;ISSEp>_yu3UWGyZLH{rl?w z6_+|_BZkHG@2hWs9n5{Tdv0sju8nPn4Ce;5z5D8*pA{7qMPk#>=#$#i&w}^W!MMnV z9gGXgTHA*1tC?@y+(2Duli9Op%lPr*4RK8WcJ*XzIC1R1k9p6Ez0AFDu6c)gP{!(- zl6T;rDfiWJ^CX|0ycRR|eKpULenKA{92_*Hd7Wz(kNyAcef7=wKE`>B){hx1F&pa` zc&BUKDfB*uJ?F-R3b8>pvVI&Aia7!7to7rVFd;VN-K_QFkU-3dsQPhCm=GIkh<UID z^N{~O#+mx{jF3Rg31V1W|9$M%(PP4d*aCJi?_>C%U-u6Q#GG)>4Qhw$$1!0-Y`}`F zABTh@CZKEV`f&u5zZ{6;wC`g)%V_-=7K5#B&iZlr-4k)oUW&W$dV3F!nr;CIcjBDm z8hCuCh!{xK?PF1wEC)sxNNWh0`cB-pucAygSb22XWMH=Vc$*fBG(YFn8CX*xwV(Co zHkG=2HB&YnwufnJe2;%#<Xp4<x}3Q`cSPjzdo6zc#UQr#?6w~HB<?Y<=Wt(ry-VbY z1&ZC`+5~4&X`X$}=R|t1WY#a!3b9ph*qio1tz?paM(0~HNk-3~g-yJ3##zFbDhd~y z&rjjLex%Jm%lt*aY%sVj&yN(<^Ak_!I$)kMxR=h49GBl=ATGaqVPXhl`sPR*za!!4 z%kOqDKHnK!>gM4R^TybrvY^rI@lKu_^HO<XnZbPu_p>8y%qO%1bDb9#w6n<h=o(hW zt(i|e+jeRG^yBy!U&t*t=q7F)Bgbl9lOIeOhrL?OeyqXfly{J$n5&Gg$gzQ3EI*t& z1#8}SA*gp8n=qd+r+Uxd7R-~r-X6B6H+gxM^b^J+zZ0b23u@VlHRKZyk9}(<Ods3W z#N<uyER(V>j*juJ0xx7#KB_l<LLa1md-2{2y?V{q%wY|_6onI9AFUsw=5n*vk2OxC zdbjQrQ9q7?3a-bh9|whEevYai$Ak&7Mb(c(0x>6|>c=r*!fX-s<FG)?nTYyvOq39t zYln38<B&ki3IE(O)sJK11li)$kApH%pZR?hTd$0+A4h@dx*Nx%_2aaEXX*QGw0`Va zg8xqkcP2OV|2vJ=k2OH!^?|xm=)T&mlf^?!a>c11C%JPQX<ZNgl(v4H8(NY(s(zg0 z%xx4^Kh6y;$?ep6{rhUSew^gYZRFtk_tkFwI5)H;cfbyz`f-vow~=#haEWmJI5)H; fxB6MO`f-vw-YA#)aXdu)xj0%s)*A9nUqAjYY)q*> literal 15626 zcmeHOZERFo8LnC7V;3<HU8C@0T`QeCWjj;R_z{)T#OM$AkI}>*MhX^U3~f|4bY|L^ z#u$HS;tyh{Zel|8C(;iDQD{j34YZ}nps2J(F&nCh8%>LJH_|a4pXc27oSxpfU$cUN zWG1|vbKj5WzV|&}o%g-d`Qp<bZ_=Od;{O5Av!HR%o0^_$dJ65}$M9dxM>RG1|0q$N zpZe_48kGdbn-k<leD>_wZDV6&U8DZz7MlA)?2l4L9iyMro;Y!06U+*rWspjsCCK|| z6Nh{9<jEb-n{luv;n!hYdys7*jgOCKg?G`>o2G3TwqP!b?gDH(!t`9;$jHb(&~34~ z8^q>w0Oz{MFV_<{U~Pxp6|tRhV}g5@$VYqU%$YN9H$K5;1MYVOvTGnSZdb{p%+cHK z_}xdo+|P{BUPqU)uJC>lRDrFHDReqTZ;8)~{sCUYhY5pu?%cVJ;KgB@dlB3E4I49- z`{Dl>anW`gT=aX$OGAu_u|uD8hjt^NdG=4AKHXyExSl32C0#Rir%s*9h|L^Yj)%hY zY%y}f6P+add&Um&+bTBq495R}d*9#^LvZQqql&{g@8OOcu6xN#LlNT!)6s)sf5AMD z%(ELQa4Xa`cF>=s4er&2m~b63&h+^cMhASZi#Y6c>jGFE!~iXueE@iR9fLP-c*GaK zdm*0!tq8H-<N8V8z%%<#!SQV~FlXg{mt1V46V=L^y)3rt_8r>bemfyE`{X>XZA_vt zp}!ZjAef7cU6`(58^0N=3*dEgEuKGr{uz?2sY8h8gy2zcHVV_+2lCCpV!ZWOI<~YA z(lT{vW9*Y!=yINL4sw3a!CsFW`@%a&og|!~Tn#pFRi*3~RWb8ZRr3CzirziYYpUSQ zsY3Q=XuH+XUG@wJ+6S-I;XQAG{ntQ$2dM<QkNbX84eoh5h~r+Xm)f2M&J~MQ@_q%s zzN-4Nt=j*W+MZFxT^Y!~47^`hy`uLUHPG@N7t8cjvH2a)`=jW-q6)2_HnONz^=Cc` z{ongGnZK#RuIF7{{p=<0vdCxXw=0k9t79#1RmJQt#h;sMu+{G4s*pJ%{J%i&-3A9b z8?>z8U4tC4)O1zzAanG#K=xaWQS!b`K72#W@C+QI{>+P3w}00T@G6=gK7JJi9jjkx z{UCJz19}bf=UuAU`Z=+kvN}D@8^MdiH1njwXR>xhZ%kvAvOO5@AN#nOZ&*3`;XWF? zwH7g4v-7?nb`xl?>pq^t%8TA~dR)(*#~d56`zzW--FIW<kI$M<@xI&hSbe_fDPUDW z|9%L#_B;;YKB_qUM8~1%j9W3=>+=%#2gSK;$E9S)Z8CbEWp1Rvt|-h&2Y1xBfnR!E zc(01jpRqc6UBqIqUl;u?9{`437sPSa@hhsd`<)hBuMZuQDcGzCO<`Z|S?4GA1ju9^ zXTM|Z{XN(0kJI(<J9f|foxAU7pY=YO{S)rXdHZLq@lTrjMzyNn`!IBGip{HPVE22& zbm=GdykCnR@h{=b`HDKW+td3Y&IL8#y-$@gU6B18#CTHgW^nHf;_JP!lsO9Be~3-o zx?90>eJl9vK}`2r^*#SK*nA0NbPCUK3-|aZi09@4+A|pI!#rbLn>2k@eqr0{P`;}= zlpkFk%H3Km=kIGm-{<AKsFMbZI_gBnrs{Be0T|05l|W0?a;}dyarmzf=XL;R#$pZU zCec6qVCemx8p0d}J@{dJmb}$+`$el)&QH@e44eFFIlm~n3)SI#N0^?=s}AM%LH{;w zpno@r&F4TYuWQWV{N=jh_M_JA@coMTGvmetewKuPN4>nq{%xdAwr*G*&K+4T=dM96 z<Cecl9%aUNrLo0t#G8EK=`pI7+wJ#biFHNp7dCzs_qnUXZJnaKq~}sOcR;S~_hWUu zc_VmnnC3ne*KcPm_ag>lf@{AYL*64iV;|ijCMF)R!92kjmfJ_r&a?loa$AcdpC&II z<?MO<;N?9Tv6(~5@lc$b4zA{<!_BXq$HzakRc!7(1l+ar7`_QE{dy#Ez&aV1d#sJy zaC@)tl4Be;ZrrPea|boXP~Lt&mU(s~1$KqHc3k}ZL~$RKb-_5R>JQrOcR^VfaoB-% zk?#;cmd!rktmApZqYv6|KPFSKSrJ0Ny~p))-8#k|Yy4N=|Hx+8%*y>Px!6W0s?}>2 zdzIL(+jnU5`ti1%&OSNs#v}@p`w8$Ch)G*_zi@4c4ISe*<9`9y-CT?6d-%Qp(raoc ze+c{u;t9=0VH$kKMB=T-(y=udZo5of+8Fz!R*wbdpv-TscQbBtng<zml5m1@<|~+| z!FOza8u{vAfShaOBp$1LHC*GF%X5Zj0{2<cRS<dhJZ9bmzMDK(Y`z+H{QIQ>Ld7JM zD6@a#V9q4wtD(=mFAme(i#pbCV8`aGq1yv8wn?o$k1^k4^VPtdt^?Pe$4U8WU~+tt z{4{cV9wTSD6|rEBEi_+UC$2q@F)w2C)xdoiaj3~x1Gl%1IE0NGLQ$Kq1}5j(jTG3N zXVldnU?t|Op~yKOhrMoH)RV6UE`4E4m{VF2VxRNd`WaZq_B;l^k*`Le+z(^I9JH*N zV17Dy{n+HI8|Sg!=bp&=u{;0b`hj(vbRNe+)yOd4)11dOc4-*EPCAd%z|`oZIFD;= z(lAn-$7x_{bW)thH8yD&m={UsaT=H!oj@GI&f^-JGz@3lFf~HY<1{ceI>1VE9@p5# zG3q>z<Djf8u#Ow&v5ib^=Se+}RpEtgIzM0XP(#sqaH&J0Pabpk(5ZdmaE=;$ZWHQ~ z1?13|L2)^I%9fCC@1spPn$Kmu5|}d%-lWdYv(CVpimt1)X8oLf=AxrF?bbTod-#}A z<73Xhkm+#cVSQC<*$3>~K7QtI5ZixtsYkMoTvyy$w*yydKzLRsCK#8JJky<eYWe0F z5FcXuek0!G3s1%<v)Aa>+oJB?DZXJWF_((j19ENi)%9W;eT=z`WoADx{aP~KXE5?N z+WPZE&&?6w&TD@MT3X&Hp0Sg67*O-XyBDTb?7RnH^y+Q(I}-j{;=3JOpNez7UYwx5 zzixCKi1}#ZQ1ZsLzYlZVxGxp52Q_Zdv-#@a^QFB84(ic}1NS<AtuW3?^?5d5ofgaJ zaX%6Nmd!rktmApZGx}*-@y+Z%_B>W!-?<t0nw9&Z23yB|%{A-3^Wy9~^hq6S-U(d) zT?o#R6fwcN-79re?(vJkebPLuU>m=wdjWRcc;}}@*YWLpL7794O@OFFnvKG=*g7V9 z-}J|F&DLPJE%rg^!p7JqwR$W#2RXm}_3qdG+1EVCFqe{Wf^uCyXw;9N$og?`ETgX1 z)twUR$59wj{519BDBC1{QvEo|K1z;SPi*}-$}WkYR6kC#kCLl|`f-$95}&ngsjG$7 zkCW`9<Zc|o>c>%bNqjqQ5%uFF`zSeT(R?2zwtgIC8^y<Sr>-AIVFdZ>)^VeLY-?u0 zIPtnsKlY>2_`TEr@Apn&^DvAT$a6LF)yehaurMa_0(sh+-#aA&L?|@!)qY?a`RaA= Zf!OcI%*`U_Zhkk^_`MUR%j2G}{x8-y9Pt1E diff --git a/dlls/light.msstyles/blue_radiobutton_22px.svg b/dlls/light.msstyles/blue_radiobutton_22px.svg index 45993de1038..a8da8bfab35 100644 --- a/dlls/light.msstyles/blue_radiobutton_22px.svg +++ b/dlls/light.msstyles/blue_radiobutton_22px.svg @@ -5,18 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <circle cx="11" cy="11" r="10" stroke="#aeaeae"/> - <circle cx="11" cy="33" r="10" stroke="#3096fa"/> - <circle cx="11" cy="55" r="10" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="11" cy="11" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="33" r="10" stroke="#3096fa"/> + <circle cx="11" cy="55" r="10" stroke="#2979ff"/> + </g> <circle cx="11" cy="77" r="10" stroke="#aeaeae"/> - <circle cx="11" cy="99" r="10" stroke="#aeaeae"/> - <circle cx="11" cy="121" r="10" stroke="#3096fa"/> - <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="11" cy="99" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="121" r="10" stroke="#3096fa"/> + <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/> + </g> <circle cx="11" cy="165" r="10" stroke="#aeaeae"/> </g> <path d="m17 99a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z"/> diff --git a/dlls/light.msstyles/blue_radiobutton_25px.bmp b/dlls/light.msstyles/blue_radiobutton_25px.bmp index cab87f62316ed9d409412a5b32a1c30b394a6e1b..e3d239011f149055f47dca2c5629a4f66d80af20 100644 GIT binary patch literal 20138 zcmeHPYj9Q76-HaYKYjes;V}i;aXLh5NqDtRr>(UQf$*x<`uO2LL$S4w=??_7=0~eD zt^HAjn_Svype<<QgNG0vW5|yd?U)e3$7r$Oh$JRbn1Lcm?#;cc-?z_R=k9xR?m7G1 z(I2JR!)Bke*IM7&d+oK?KFMBi)AIHe6HNIv{(b;;D(XK_ub41v!pG3gvUEH;MJ7xL z{;*GOy7`u$J4CO?k9%<iOdTB^lb?O|*~O@>J9g~oM%#xvV%wL{wxBL1UkX^m+T7fH zC1mfmSb{dG_F)W7U0q#XQ)q8*p8@_}2lv=B&ph)W-f!5oYu7Z;C$Z%_>Mu}_q3RfV zcJAEynYcLtYa#dtDTC*?(B2{<SH#JXjxpT|-hWXJb$~cgG8{kY<b%w9)K5q8RqMmt zJ^}3As;6>3w4-C64(OxXnPS)G4#@68b=Q0+FmESac_{~;eO6D8yFTDuZTpXd?^7zX zd-v|oqQA$|)aGR^#@0<fmErusuXekK{nkJGi39p7<%QnQq0g*MoDNGHgzPMp#WUB3 zW9cLQ(@#IW)V{y0Jk~x(Y=7CftMvi5TkS?a0H6BXVvILSIq)zPn1bg!t6|0UbA23) zhscY*3|eDv_`#Qyj(+tIuQ{k*$n8)J^l|@i?2Hd)EkI{DGe!Hzld_&x4EWA;D|;I4 z2%ph6N$J{WdD7?^Rt)P)lpRKWk66$#Md{kd{*<*(F>Jh{Jol7Y57=#y($TjkCAN-b zmtw&7UnYiKkIj5W-+G6BSB*OEa4;B0sk;@}jeLf_UZvB|`EGf1j7e=z#r`;IahJ5U zwOxg0vnFU)svhX(K7XHl9(B--C*Z%u%Jl2`g)y(OeaF%FNmq}@e2#EDD#Lh(cb*Hh zO_TO#v)PI0)4A;hUs>FR4A<v5RPLo5TlDP)#+_;(Vo?sX4pd`%H|~-SnVF!O7zo+@ z91r__3(pV8Gyc=IXMh*Z&BXxrBGrTTpQz#bxO|n*kXr>zV;{=nIr1D-IXfR?H}G>z zFQaZ?JOgbi=4Z}xzO&!bjbA`lFX%HAE3UQYViV*|EJJHBV%jsHt)>1r+$b9T8e?xn z%>skx33W2QvF%|$&mZzd$@}!leb-Kw`{yi{b+cP#U0pY7AL>ZZ&VEVO*R>cr_<ZnO z9%-I%CFJk6n1VK`_R0OTo22<huWvY6J7)$kdqdpctrF?Xh`jT%$oWB$(Ol5-y>pWY z>7_CB$c8V(e#2qj3t^W*BlGCZBCj13DHd@&#}v|EJs|R%@2IW;;<$FvXFL7@ga5~S zM20TJ07sC9FN$ovx1^_HKC~mS1N*c!i4;alAjN{nvArUHg8U<27kS`|LHp+)qQ3+4 z1YHZ|+AzMrc0KO;$hzxR2liQ9KK^s>ifsIz%0#ytZxbP(7S2Dk+idd<XZ&+rUBA)s z`t!;ua`u$Suf7tETUz6QPQG)eOR`*_fTz#mFE#IveYeEJ`9FTE^7*x#kJ^oXp#H}F zwf?%S(Q&Ayq~quwKitasaDB8qzfmzV!0$0SP90OK>mSPJ*Z%oOB@FJLU<`~8!CG8+ zzeIodYf4YoK5}CT<NScio`w#_pJ4wg2mQ0s4nFS>&Q%1F{D@)<1M5A5ci~Kl{_t0o zp04Ho(ZaYBjEiwJSdVvKQL4z6A1FOt%YCZl)KQh?dTciOy0S_YIr^N^)3uBTS{O&o zJa8_ouWK~VkMl=ZTg?8zyU!XZ595KmKOVF3c>Q%tq<Pj=zzWvn^-k3i?DJoy+2>9? zVZ07>_j8{!?&5uo>3bCMYWP3pdN@BFYgEg4z__D@@rvgHd2w!qalL8&M4TH(P5+kF zW8*H@XX_df?wbd$4_d}?#sjqvb(pw|xE+k8*NwYoE*t7*hUZhQ=Lh|Y`0MM=$o-#> z{DzYaa~6eqe!E1(T_3eYRLgj+_Tf2N<s1y{7R)EG8^^?We5h4~@r?0C&vU-BpY*^s zY<qd0Dpp);&P9G_Xe=vXxOk;!W1G6Q(mW^iH=OZn?w=t3AF(<a-xx=GZ2wa7#f>?R zCXZb^IlpP%;@qZ&*4(E0?tG@cFPEtwvF%H_%-j~z$rpzcMdLRdaPPKQ0^HbY`Mkg3 zhO+Z#0JB$d^MAcf3O$>pIB-mg7qRAroN4)9=*|l1%8Rz=(x&)tIM`z$_y#GH-?m%| zC-@D4vpKdD4PX8*%K}}S>IaAuWgjzs(uw~Z_R=t7LYk7hD5D)e3H4OYhrSAIW1svU ze4DxP0ndfE_8a;9)^AI$b)m2w-S<<|U&))_bFbR2>>DoEGIw=gpA{k_rI=Vee_HZS z-KjE>ZT_jdgnVJa{2jXm-*E7|kxYF*bren>3R#Qi-<4e3O_8|dEvw)wUg!&DxsGPc z@OAq2Xlwma^WJ`Y$iw+3jlWC>*AVk5*{vA*o7rEP`YieBpIQpX_mz*ca@<wkxo%nt z-K~m|0e%m46bD{Wa>+lcU{%gR-$(cTEX3gcG5v@Sx)$<5>Dwo_<y$(2RBe7Me$KI_ zcyZ9kA_km>t`X|v{?$VN)Ul;%vx^i0XTXSJ43A{yzGrlN@b8eG+wx7Nr)s%xv@q@v z*T%A7JqBM@vgG&PmkL|w%6+bd>udV49=VqK&3rB#`Gb<BaJ-`?9c6w6KMiy=w2o%# z8~L1Xza!LP_6Ob#4`@Cu_fz@)_`Z=F%`_~Lwi~a~H7T6z3iSm0{2N~Qj0bK!(S1&z z)$=RY(y+$NWgFww#WFpdU)(%6evT(Bh<7{}tW4<}E<1lB`i>esd+@VRW!%O3<oEtq z%)V(|U|Oy(<3S}a<F>^g^9?t&v0)}?!TH4V!->D)7~>w?^CMG#W;k<w<To5*{Gw3L z_LYdkU2&)(jq%#C&tSE4P|rp?A7eLTJH+Ec&+mhH#&{E+=dYOlJm}UoY<qd0Dpp); z&&4K<We$dm=RTjwXXdVz_8Pw7;MaElWZ`>9tj-bJGCpK^{?Py9#vDhp_Y0TBU211% zr@ZmT8*=vSSs5A{l0u<iTE4TNbo~BOYpT1{0|yRBUtj4vAavA-2lA2M>hiivJ$(4E z<Z`7mD*|>*S3aMY7hZTF)Dw4?O8lbpJ4D*%i6@?r6)RTAv}x01(xgeIUAc0lJo)64 z#&)WZa+J68iM&fac<^A^_)nfZDf8#gM^*qc1ETAK1q+0HS~!2lZe#9J`}_NqRZg5Z zA=g}UO;v1HC;8rf`|VJc>tp9qc9%;3&_esnn>Wu3Uv+Ull+)t)TX>iH=9_OSS+;NA zo(f;}aDBAUuQ?a|PCmR#J$LS$l4bew<u&P8wF<u@v4#7GI&fbR-lcMXX_-28YE3$( zPoJ(3a_Q0~U6b%G)wL!4Q|F(iojiGRsDpTR-NU<7cOFxwOsPo+_m39hsc)e*cd71r zG&VNYq=WlZOT~JayHwY&wr$&1lMcoME$Ua8LwJ{Z=uqirDB7~2p&^wX#shavb$`IG z%I;Dt_xaUVU+txb``nEu&ORS=m&$m>_^E~QBxyd32jtV@#w*Mr{DyPyQW>8s<1W`{ z*|KHAeKT?5MALGgG9I}0apNxU3cD(DjIiftVtveAYOUwTi!Z*Y{_1s?O1ru1qqc}@ z$>+rL)OV@$5BfFtk9(f;o&D-R+;6nc|La}q<@61QwH(if!vUv-d!D{cA4e_Ahf^M( z7JDOgKAaD3B@f2xoex(jo8}#Q67%8G;6?EwrX}XXMaiY@!(1NX`nun6Za!REyeNL) z-#{JE6@J4(UziUUC6l%fJ{Fq~mliLI-^M!bh432=dc%CUD4Dc<N%?ST@uK))``CQA zD4Dc<&=H#tmlm&*-|i3187upS!}@sTTUBCKz5~ZQAFfi?=N-P2Iv>slS9xsQ9nXgw z&xcc&h-}C6;UdjqIxp*dxTqhTs`b^94_6H<u0KsaTpUgk%_ko&2_uQl-+3nG!zE$( z(3A4vd@z!DlJen_<bCK#`EWiMNjypUa7pq$^rU<^AB-fPq<pv}c^`UGKAaCm91r)0 zPd;26MiMPeK3o!36up*wxG0=zedGCX<N0vaKTkr+cs^WciZKtDbv|6RxDnOQ+_04S za8WRceJS$c60u?!G*5;(OI7pXV&wfu$@y@8IPqLb`Ec>le$=FVI6stluB3dpcxg{+ zLOz@)N-SGaK3uG@Cow4>&J!k<jd`0UPY8L^k@;}3(mq7)kK}wfAEatLy3c*`;i_T8 z_ScdR7YkTHG;w!4AI{|Wj_1RT`99H(%jquldEB4BhWwxb<nLTSUdj-1HrVo={iO3w z$ktT(aQl(p_73u>@GsjEEBVN8^?2pO{SEnM7m*L<gReXvAfMy!p80UZAI8tVDx0RI z9Ocz+Ze9lNT+IJ1asYV}X~$nV2Fg2j8<P)r3i%b4GPS&Oee7Jy^5N(owcu5gar`aJ zhkG4)9M$-1>8D?FE?9>!A8ru&BDG*uli~iM4)-pV`>Gm$E&b;s^5M9DYr(1}Lp;0g z;a%#7JrClkZ=p5$a3Aq{n0&a8%C9hoFdwcH`Eb>2TT8$05BOEtUFt`$&&TA$F<vo# z)-rCDapM){5Sb6h`21nSUEs&&!_|6z98Q@JN4xp15BZ#Uo;n|n{z1Ry{^7pT^PKPO bSO4LDqkVAq?DcONcz$ucAooA>e~bJV2*la& literal 20138 zcmeHPOKeoh74=NQXG4-@00j&}gWFEV-Glh;MzaYYB|)IkU>59R#3HLG@oxaHvxzi= zyWL0;dy9{4z_4Q*;kJ#J7?#*zyq<w>BUR3+cdNR(-LI-%?}EBDHTC*_&aHc^>eh9? z65sr3>d#&J^Dq4Wd$iqX|3&+(tGnwL=(~lFN9Uuux|07$Q{VjY{NEjB)Z;Isq!OXI zxw#$p?%g|uHhKU4{dx4OXjSQ-p)aAGqFe@8Ejm6v{yB6n3zkA3YO5H-;M1p1qg<Gp zn%W2XMF)5J?%liB@crb>%*-C}x3lMWwCiZgXl4wR>FMd;`FsM_QOK`T2hT6jpI1tK z=F=e`W4Zv@SJXp$OPp3Z96$M#gU%DQ-?WlTqrtabz@9aBn*CuMo%qbb9+#c|$lP3n z?hKkc=hMLaj(j6aJ;*#3I~8|+AbUmVE0FuO(V3l{Jpg(|cqZlzJ;pXqIio}WA#dXL zSJGvDt`P_Pb4C_+4}zxW#%Du#>(K2sx_IXNa4f6DzjNo#8Tr0sWF$TdLT?y%8V$Jf zCT?5@kTdJ;6vkVo9%Psb^asxaX;?lw=f}agL0Qm>=yklY4vrf>=w^LH`C#lq@4mqR zjr)gVXMWIg0Y1~2{uml%GPc(S18Zlm=)Oi@<uhp84d2j2CX1a921C{obw8lJAr@@> z*6<CD^o(uQU`W29KKGQK55(=5;e+-tBeogKjKM(cPY^@q;})Mm8+G`X+O%=e!C)Sx z?MYyt<umLp8a~%Kzl)3+W2mn*?T_bzd;0e6+dJ{B=LG#<j2+nKK7U8Kh_>$L6Ud(z zoi%fQVa!*BwgTF(Tssl|EO0zVhxrcQc`h(EgN9x%m$!jte0v1BhP(?M&d&oh?xh-g z&}M-#VB$k8>VY?hrep8sUGkx`A3U7{q5Fj6AwBlP^8@<K|BUSh@T_kx2C$DAJLq4a z+4*thnxCO}4wyPV)W>tnbI|CCKRRxZ=a`nz#+c8*+YSHpdCu>o3tz7b*jfaCpTY9= zaxM-+U*|IP8pG3XfHy?@KHOG3u4|0_ELs^DJWpto`Hg*rbe=zyYo#AUQ-3?OLk;(x zQX@T+Y9u$0wu)9w`krTMG*{Am$i?8fGHSf*bLd|dOocwwR@HFNpc?-=s)kcTefxm9 z=-@7^;oLR&a#H>C@E$eZw_W%AKGJg?a?6fvMUDO5Tf@QcqtIIyotJn%kMi1I!+{SU zE<op%=)EP58yE8|<A0mT^*&MK`Ajt&eA}glduOekCVv=5@RIlp=jPP6`cDUKUgqW^ ze42qwea=U7(}>}B<lAvV4|0#iPQ{%cHPU-U(}!~_YUrTNA?o|X2SBfgPTIWBQ_k9f z|B#os_2?Q-ug{U(n&8+PP7Qx?(3zVwe4%3whkLrMon(H<TNV5>g1=;CxOPW!3qlXz z+jTu};>L9X-DJISe~tE*1<TfO7}G#T{A3)MA3M(Bo*RNuL@)8~wKbfxK4N_^a`&wb zy??Zi%n!+2jOJ_&XKCU6ZLm#mYdAIb#a{8_HG1YB#r<0!gV3_uur-{_HEn-Dd!udq zqtDiGmX_Uyt>Kb<qhrNAmCVOjpRM7rw;pP{nQipg8cvPnP6!6)<5u$AYil?)+H<Kb z8>2Z}!zFo?e&Adf&7BoITf^!6VRB2nFUTE9UP<;x&vT7C+Iw1!ckje=GABd5wnj+y zdG1}DKiKDPK4HF2#<s?}=UT$|tD44qHGas}aAL<jOUxQ|`vuC`HHmx&ESw976V5G5 zA3U-RaZ7v~$vxVdclG={fFAc!P4~>>%m>YRmw7w!VbRUI+Ly81{(26?`QhYWGZtU3 z&yOVkE6nkR>zk{muzu@yaxauKKdxN!Gsb-mEr}1$(Uf!0=wV&c9}_pmeF^Ju3}?)7 zjBj`SJjZuU2fx1d7I~f;EMKqBMb;T6m(?-cxvoF!*yM)XeB{G-d3s%Q|0MaJ=LzSW z`Hg)==w~SB>ScLWKOEYzIq}u0+C*WpHj$s-Eaq2h#e7xzXSHH~iG0ds!KEzMBXBPZ zmIAJ~iClCI_r82&A21gk+~v(u;o9b8;p9(07WSyAzU}P!eY04&4!LDVw(|3YzlK9R zjzWH2bY4~``tdtlpoRm#S}I(C&MU1qk$+2^R<YCLCm(UC77I_*zcbcw|2e!1e$5&? z&Hiw$f~VtCE#~Lc)VKEULCy`vc@Z(6k+|zQ-z?>);b&tF2fb>s|FO1H%s13<wNn2T zp|7a&5nIE(|MANMpjU*~dfu_#C}(0r{~>SUmeg=qcNqH`anRcu?nChp2SGD)(;C0N z-qzoj^4-Rc%#WhqT-P5b^Jiq74K-Y?R9Fyt2tVP&ACrT*PN1vTo8Di=e3@9A#eQ4E zRVNAqnefFQ&X4g0^L0Zois+Mg-~7_naCUvvV-e*GVq<GK?jLOf{+YSJT-zGX(6agh z8@7h~xzxXx`lO++@|pYB_-SaQXKeKv4s$KKAF!U^@L5e9wKbffWyII($c&TuhWcDv z=#%*<_1hW_v3i&lU+`=VS1W#XLStY)YNh-w;oBMxHZHYegZaSt!91GSC`^7V=FbXV zLk$O-n|ovCrC!4&`{OxrKNbt8)$Ol$n)p|5=4}lp`~02Q57}6E^9l1c^|(IG`Gq}w zRj^jn565i{CwBb)ARkc9#EAJ0ST6;yUc;4-Yy(aER-MQ{+LCuMKN!;kjtg=%_S~n; z2PS{e2KB(36Z|bT-20n_{ov^wsLu~4|C%xSdZo{g{EXmlxW2i1$nnRF9rQ2U`Eli% zpE34xkT>yJPdf*Vp7^8VCSzLKoXC&Wkk6QJ%z4i5nqJH=i5%C(BF|HU<?H2K9F+Kn z))e_0$lF71KJwwaJg#fmKV_aLVzVke^Fx{E59M6FEYI?Oq4O@aMbPj&=O_Cv74GtP zHs)-e4g4LUD*ZHi)(G}@IQ)j3`CTgXS({bR@F#a_n-@8BU0wJ+Jo;TK#F<Oi(R}!Z zN4ah^{ehj}yHp6${{=LI5!2Hj9k-ZwsgNDWh;PPVYdH9F1HZ|qzDouEY@0T04F~*_ zv;kW!-=zY7txX%YhQk{3zDor@*QfD6OK)qq(7RONziHEk{T(j!E*1C>+q7Y8IOHYo zyHwy`YSV_T;b6o2E*1D(=d9_n%mwp-yFbkP#?*JIkUxm_F47M7x&50EYc~2_s@Mtn z!+gN;=nvLx=69)3r2m|s2WZ?kHR-uenGbY)(0AUYcHX6O83aF_8ZJFVpLh+I?syZY z%^I!=CHysG4HpJXk%+9}Qncg9ku_W#m`5t2hVy90u_9`?I3SNyL=ETBj$=jCaB)B$ zsfZfRqaDYJsNv#(JW>%goJTv%lKl}=!-c_8Br?`;DJbdWHfy+az$T95-Ohcu&V9J1 zmC^WB-x2BDhieRqeEXE|!?kocg~<CHxTlcmK3ocvm(2TsxFZmCAI=LDVB+2h?<?}Y zL+X9F07Q_DA18wM;esF$0`TRA_|oz|Tm(c=1ap5<Y_z-&7X*k92;GN^fC!3&?!yHE zA_PMB;UXY{BBA?mL4XK>(0#ZF2(L)8Kf?FnydVK4)@}5CxByg3Ht(NdUu3!u*Agg& zsPk^;K3wNMT*~?|<j#FK6N#<;r+go7tGDTt<X%R$`*7)K>6|S0;nGpUoS6G?VHCea z%zZdNLL4`AA1)5XFBQ5E=hu$ohVH|~q4=ek>*W4S%lmMC?Kp1eK3p7%Un+DT&aWNE z4c&)}LrIsC{SmwmmyQtTWVsI)M%yaU&V9J8DCv~WeYkw*K3w|pu$<1jR2zyd51n_Z zNk}^HQnxIPAffXvH5j4>fzG?shH!Ylbl#<U!(*A9cd0fMEgw4nw#fg_zb*1VVemvv diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg index f105f57095c..e478008e2ea 100644 --- a/dlls/light.msstyles/blue_radiobutton_25px.svg +++ b/dlls/light.msstyles/blue_radiobutton_25px.svg @@ -5,24 +5,25 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> - <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" stroke="#3096fa"/> - <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <g> + <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" fill="#fffff9" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" fill="#fff" stroke="#3096fa"/> + <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" fill="#fff" stroke="#2979ff"/> + </g> <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> - <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> - <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> - <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + </g> <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> </g> <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/> - <g> - <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> - <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> - <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> - </g> + <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> + <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> + <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_radiobutton_28px.bmp b/dlls/light.msstyles/blue_radiobutton_28px.bmp index 4329d94e6ed6e87d8279e8e2482ede00ec4c9db3..44b0fc173be392da46784b692f3f8af9a64aae40 100644 GIT binary patch literal 25226 zcmeHP?Q>N}84sZK122DpA1EE$ytR4L4_d|&ing}a4<P;MXth{`DN;X}Vy6b^3uSDD zwn>I*9fgi#MP5RXHx(k#1gJB%ycI&JA#D_Bf|Ueq?o00a`|a7i?Ad$HxqHqH)0xiQ zVL5wupM8G&Jp1gkdvf==b01jyP=!ou@&6OZpGUrcJgH)4#S}a%R6C2;lc=ch{;^8T zy=VSUuD7|BKI2B_quR1%OT*T!TU)nn+qNJ14DzVTEbnI<X?&exeh@-T+P;1J0>xk8 z>5_>*pMB%Nb#-;!jDEca#vriUAj5sAtJ=JI^E76bA=~}P?I;gwdVKC74;M`InT>o| z_5Bby%euR}i%vspYwKk6`3~~GRNrAd=SE?I_Z-lq75xsR=~47SZM%2xo`L>56^|62 zcLmWw2eZ&Nr0CXjyg_s>b?l3=zo>W(p*+*<$N5Fu5!K!qgoU}QLHi5HCy_^0X8HNf z&dzF+AIszc8M@FeIG?5sp>84Tkq2!Z!Y*zC{Yz-eDw-fWW!w4<8#a8_#8tZ0^Esbw zO187)1-?Hp>4}B<zeM2pu%Wj<+nA_Zr23yBZ(ua4&mVxlbTt|i^)I_(8FcG)e?Dp3 zXp?IN*!3u{BrSDj(xI*vIZB5<*~mlXtUaIL&GpIlCy@`Z4D4@Mc<U66<`d`nyvYlA z_bXoXhkdGit4V{p)2coWj;1|n@`7zwDqi$=BP`o?sp}P;=HvRjYT_w7W#6mFTuXxf z(4^7zY)g<wOkU)zco6Fx%aHjCCJpK)OrOx*Z3>U;uAAimds(k&lF0XhId;=tP+qO@ zUNmW7)3>93JOO5wzR%<ZS=z`4Sgj~GDW2~KtoM$%c;M+<$L4y+I2x2clWPLl-#5nv zyZRjP<oa~P-H$QfWb#12hgDzc&)5c>2UXpmZKuS<nCTy)bW1<<vW>+xhWdY!H!v3H zaVQy&u^zm)2kl2{K50XzKy!_mWn}uHTFpy8$piH}kZEtd=6*yP;NOCJo&ngtE(lZe zD)v-Z+P;Uv&N3KtGqB`&f^yorEr!E(r9&-O3UbVe>Ib~p$ojm*bJ?O8=Oymj{m9hO z739eCk{$<j3;B+!e(d``K68)1m%ex3zI{`fS!NwF_sI{CNlP0ziabm6b9r)pflIs9 z`-kMEd4@bmyU?}`7d%a)aGQX=3cR|J&tUA@KDocJZYAm(b)Qn7qNTb)tf+1kk5}#& zk5``&k5`R)nPt?m4K$_T;I(LyXsKMF_zUoN$P#}(`^Lc*PuzAh`1j^9o}DAaj#WaO zJt)NG_k>9O*UK!Q{i_h2D}^A99#czI4|%v?il5fZhK?@FzE9mLM9(H6#<Q5lA}Kd6 z#NRuGc;>4bcUZL4M6L(uZw_$M5^K|sgc!S41SFt&Y*dJii#28nV-I|P5G}XP5-X~P zB-YNSh2VITCid-m%EKhjmdcr?Zav$mIwG-NTM~?Q>0KfIxJHO|-xA{IO<rbs*K?TD z^MxZL=0@m<bISQNYzVfzP}XzKZ5?LQ-dKNDt94ZPWE*vo&G>Pt+x&c1dhZX??yJs9 zyf^>grzh5{-z(&=?a+Sy>Y+l+W4~AZtL1)+Ict<yYap9#hdWlgV`*&4X(sa2Yh^`E zJ=XI|iO2ah)1`AlMCnlTx1a1|&nMTXq^o=qcn4&;?~sXx`FJM2Y#N(3WG4Cq4-fvZ zs!x`O`b`QUe)-Mhc(hwHefXZ@C4KLR#Ix<P^^3{zTEAqX!RBG7p6plgq_6k<p-IIx zru7r|$+4P={?_9$inVx7mWMBx6cek@p?`RIEppv;OS}SmfnCRyOViU2naOW2t0iB1 zJzVS)Vnt1SOs)s|J~MGI<5=XrT-hYcYnlt!duMBWJbT>cdgnQT{!Filzilx`B}67A z#4F!*$9xsE^nqr2bF=F2`7`blkn=$)BmE9-$xOtge~8j8bx7Z5V{wf=dzXiYvx(l5 zl#ItD=4(rX_an|HedD?ZuopFYnPvJR`aU~xKjNP4*-)>!A4wUXsJ#Vk!?K+`O5JZc zHfbZ+Z$r*9V#RIEpz+QVl+)I&Ekn>}>hQW;DV|ZZ9)q5~^AhKi`<J~>1>sO1C-w@l zcAnPZm15^5jW0ai9+mo_PPkTR=Y5BTpzlrn&&w>cj<&-6)0-<kkMcaE`MEr$4S9C! z?H|{9nSAYXpFEowXB8JLlSbmUz$dJzT7_|UtMm3Xl#%8B!n&0_Cz$<8DW^N?8d7cb zt?BlL{pq&4GwJsFQJH1AVZUqxO(_^cR7^^BG%Qg31^5@wz)!W+;roYp?++ipbjQu< zw)$R;k=gilkv;T`$PFA8xqoACNy7&rvz)tdNMsK_El8v3@$4ZF7kM*nb+bW#S@!*P zvlu`ATj%vKes-rw|7M=X9nN&z5&8a*>8PIroHVhryO%)*tlhXNbxmY;J*qKNnf8Xe zg5(@)zkL>Ph9uVE=Sucx*~4oz=FrC-^)pRO&TqQC?uf+N^W#9Q+?Dep+w%*NdHvfW z{mNHlW;xsQJmwMW-cIm0)Dd|i_n0=6YOi0&dd_))4#(556^yl`QTHu;qAg3Ej9c#y z(5;?N+AU@DWUD_*yzzIo`9}$?OxL19{@$1i>N8zGEWjK;y~U%$S|MKg<vSXsY@6;W z&|~({vjsd!8<nM;=BVN8^J}H8zCP7nx03y-Gc)C`yc?~<FkI-?o=>h%DN}pHlXxCr zIXCcz2`92|tc{d|eZn$r$V~JJ9xeP~dwn0vxsNWGBqH;>`Jw#6aCANG)=asN`aNEr z?;RnXZI|g+?o5oAe)Uch4tpi+)YHdRJn8F!=RcRpHRjQ1TK6Z$>Pz6Q@Q8Je<=lS; zd?YtSpY3wpbxS<kUa)@Em|{Qahs<Q!ORBwLHTlxtnJG7XF8O+Z?=utkGGcgpc4HIE znN9Z=uJ?ma#h1-m$2{BR*E`Mt%Ad(KG5*eWb67Z^r$lDQ!_JtQ9gE=4{O=Frr?-0j zl|Q3TOLf#eC}ouX+Ha@Cl>VWZzlQI#vAD)E8^7l15@!=)F)103$$8wfyg;uMn)6BD zn0b8x_M$J#%rgBDeP2N`_amH5h~c4m|Br2Gx&?T{5)(X1eShHC$P0NW>@0(`OEcQN z^91Fzd_aK=K^4%UvCpP>Mlt2G%jS8BcE$b6_5ES|{GUYTwfnSOSBjmNG`7<1QKb*L zR=8i~272Jv`yn^pACOsQ9rwu$_D@ZZ=TV-AG(VRo=U3USTq_1IldoOw<JrWv4HrC3 z<JoRw6V4y2fZ46i+t*OOrpn!N&&D}H_bK(s?<Mhl#;5lF(w;qg#M^JbEiPWXC`Lv` zL?)AwnPt|!_10U0H27XeX6Pc({iR*Ic8T-n&x>3x7qrrRb)*>>7!dgWRpZ9GzjWlt z5h;U@slx}#-rL)&F;kE^@cjWg$lqT&e*CzTOkwbpl{}PwBkwO!t|0xLI(14cU%p(_ z*4Bz?)27MH@?(!ZCQhF|T>woUT29U<2=e|K<KXw8a?Ys_Go?}~v2^KDF=fgWyvp-7 zVPR(5qmSYpEbZU>$jg{d_5L95X36_Y{r&wWlpxmKci$a|5rjK$9^N%AO!8EE_1#~h zJ==O*vSf)fmd2-?W+G3$R`4BZ{{9lzmzhqUJQ=A&&EI}fxAuH;eJUCA_m?hRx@5wM zWy_YumQ7>RhRj5tpz!kdmqthNH+v&hS63&-qurW`en`(Dp7Q>ZZI{!hPfv_DW5x^< zPWlancNI^0f62z<8q@lT`{Y>7MBWN7e}Cyl>XW<`UjF`)Z7;OzxN>QF`XMu!_5xoc z?=R8cnd!ud6Jqk@$+0oH9_ahb#I;8GfR(?$6tvzSdE}AUc=UZ{GS|C(f9b*n|2y^A z*qCT;Zg$3;J9n=1fhL~q&!F@C{Uyq1+bJ;@FJ2s}Tk4R$kN(z7<fZ*Je3|k7AbqyH zzZA9~aXx87H8nM2>eQ(+vrIok-)AT4k-U^$;{D<Jexzi~-(Q;O{nq9FQYq&NL#|l& zmpGrCZ+oAzb;r-785|rGd-v|uI!t_jiMU)t^a=F6*=$y3mRZL((x|yA-(RAEMx;;s z`vdHt9RHx^AO3O%^s!T|4X5`9(0=0a4-w`Y*u*=a*k5DEKLj#!tW>&nj(>1u8%c(J z&pG}fl96Mhc^}$*e}JxEa%2&k47`iRKg4Dl(E)fx;~yfr$8J*hZn<BD#y`Yn8qq=7 zDe>~}4@vGmM?m<R$XofF{QCoB_QgN=I+XaqCH|pA2w!*8UQm|r4_F&7`iLg*19&^d zKTHIqx!&#f2aLlP|1c4Fu#;Hv52aw168{hvw;ccAX$<pQj(<>pr&c~O|DJ-+<@kq? zg@r##l;a=F7i-?<E5|=bYw>KONc@ATJC`!`n<W0hg?AWD-1vtuK5^>f#6QI08%E2! zsxI*lVf~ZTyTm^v;TzV+f1f=#{voVyl6sf;ha`N%`nbeDg!N5Q?-Kuzgl||Mm-vUU zzDer+_7WWbkc4koAJ_PYu>NuC&GlX^{vi(EFxt5B4`F;<>Pv}#aN%##a6h^pCs2-m zU_3xM{-GTI5c0lYS9|xt%JC0*mjZuMj(_m1#JjT>9siKmn`;63HST4)$3M9852A}3 z{}99@W?h{4hnTE`$<6!F5%CYfos-qN#6KkC9Nf#i&yIVef$<N)J(JbC#6KkC9Ma1n z{vo7ivTBF;hh&U{d*$^R5&sa}Gg+-^FJbWy$v6l1a*clo?j5t%T<^u=A7Zi&B99&a z5X8i_u7vmpSBN~FxgV9|A7s2}IsTy_Ca)a-V81x1&sayF*zdRM`)=j<2mC|^?tJRF z0DNEObbo20?_=V7@0q5V&^9m@`TMP5_f7MD*s;L-l3GsODR7Q|aAY4yX5OcTJVoOl z0-40D<o!`#$-6JqDP)zu-%6WzxmOw!PV&@uLott`@egtNM$x;(KScG9+h*Qphi>_u zvas*#$K@GC?-KtI)jw_<?Nr%J{{9l{Zd5Yx^7of+q&{8ZA0|>((_ZxbB|H9MBJo_~ zA0`5mK18o~`~H$0|1c4Fwm+j!gP)PV-^y`Jq@9vi()fqCvQm#moIpAL0X~)U$@zBK Wr$|$df8c6}POwX!vnTBLTmKIof`BLh literal 25226 zcmeHPOK()k6*iLu7Bk@&WWg)A+pq4n7ug^Uun7TW1A--sBzPCiBGF)52pQN-1j69% z#*6#`1ek|}gur+Om^DT`Hbh{McrAEHLz_l5-&gmPU3L5Ry>)MU!6>&ihg<j5sq@w2 z)TugitGxZMKmDys|9-;1hd_S-{SUONYhBlG@a&R&CYOJzt1I}AEVcd5yZ^PE=a>4e zpO_<c?%cV``Sa(;FI>1V19|}ZAjI?x^C;sKO8KIcS~WdAy+`ybJbj4xyID33+~v!c z*Q4BR3u6J;RkUFzc*V14&wfW@8g1JJsv*5#<nexsI(#ruW((-0lzj!9A7*D~6Nh1Z zeEb`f*$;XlW#8brJq{DPw?bx7<S*g(`#AZiysKBQu0{DPqN9Q5_fc}_gAK@gEpijA zZ<L%5k7ZH!Q=;oN((CMU9AD(!k^GBMSQxur<evcD1AP!;`uN3*7kg}dOj8Hia2ffE z<7wLvczekQErk0JcCi}rr;*nbnJ7DD-o(_@)bDIu>02|NyO}3#dq`c-`wv^5Sm57? z!EvzBZ`Z?^;0;Up2h<IWL3w`${o2(SOz<atu`Ia>Q=U)SHuCgb0d^VbBa~&I*>d3Z zf#UkmX&ZG2HN)cx-JGAyKMcCbG_d~?!aFH4Mo*gOaa$Mgc8M<f!$*?dY|DUmU-)To zjO;yI7i_yAy6ErTGaa@|!xuTD$M^Zp#uGbb*>@n$B}IQ|%NRcMGSGWl7j=scVm)RW zZT_Pz1Kx`DC;F~i@Hp>gnU1iR36aUtz7uxcZF@obnBbkVWnk0&;D5=0*`)8Yb)hX) z>H*d`(nF&2X~cZ5r^SO#XCB-09rdV)Khtvp*nhX{1-n`UJUu@>ac5BH)wT|lJ0NAX zKVu$n_6ctxY^TITo#`Lq`j&oZGK|GJ2L5yE2F4y!4{76F@}YY=YCV$iqz%nO<|Bz| z5dBb}(Pf_00sbWr?d`U`9#IDP8^PxufcYn*FpaLHr(hZTe%)>_gF0^mmflaWo#DPs z!ePGjp=nnG?bsSu4tQHYX1~OJ*>H;e64&h~AokH)Q0#um)PsGC_RUE-mVJtMuJJqQ zd#_!)_AQBN@<3cCpMfY#8<+!aF#3F+9ADtlZq53kbs3#)o|N4iwhbRVBO|y&z&;9H zv!Dm4yRlEMFXSBoZ_t$K^r=RADr&4}T#XiH)M(EGHCp@-5Yyl>4>FzLAS_y?MhbgG zzk+@b()hbsHVw8q)V&`1Z(A4(YOGkr`%d*^Ur~+sey54)vEnZ9YoLWC`H|u+>hQr- z2Ya`mk6udISJ3x^8sC~2KdAApZy>uL<z7hHH)^Cec0Qp0wnBC>kS|<PKX#{%AJq7! zwJ3i@FdL|QWc;8;Hg7=vUJKR)>+91WQ8K!%qlHsi7j=#l*4c7_Z4~cF{>3OPb+D&b zjTBEn<{n7wlj)x0YP7c{e$bdBJ(smkj;Ccqu;sm)&oK}6A?#u`be=|jQ)Hs-6nTXS zH9X|R57M_Xo`oQO&~{&ZDD`mShXAX1BL*joeZ2*9q%a(m@6qcm#%wTnFFaFwga1`w z`WpPn6j*{?aN-BrHgp7YWvsW1zB&@<>~Z!Ts7D|8aeWwWn|VhWcRZno^Aq`n!@#?# z(_=kO`~cfH8OZqfm9R{Y6F;Et^a;d+KP*0yv=cvocR%2Vb$Puz@q-%OTnKb&-}_#t z!*)4Z4ESDtv!xDB{2+G9{(cAITvGIh#!mQL;%CEi;s@<(13e!wPLDO-p`sH%fVXn} zd8oTvV~pr|H>=ZOd*S@e);2{y<n)zmFUJDC1t)$`2Mhh+f60K^r0)yiaV=B9x?C6% zoljfl`&hA_9xpVH?fK4q0{z+2oG3c+gZk&DHB0l;t8X#C;BTF_jTR0Bbq@R)^U%(H z(vF1|JJp!lKg9Jd{m^6!7UmfE&$VvsO-wzcjduleI(j|gcxoG(hulY@dF_Yb`;0F0 zlr`{@=)7&ON0d>A`Zgl(jn1bp>wLWp?3?Rto4t%0>)r-D*-sSFPS*#Ry2m}aexe^t zyBgf1#LBz-r3J_jd+(Qmb^D3*;oGGBlBtLE?VOaO-+QXp_>tZn+V}o@;9EtaAJ#ms zlUP5OZFr9RA*0Xdsck5*TUkF^d@}11rbl{jV(nFYuxuHPI|83DRy+#*vuG#x^J1Sm zP2Lgi6YO%Gq!;U@N~2mHU#wMT7OSNPi?#9xO*&nf(Rq;R1VgE=RgHROkLXv>pG?4S zR7?2&kS>1s`Sig0#cKJs!T4M&FD%x})#jP<&PH{xsH%t`KukAl<z0}gX_@6Z-J%Yk z_I|FGwxIk=!FmN;@AzS{TG`*Im0w8NH=pYRvGK#_dU-2k7b%bWUQ++f5I>yy(^_C& z5zNNtTIKtwc7Ce$Z-C5eEmtjd96v19N~Z+#_0RS4IvbPYi~KvxM;jyKhsI>77h`w= zGWS4%ed=`Oc;ieZGJZhYE(<2UKP=l2+P_z0!7jpmsLuAT#<-kDepAXu*=ZAYJfWsS z@k7wJdOT^jY-7;2@<Y+(#t+1*mu|%1gt4!OF;R9{m&aTo-s0rIAm7oC&(zty&i4oK zC$;Rdorm?ezN4MgYku_gOLL`KE;nkWBLRNJi60vEfj;o#`mhx%s8=&Qp3qYx2FCL+ zo;R6p)+$c?0NXf8em1H&@q_pT=z>42l^;>(r^%8NKY({X8<wu46F)Sjh6-9&;CtUQ z9kxsGG(RJz8$ZBKMbA4tIhPdup&4U74PWHa_NyB|K)2{2)?=nWohdu<19&UepPy<2 z-Gaw?H_LR3y}+(TCT-gk{gB;Pw!JiJm1BY4k`q5PPWShN|0M%vlfKW!<61^N!J0id z6zHrxZJqC>dTKoQJ{!xK@7M!~Khtvpe$tH}PHkEPJUu`Ca4R$Pw>BQu&jY%w_%r4; z>ZN_;(eH%qR0Wvy4{?1<KQtM};v9p{=hV%;iK&OQ@vdM-#t(Wt0~?x$+()5#`XTy0 zqsu%Q4{*(<PVP<Y^@uW`riL~m?~Trfj!xqTu1{JQ*6?<F8SGuQLB{MSro(+}>K^x$ zJ`CDbD>t}DiIcbYOR|o5#}Be@KaqC5P1-M+dPv{SNjc2-%2TfKpR0pA=zG<F5IcaF zCJ%CxTtAoP%X8ch8GSxaj<48lFjqM4$@GYA4BLheo{<S`cW?;%kE6hwmHl>LpTYVv ztJiGo6HJ*-pZqR~?-}{|rRDEc`T3=<?EDgJoNFl8ZSK832r<pQUrYSJZ@94O)aRF= zi|g5GP!oi3K9ZQneYNxbA?^7klqc2=P&=G3|9Tjc-+%EvlHW!X&o80uWC|>U?ZglE zc?Mv&J--ATuAy;#X!M7lEaQwP#xe2y63Uzeg?0J9JMjbX63;II>wX7#wA-bhd^gu) zh;fWOzXW0K$$i@smUH3<pYuz=;v5U>@qK4qmwr4KAvW6f{1Sv$tUrCuF9DBs?c1KP zoD)CT_JVZe`6XcWgT7?I<a}`A2h2OK^GhgK&wxkYxAe2;JNF4ZAAzxqJimlOYd|+a z;r?p(J_A`Net_;&=a&SthG$&gvJdI|9IQ^xFF_Z_lQuLD`Y6OS{ZLE%ke^>dui%IA z&Cf5%K2v-m{l1}J<@u#Ne#q}X1haejU#x>))%}O%n)#(Vh#&j_BBV0J4-s0@u~Nnl z>6AxE+xv-x_#vWnHWqBrCw|DLJff7nAB1l==T|pJh^`3BGk#bREGqGgA65*{Gk#bx zJkR)H#qex<LAqW1uwr;A;)jkg?fLEzKXi<T`Ia_*$c))x{E!Maj~{~W!uaO#!*aY} z;s*2lRmKnb{fGSiL)aO9ZTBC-^-Fr^_g~m`>iZ8#dgJob-hYVG<(sF^kLq)j$@d?8 zb;im0-hYVGkv0$KHxutaq}3TG?{ohlu6)`&pZgDKb;im2+<%BGpEi%@s^zS2+xrh` zb;il#ym#XLhq&@-^FsC#dH*4;&NzACdEI}A)8U)v%=d)*5579%<Z$jh)%}M!T}gSt z+5K$yACh#3^YwbPd`}?1{}7!0&+k9DcOdfn58;U;@4<Pn{QiUK9{Q8~{zK3k!I{1I z`wynye4p&!EcYLL^+(C6l=mN^bfo3sjHCDchqSt*<el@-G4~&$%4X%EjfwXkvg(d1 zXP;*WcI5qssB&3(KKCE8>W(T$J4L&A9`_w6^8Q0qxvV^%s}{Vr_aCzAjw<JK{~@Ye zR-SDy?e0Hh)g4vN_x?jv*|a=oz9-y&NUJ+aKJER7C>_4MPVPVWVi>t#J<9Jt<o6$9 z??L4EAIyXaJ>~C8?ZNje{tYSfy(Z~N+5GRfN?+o;_5bbPZw;AK;%k0>=|aojZ%ynp z4*~l;Lw<hAqr*Hz^7Bg`os>c(Kfjcsvl2w@`JSI&O6aVZ?EL&v&^h_}rP#giS9gBt E7wh(kHvj+t diff --git a/dlls/light.msstyles/blue_radiobutton_28px.svg b/dlls/light.msstyles/blue_radiobutton_28px.svg index fc52dd57e08..c1dc2cb3cf8 100644 --- a/dlls/light.msstyles/blue_radiobutton_28px.svg +++ b/dlls/light.msstyles/blue_radiobutton_28px.svg @@ -5,18 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <circle cx="14" cy="14" r="13" stroke="#aeaeae"/> - <circle cx="14" cy="42" r="13" stroke="#3096fa"/> - <circle cx="14" cy="70" r="13" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="14" cy="14" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="42" r="13" stroke="#3096fa"/> + <circle cx="14" cy="70" r="13" stroke="#2979ff"/> + </g> <circle cx="14" cy="98" r="13" stroke="#aeaeae"/> - <circle cx="14" cy="126" r="13" stroke="#aeaeae"/> - <circle cx="14" cy="154" r="13" stroke="#3096fa"/> - <circle cx="14" cy="182" r="13" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="14" cy="126" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="154" r="13" stroke="#3096fa"/> + <circle cx="14" cy="182" r="13" stroke="#2979ff"/> + </g> <circle cx="14" cy="210" r="13" stroke="#aeaeae"/> </g> <path d="m22 126a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z"/> diff --git a/dlls/light.msstyles/blue_radiobutton_31px.bmp b/dlls/light.msstyles/blue_radiobutton_31px.bmp index 159e5cb68b30cceabb3be64feecb9ca97fb3074b..0b7bdddd52be25597e63de895d231ed7c6ca7361 100644 GIT binary patch literal 30890 zcmeHQTaZ=76&=eIkbESSm{=kvu?kFNNXd*Qf&>{<NWSuupS+Zm@S|d$$S@GBh*bt8 zT1kw|h>xIE#;PEX;Wc8Js%QWOOYkSLGL!uHLM1f}4`pWVy>oZg>eGFuPv7(EdoGfg z+eJ^G)4hAG-raq6cSG;t`fqLSYEfZ5ey&FRBH{?*c`cW=oR9QUU5-a9NJ~rbhk0`S zH^05iD$Moxv0PHMLYp^lp0a)W_FK1Y+t!OXfOrB?bjtT$mQ${_c6~Wpw{E=-xcd>S zh~&zOl-tL8^)a@zK!>S_dn~Tgczzmj(UvV+W<bAB5t}LBnGe1#NGYe<$NI$aX#+48 zp#Gr77(%*Y*REZk$b&&S$af){F&PB^4SDLK&SJzeqG&xX$WzaiLH!F58Q2HJyV;eo z-?hG!<Cv`xk@M_w-)Gi`&Ub6Pa+3Z#cI=o28Pm^e;&^&{dp{4E6^Jh&zKuAl)8~<{ zK-({gtEc&?Kl{IC{E^>>sQTH}x38~nB5?0T`7mWtBFooN-fjc&kk26C-eZ>`uY>uB zoL7<Y#ruVbFCwOKM#|961DOAxvpFyaKMM>s|Lnd;9=~7KUt!B{+O%mB@?O$q5&Rr^ zFS`1p4(C5{_K}BUglEpJQ)uhQZEobPNA%^i<=5GG`upSeUj^3`q)RpaW?N3rtE}<0 zdE%ajiDTn}YpdqF1$uAiGsfUXN5=F|9Hvj+atC*j=H|Naisrt`k=dtZe0btyU$Akt z{iR$#;!$!y|H-zD$!A%?_?C@}`S(eUcM2)(gJA3@*fJ(x%N610)*uYvIbUN|kS6K< zP6K$^=C?y)JUDtECI{x)hdthEzoEG!^Bm*9szG{3>=iK0Jl_F*Z`T}uvik<(@&)9N z6y&e@zM&KM7o6L-Atu^2wClbi+`zuq*2lGLEQ8Dea)7JTmOTshoa-;=-+sdb&iOiT z2z~t-lg||S7ou$kb$Q-zjqA^aHqP$dyFZOQwLbt~WDkY+y&C^%cm1aRC};m?jX&-G zddl0p#6$blI0GlLep3#%?lROnj>vg%mtEI9>-k4JPkT$dVD>G1?{e1-Qx9cp5ZPyg z+#i{IJ4M+-M73WdzpKA3o99{YSIEmXx(v((Y4y-2OEf>*`LsL!X?5)~)-(OA@fO?V zNzag_{>Kr?e;n=U1Xg5UkyMv*lt(@8zf?bG>FZ)~{DEQSA2GP@Y)0OVz`7D~GI%C1 z)$cc<oadJCT!QDmr15q6;@-h^1F-r1bIjO=tVlWT|E`b2t0xcqw13=RalgU!$INr4 zeD8&fvXk}Tr`3^Pd})fToPMjUn%*m2(+BW;0#Q`TcjmJka%ng|WwPqa*U8G({lKki zF7l<tD%!D+^?Z12Sy}y+so>ZX^8E5Dkw5-K<Vdf`yZ;m!K84R0fhpga&vMF*w`~t` zY}~A8^yvcBA5<7?t`>Rz5s}hxz?Jora?d|3!g@g)24z)i#C|97OIPb+)G4ca)Z>Gp zEVlS^)_d|th97vXHz#p2U+Y^&J4K%Ry-2khkDE7_^`Cn{6dv_S&|kV{OoOgLKa)2u zoOmbb|A%i9S=%A9`idZZcu|ng^0+{L)BiE!51sqMes=XOkBU5VpU9nU1|vRY`QH0Q zC~pVijrV_K4V9IbcPL)Y4|jY|4~q1BFP>|BK1a)YzAy4V>e=D_<Ky$s>U;hD2K{Es zmq$dpzZ=C(;&b!aURQt4f6C$eSM#fL+9i0e%3WWr{f_#6T_3M$2m9X+{QiRPzpCuy zs_9ErTb}x<EhWNvlQq7EBPnHlcm6&3<3OLT)?2{4U2(s<Gs<oHCkZ!i{$C%9;?n-H zZeagkQO|GvEh@9|2gUl^w2j}R9cX`pvVNpT)$^%iwuH#9<{6n{>Du{G+>z4;?-Y1P z6?df+m7(1*Z7-7EIWvkoRx!90;3w#Pt&u5~(*D^Ys`p`~--kWk<NFN}cb@-cV=;Zr zIC1^8gPG?mFW(_um*1}Re(GnogviiQeBT%=gHcZ!_kD9+CRW$<+a%4d?O9)po9mAq z9J{91?E|VUFFa~X!X7u;o}>R&|Fwo^VD$TZmB)4L%!w#J*Rk&J`03B}hxP1m=A_8o zvjZG!9aFlmY~8E)IUY6ZH}q%!XN^C{m+KGv%MQdd<Ba_$`RpL8r(Xu{<BI>!585@y zpE>_%=V@<g_sqV9@631C4O5f*pkS^Ja(`s=nrGPeg^&sMYvgzJH&}U7)+aCbf5gT9 z*Koz9kXfSS*iQD7JN|ijS#P|b!P}ba46OAJ`v2}(BAov|`*X_M`|}Ka-98A$U(Y}G z0rxfBU(o)&{dW<rdt85*^8Lt;+H(o_p9$mZ^2NP#PmOWn_n-ef#`9a(jE0?omHp%X zD%fvu{o(q@^_S^km9On&oDN0u&h*TjQtD~HwcOLzTk38bKs<pcIvr5?D5qQz9=mRN z!_4b|zaO!xxyY9mDYuXHY#g8Gk&RbP9o^8jC**l#j#Qq#L&pBGOR9ta5*fwbhXE<y znP1tvOiGY5by%M`KD_1b_64Xvs4yP8R>qF}0d^95>pTH+lrKFx*R)}<{9t>oGjOSA z=3;P`$xA(C*jZch@KXl$D$o4f@B?pV>KRz;3%Pcwyxa`{*u+AiDwRVUz~9a`l#}!y z*>L4Fl&gLYcxy?kr{7WiS?*md<tG+O>7lQwwA{Ny<yTL?TU!Y^0l%7`gK^_O+TGR{ z_Oq*RWmGCJ{Z>jFuQq)cpQ60-((gd#oPmL7`k(X9o_px)4)T^TuWH8k%%GIFE{f+$ z_}0qXeuy;)XI?uD4~6s3?tAd^`wix^Esyq>x8CH%t8@Ss+w1DD=6}#$bp}53z!jH3 zzFK<Z>oxn0%8S3Li`Ve0{<n3(_ou)As<M;aZA&Rzd3L!iC7f58;~VIZ+&+vyaqOV% zkE+*xOS!vkJGsaDciSR?eaOPjQ9kzS<567LKl15y;T1ktkG&R=DQ~|yS)Ux7#8e#k z9_>K;tIPWFZ5`#aeDH5uL`sh@FfxVG@)O^P;L7Ox2JaMjM-}&2^bAb9q1#t1#h6Dz zb<E&ZlJ&m9$P`Lx|02QGyQlpy^*aaS9qc#2T{F)QKUzp%GhS-_wG`(%&oX>pJFsTn z&gaUrot6Yvu(SPrZ)m$M)vg`5zmV=+e<H!LYg|*H_W|lYc4SjTl=k>6+4JxW3>!0_ z+-e;garP-{9rIgH*j_=sNEkT@{ElF(ojufOcl+L8-0wgYXTQSroBf|>{l@y^u3yA6 zcHCXR+3zC{wOt18<BI>~o=B6;OSo^Ly`|kV`xd-&KD+CNsmFbg>R0TGxIZGF8_Ey0 zErg8TuaV!;-+<*#p|9fA`!(!;T~7PGw4r@Tz|Zdv{qK%{US8BQ{jBh?|FwCNp0)m} z|4Wa}3+BK3_ZUfSfE>RU&Rf&Z-2WzV#pQGS&HPgs*w=7>LHnodFV{V;KS=q`eD+i1 zT!Q^)()h-4x_R8!ft%mI&v|Trx#x<8oq@IeTdL2ShxPh5s#2^+Dqq`4xBW%m@$c;a zmv^Ce?%XMd4jq!$Uw>Uro`iiY1^XPPd}sc_g9n9j_;+{}ac7{=U1;1vlK%dFsZ=US zUsWWZa+GI1-G;jELQ{{?QTJ>Wp-OyVJ=WL!K6jzzwb!D1=0uW=0^%5c-rI<q^Y&fn zB;GgPcth5$TPO48&6A5SzE~zqn4r>*jt-Uo=9_QEw#4F3y$j8La>K~Th;(*#%A`q? z;O#(<hxo|y6)RQ<<=tTVpYzYw9evWle&PIZ$M?PW-ji#txh9b>t{rpc%#mZq@b`^Y zAg-BzcHe_n-G%1-w8QZ5u*{x4+l$w<h3$3qC%ztgbq3aVW~%%y-S24m^5u2$8h-Y_ z9f+^L|Hxfv+6_B!US*B1;YdnZpE!0f;|~49yU?!8+O=y7>1^7we*JozTG>C{@8MnO zp`oFO%-p$i8^X=+(GIk~nmfD;&3R>q$&)8HgnP=ADK@N>%VonI-i00;8;i)$ZkT>6 zl1`jBF@jsgzoBTo!@JO~-WOeTQA4<C|LoxCt?ojfgYgdULc8<)o_p?Th~BjScHla% z`#ii0?S9{s;aC+J>$LCN-0?#@V(r?pWy=b2bN#V{YuBJxco%wLV89lYvuMx5GceW_ zbr(8m9h)_4mY4oqf4KhHf%`h#hgM^4uVd65@9Hk9JMOGc{n`In<InNs`s04D#4vUo zJdyRA-1c4Qq<stLAMHHtE$yD!xA2|$?zcit27BL<bXOL0&fJAQEBiIf?bI_N`Xsyy z&Hi`yF@Yx8KV$Z(xz4~^|Kmv2K8N$)-B%>BQ;zaxe*}!dEPXlVc5v@Pn{x@rl=heN ziR%wjzH=_HpX_r9c$;^j?N0T4{(n6KW8UySJ@3^w{ee^F4EpB+L<X)OK4)P14E$I5 z1E;8&S_C^ye`M;PdIpC5+X8!eUMiSpA@RV=;N=hONs}lJ`|jlroCs8B0raLH6#G7M z2F81hKX9ECiPfMx{qbohB4=Q{NBn^k0SXp?XDcFg56{4uixEG`f)t6>!MR9thi71L zNBlz*D;F%lzF>yt4$r{&wj%z(1t}7%JASdT{=kWq3l?B4K40q{o`KJi-s%i|4#qn? z1D}I=9-e_Q1`&VYg2S3vo$Ce18)>RPa3VmR1+HBq4B9|{z#4zxIw=yXfy2umI1$LR zpk9AqPnsHWuHR;yF{e|{z>vGE2B1I&`nu^4oY8;iqozM_(;v9$4^02Fray4}Uw3_! z{DI>&%+4+151fsjE<yjAdi;UYQS+Dj`UB@j&L?U7UGw+@=R?dd<@n9PCneq=I6tDF zWFCKDKg9gf#!oWMA2>gnpJX0?U_ZqC(ow(Icz@vhXnvA;{DJ)t^Giqdj`s)7kLD+7 z#yia)*bgzkw3+8={=oUs{3MP4VwOL!A8NL=W7l|0(EfmdKV&vS{Sx%Y_VEX<pD9|i zUVq>yivJteZ!^yI`UCs31~r=gz!@iC%=^F}y6F$x^apPG12_GF<1Ot+$R9Xf!R*{Z z{=nJr84`8+181P-F81{Y&JCPT(8nJ*AEJkp<2MI?nOJ{d4@57~asQ@de_$^_58=>H zGWb0avHrjwa9*N${DHjyeS~el*aUxIA2=`B9R9#wcs|0m-U<G|K5#y=)_5oS1N-3l z$cFPg#UI!Q&qp@=zBBxReK2#$I(Cf*1?>-5>kpg@Fu#yx&%?XWss6zEq0=Sn^#@Kz z%~4w1A2<g|tVq)zIP(bH()0&zX=(ZcH~oQ|{=l&&RAt8aS)~3>EZpZ=fcqu9GksS4 zOK_j4ZhzopEz?VEzZ&pQbuBA&RsT0qoIh|na=y|ee<JX9u%GFVQm-FPRttzreDc_R zkM~%A;4D1favy(SU+gS-*KZCw^LO_vf1IqkjVL$c4$kl{bdv8^Blv6#%TF@A3+?)c z+VYKj&f^c<NIo0O@rzY=p<RDqTfULcdHjJJ$!B9ZddK<$+wzTkw#GZW3w;jed3YB( z&M&l)`Wh_rePhiG??T7@o&zJ_sMNJ<T+h%3br;(82W}Ln!LjUlcm~G0lIRa?>J?4v z^#?A>%lc-Vp=at{=p=vOdfQ;{TblmB?yfC($J!d+h2}n|=?|=Yuhf2zd!2;%Kk<Jf F{Rg<8R<Zy9 literal 30890 zcmeHQ&2Lr56*r;^v<oU4ii8LhHBQQVCcI~mT6M)|)Kxc?vP&!lHW28dN{gRgSQu7d zp)L@%gH(xi3<jeFizUc>Ey5oV)&W+wBO~FDhdllL=FWZ0%)4{%%)Kux$h9(=d(WJ6 zesj*uotXo3@WH=NG<xLE2>yQ><qs%JC~JCl^sGg_L$%{k`w=}o(SM|ggMa(Sms+FO z<FCB9I+-RWCbr(VapU;)>({4Ho}m1MB2>-yDYlcZQ#v1Ia&qzj^xi{RMIlyJA>Rz; z@*(#0z=roxZfRIA@O%|z;M%ooeX#Gh)Xkdjqyz67YVyhcQJ#82`T!k=AwR2h%%dLs z_S<iN<D-Lo;BTPBV=@c;Lq4*QIfBwc5z3BtedKH&$iIuiANqj$KDT-FcV#d6IA&*r z5Nq`I&}YiS=Cev)%Vqz~n>TyG6Z`p063*1r)Hd)8qTEG!in6TgJE#ZI_xF<I6h7^z z|2xJX^l237XWQQC>FIUQdminJ<Vh)PKSzGO57Y-be*~~^>209xBOQhF${1g~Z$^25 zl7?xtp`Z6L|9`JzU=D7A4mtmH--E{Qm-2%;|CK9O)`Rv?wHf+7Xb)`rA;bAkJu}4N z7~z?7YXN=zwT=zi2udiX&VNqVr@lXa|Es{-iu#1oKcVxfd6hN3I!@B_BK7Ecfi<b{ zj=}C5e8w1jYVpMWNzxfY`;Vn}Kw)!V_+DY}wRmO}PY6yD?_FK5T7Sv+1IjaE!2T^d zPfTZ9!SbW77xQm}(zk$`>x019zoYZSbj4Q$pGSlC4{+8hov%>4?0((_T=w~C8yF9k z-H(ZZx%Q^VTb?%*wlU8!{>?7gZLC+&8PD^Zu=k|G_(t~)#$`L`O9k;ezHivX^9ASj z7bwnk4gI=M1RJ`~>-N~|8r#5gpBTV8rStv_>pAyd&cAyx4lwsC+B|&yyO_=z^v&qo zBh~Kvt#SX^tn2yiyYDuFCeH`JGtN+WzpeCNwfAq@k9PV$Yy7$XkC0!-r9Sjujx+Qa z`#1Tp)_nlEITX%=VO=(UR`ZYRJl9*U3-P&y?+tt3h~?0B28BMG<@qS4>owXwMv><= z;@kG?ygtwByh2>=(JkmaoF)gK998)2=T&?B(`5BF%Ef+G`i|)Bu4nMl{y7xl&!Io3 zpvyQ{xMayke#r6sCH<UbudR#Y4;}IRqYmyn6QF$xU3*Zr0OuXn>isjcGj3_eC3v28 zjjxTD^bV{;(9Q3kW5zyY74q@?cQ8p`9vbku{_%Xp^9J{yc%HN7`xJQOI+;g*nvD4B z!>wYda$GbkQ=(CMg6E%5gsk~aI@`gQrYEFLH2-u!3{~$z@2bKgURqg2KV~Qwf}`__ z)4SdW#w`u!g&5j-6?zB6V6{&S{!zxjtmQlD&FVGqgRkAUThycL&3cAU4?})d>6pj+ zpcvlk6$6tGeQZEB9+O%0$ymQ#_@Yrg0=bsNm3HhjVkDQGO$YwF@X>YEf9R`zZu98x z%3k7PY^!JRM>}iu_Rwd_1OIHK5B50h7mdDN@F+i5&m`f9uXb&d{%=<9g7+!Pva0V$ z`l;T;7+B$Re$FP1KV+xTCggmv>=pm)U5B>wD2tNk^<1*&`yz18kzen-vOo5}v4>)8 z_9>n794ABW-@7-X?Lh{n*@s5uz8LB?Vqo#*hnt`yntz(_)%PptHv@Ng$9m8n2I0Q; z$%792qxlctR%8q;Fh<bLbz?#N>pf$y0`5po+{h2`ziA7<Kl%Ny%5}0?IU)5oD@F_~ z=T-Ljn!bK*b4*{P9s_@<GAZ#I)nlk{MA%g$Hc;zBtRsKjtQavc{5_y-<@*1<d~WPC zVj_--q<7j9)(?D-hTU9`Bb`5>ekPxr6(a_2(~DvcRg4%|4EJtO*bAt+J_s?~XT-p5 zdU0$c1{R<6tX0^rP`m7Yu6V+H+}T$n2Da>eEHU2nc)vbxa4ogwd9~RUyY2NVp65e5 zZ;HmwlM3S-b3XQM2Ysm^e&_ccoiDhCev!VeRWB68K5y6~&lRuNHMXG-So`HU$B2PN zx7Tx?e<V(|9RtJf`xW*)zBMBT7STTTD9C>9KaewQZhW*6I->J|wvS2MhpM+D{WuTW z`?s`T`af&@7v=r~egjvYU*tKG->b2IOYGB?4?v%j_|59DE*n3KLC!y%1Eckp>q2yH zk?){e`$k)i=dWl?XL&w~>3R*FAA=`4uL0k-U+49CmgkiSmwR*zK1q#%!E;pM!$0u9 zHU2)B<e{8Ae?|5Jx9SxGEBhn=N8@nHK3BN<KtA;S6bjB?^4o!*)9tl&2|51p{F6Es z(5DHmf2jAMY~lVRYrYRvK9hdZ;}V`f9ph``CA|adkox{PW<L80_z=G}`nnba%k_`v zt0>;&{u9r0){iA!t&>SM6rsHwuWel!??2ueuTQOv)t{jJgd$Y^MAFetz9KlfY-_Z3 z0Q&EttST(xr4{ncP)^qq^1O6;@B7Q6^;;Uw3)psbWwd`_`BJS<T;3bSz^M67dTXq9 z4g4=+8Ol>n2ySbv|1jidm5zDn90ZnM3=F>3cz*-3@tDlEF7<oGz$@dmBamwmmv)Ft ze>P$yUmGab8m(Vf{fEBV=V`LaUgEAUkJa$^zy)Jq$S;r9&Qc#r%Vq!4=$>A*OFt7g zsgEy5cWtBpSH|miTVwU7;9pkt9nxQ3+?^N$D}2t+*`)Db9;;8IE%LKvuejK|Zh5?Z z9)4RSkGs?sm&f|gkzemS{TKV6^G|PsulFf^^Y-|P@!gwOM(YpUc!_<vFD~|*G4SQR zo1jC^Ki&7B@%yFCW(<5~|9aT^Fc3HL3;Ju@ujW77Wem(Q!ZYW>g81)WjTji?Fp>*b zjSKy+`<LG-^zr*&mFwhK{RH)6&KNN;=T-LjCi+{O54A<=(eW|9laW3B$AEc*&zRdr zY@qo^)0KtQ*$(|i49xXU+8XT(-$(t}W5mFq%|!H0eL-}5kGkD*{f)-t2aM@6>cUtU zF>p)|!ijVmeuCX*41Dn~8<frk)XNfk!i<4qy5ckR1=7qIc;b__O8!-BU#H!*=YbfB z{e#_R46NHd-v2nlc;n+8oi~!^`B=T#9lOo-sy)xg>Nl}xo|G7)bt48|yu5ci=u5@$ zlfG|xz7SZazeroxRz_<ViePj9(Z4TyU1J;c-zNt48Z!p&_Il3!H~J3SF)+?y`xR|o z{LhMkxsQ$2AF1}lx!l=Sd&vFIuzBpGjo_2#1AQMO57zzL)WP$heO?i?Kk|RZ_;dfR zkC5NM<^CO=BZa+xlW*zk`Uk+CBR<-Pb=mlt^G~hwGiqIk&n+{g+xtc=$8!+%qRjGq z6w~#(^>zJYv`6PP;M?}=ygtvASGdu64d>r9IedRd6@KJ@Yy8t>^)}9%*w0cQ&cAxQ z>si?^{SUc0&VTz{;gTgE`5`xtBK^$suZus4&hd}upVF~_wRwX3{K}=>d$|4!>_4pe zj#%w88Mo+h3C^Fc@lC?CY5X35&F`OM=JSn_?_O(sch_QIwf>!eZBwxEaXimujdw{` z>!jWPqVM>7_VO-tc^BF_jc^Cyt+@*gBN<~bX5*QgXTW7u-$6}!VhoJCBD{+&@4Dc* z<Ih0Q=DZ6Hos4OD23bVGACo!@+ZlsdF>t=S(9pv(zyp*tOuOwq_>CAi^e!~yc?NhG zh#U8V{Wa`|Z+QodzLznux--MOI30JPAv=;2H^w(&VEfJ>Fca@W1C#SAYkXr2S50{% z1_s_F3T=1Zg@z2XYg{@*=tc|-%mIb%ybBFnj!6iHi`R&OeeOa7_gR;)e}ta)k98+F z@h&u&xo)^@385P?F!tiiyU@UW-X&}!2Da?x-LsCn(7^q<$J==q8raP)**yq7?H_HP zJMTh+c{>WnDr9VJ-j44ZYni+w8{hFmUtH_jg@V{d3~aA!(Cxenjizp|=RtR&fzN&H z5sK~4w0G`5Mhu+yE;RJee)>Oa{5ihdf5_kd>Be1XDC7L&I?wNq>t1|r;XCQZzJYi7 zgZWh6g^r!!sNtjXF7z+_E_4|Km-)bs<sn{2-=-Ki%~WSw!5G-7*QY_{*I=oZXVP1` z3~2jEN9o81*7=G&=ZJxez;(#NwvZUOL%s;XJ}aUxt{Auoj8hhPJ~6OUzDNVGePZAu z5KdXo7}zOaq``^>T`_PG2&b%P4D6II(qP%`ih+wjIAyi*PK$w^@<kf7d7c&n7lClf z2E@Ql9eEn;b&WdE7v=+Y<OAo?pC$v0&=@#Pop)P-7}y&liLpyDaFXgw8hl;Gz!_eG zkIESM7ajwb`M}6~EAxS!D+O{7-kN-1r;!;A$VFg2GV>&Y^MNx|XEx&xyO|FioDZC- z*pneNAJ|i^H=E3ZqVGNOfxVS_GDi9Muk+^6hs1nfPj$g;m~WGE-lgON2P^dyfUN@( zJIc>V%m?;V70f2r<LG;H<^u;S^%Su3ViWU$Jyiv>`Q!r!EA<qx>}Ea|@>I?IZ%<Xh zZ0+$*$p;Qr>M78k=PCKXo~nY`+WCta`M|-7GX(5)jqEBPkbB&z4DmwEzzNC+E(E3t zi=6qunu=VH(f(a5A2=5<gyg@+5}#Wf`J$NrWj=76k6q>im-)bDK5!52-Iw{m+M@e5 z<pXPG1w9tY2Mz*CV9uKloS-Tf3Ex9dK5#CO6d^6&mG{1S((>j~)Z}V{?Oyr7xs-bd z`Q!t8sL93B&XY{Z2hOF~L&zr|*h5V&7NO_GI`V;YDfSQ&9{Io?YI3m{c02Ncb1C)^ z(#G4F5A2~P7fXAdr{n|YQtTnr&R@*P2lh}E#A2^&6ju3w9r?gPianV5??<Sd!+SA1 za{Zk7z%ftJTI9?JE{xlSeBiu&DD#1{Jy+%f_w<zcz-2x#?_%K|TKT(?5|#|y6)EpR z7t04u@TxzlybE34g~m6SmJjSdnF2V0S>A<q{BEQGHwLkmccJC)W@P?3@8lZ)_FIr6 v1DLgWUfzW+??QL{Zlr*zl*n4%g)V<LQsTr=M8qED??!?zkc-jv-;MNt4UtEr diff --git a/dlls/light.msstyles/blue_radiobutton_31px.svg b/dlls/light.msstyles/blue_radiobutton_31px.svg index 5dddadd4ee7..69f0845edfa 100644 --- a/dlls/light.msstyles/blue_radiobutton_31px.svg +++ b/dlls/light.msstyles/blue_radiobutton_31px.svg @@ -5,18 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/> - <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/> - <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/> + </g> <circle cx="15.5" cy="108.5" r="14.5" stroke="#aeaeae"/> - <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/> - <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/> - <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/> + </g> <circle cx="15.5" cy="232.5" r="14.5" stroke="#aeaeae"/> </g> <path d="m25 139.5a9.5 9.5 0 0 1-9.5 9.5 9.5 9.5 0 0 1-9.5-9.5 9.5 9.5 0 0 1 9.5-9.5 9.5 9.5 0 0 1 9.5 9.5z"/> -- 2.32.0

1 0

[PATCH 3/8] light.msstyles: Fill checkbox background with white pixels.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Some window procedures don't actually erase background when WM_ERASEBKGND is received. So when drawing transparent buttons on such windows, there may be left over content from buttons of different states. This commit adds a white background to all the button parts that shouldn't be transparent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 8250 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 18 ++++++-------- dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 12426 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 12 ++++------ dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 17466 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 2 +- dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 23370 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 2 +- dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 30138 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 18 ++++++-------- dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 37770 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 10 ++++---- dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 46266 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 26 ++++++++------------- 14 files changed, 36 insertions(+), 52 deletions(-) diff --git a/dlls/light.msstyles/blue_checkbox_13px.bmp b/dlls/light.msstyles/blue_checkbox_13px.bmp index a6b1903b236fae8ccbbcd272d143f36a01eca005..e3376a5ab0070a243774b0edddf5871e59adfdcf 100644 GIT binary patch literal 8250 zcmeI0O-NKx6vroO+e*}BZQE2J27N$ei&kwS7tx{*nF`zl(IT)QDu~t<NmiiX#u&e; zD0N6t%u*{VE&9@Cj6}x_E8pCEPWRmLjCW>yzB>#I8t>tq^St-`?z{8Of8PD`%J%Qr z7|_Qx^;xCbdev%FTNBtASgT^w2KA9~U?7nAqY*6Ici>D$ibuz~wDGyQInmS815Hg$ z7z%}48;w&Q=Z}nxNOcHAbZs<Fc|5;YKF>vYydLheiM)QBT+YdrVSc$t*Wz)$u1(A* zL-#w|`gC`9!|3R!!t8ZG`XP?%%il3QntH=nMBts{fK{6j&uwyVG=8@NFcww$#{fHT zNfeH&K6MRfyyK=!&hM4adXLWwJijHe7Vfi&yndTp&dHTwez{23;&HyNP0S}l_06U} zlwWfMFkEe?1JVoWX8N1Jnxl4lqkN@Ln2m~f%Smu<m7;TVt9w)9@zzrSza~`v36L*t zOOzfORpat`wdDCd^SN$fUO3g;^jd75H=M)k=l^YDt_<_bMOp`s+pLLm^2(_CW>p{3 zLvs-1;2k?1D7}zwU^b%k6SUKt&W{S-yR&)r(%$Xw^&urC6y&+Q8s+g`#`?2~`D9k| zUcXv23IJkoa1h4E#-v+)(`!okU0q$!-rkPm<Ks(mCNn%dtn(em5wTcI5*LX?GB}f= z^-w;qX?l8EbJ1utg)<q>HRIIOlx%Bj!-<KBB<IBtpU&AZ#7$04%KrX-pmSnYvPM^p z9|h&hLsfu7&B+>?HP+{*e^Z*q#tVSg4+37<h4`{<Y0hL?E(6{u2mCWDF!EO7m7R#M zA7*kUGt?sS_s^t8@!M;OmlgNsNh)VDN*5Vx9~+i<X*=S(jz!Lkp?SUzCAg7rg0o?W z`}9m={b{XH?Uj8$s{Kb+eka|JDvgS+iy%i^7i*YS>s0>+LWD0tyx|Zy_x7Uv@L);K zWW>{}5WjyIaQ>Ho$#>GZSBCQA;|$JZ<a?$4zl$1$A8!=52j!>E6wYKa^r^lFe19dK zySq_-UeKEA^I~Wo`2JFJ@a3t#o(-e9$a5(koz)uEjPFPFy9Td!6kI#XV}ES+Ra8_! zZEbBz?RlJ{xzCX|2nK^tQc?oN#l=`(U%w=0GL@B;P+D3FGcz;fD`Zho5jHe5WN;=^ zS63(1{+@g;4h#&)!oosqY-~*7OvYR@pZE3k$%29cY;IoMC%hP9dwY8|*V>x+?b<NJ zg~MT4Uat0xh5NRW_xjc1N4b{EMcewAbNGz!NB{fxqv|<iYTotS)+d_t<&*LKXzqU0 qtewlbtrs(O<TDGt*Y~42`%zO@Zs-2Ko$ATm?o)a{-M5wONB;rk9jZ$J literal 8250 zcmeHM&2HL27&K|soGR282&k&mK-9)=I6yB*x%5y)mD)=s`U*Yu5QlK!++#^h5PgB7 z{BVdOB_t1kco9I{gQ3!PKF8~>4S4M$Sw*syVb}Z3?5@2N_S3Sv_cpCq*LQqYfTzGu zAfcp{M=0AVe9T--Q6By%!gk+%{5C_8G(7gi&(6+L=jZ1)fC(@kQ2e^pYHeIxTy&r- zqyEIxo$Hq3;8vis`j_#!`0DCv9hx!Cg|`JMi66CwkLg#^+<836b8t??8Z+ejkRR>< zU8bWr`GtG~q@lS5q<*t~mSTsQ6g$Y=04BhEK=Es~zqNs~!w#}#R^9UTD8<3801y33 z_<U{H*B9&1jDb)dC4STzKBiwu&&A{X8H1D&YfRaC@;Te<13zru0lG~0-~;%De4}rs zQQiVU{MI3V-XCeH$+3DfF;o*^J}^x~y}obkY=G058fuxfBpyY4YHU|{|1!Sw4t~5? z#~5Rp3vUZj^0^1$a?Y|EuJ<cxEFS0M1}P)fm?75(e$noxbxoJ)C{BLC^K|a(YI;)N zzC~T?H;WH{#(VwJ`2qbO$q?`LOYHTl;?Zigx`rI4i5%t2qVFKYoqUurmcX+$!0(~G z4}6}d6E)!1aNkA#lsr8>)leTm|H-QpHK>;^FE5{Q4s<!R4S^55jY?4?w(~m1&Vw^* zx7&NXO{O6pI0e!{|K7fL-U07tUI|SR_$6rKe3bH!CGt^LRn}NJ(`4oBLXV318@|{Q z;5N|K1NzX;^{7j8kgegq%l4lqnV!{<YYmV;&3M$M(X%C{zj8dv4qxUFAF}<d%cG)Z zo@bDE<-r-T!%fGdG7a^EITkEkIb(S=h{o0x!L>YUYr?KioR50)QSvDAlcs5GFZ3wl zRz7X50aFsVZy*=$0e!Qs&Go3LnH+01+;>@HCyAU%Lwx|<j7LR{SyxNU`0LThiIzir zXdbC9kBS<apZA&=Z}Q-b#>cN6kIFRE$Mi%iknXpkS{@Cev2=!3#Cx$kYHQ+r6lV>x zGYY<L3(lU_5N`qtJ&L_c+~*SDHh><`2j+Uzqp5+{1(JXU41gJrdNd_)obOT8bHEUA zdDNppc;?EZWdt}L4WOY;3broPUJp$Xusmvy6Lx(fJ9|PNlfoS1^HD5V&?}&KT-~jJ z=D+o5d_EfenX1dYJ~u&gOR<Y3G;uzP^Dx;t8h_Vph0aI$oMmOuJW=c?VolifiO)w@ S<hM}KQ-1Y$umAVoLjM5TYj8mT diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg index fbbca0ae2f6..819b6f4b667 100644 --- a/dlls/light.msstyles/blue_checkbox_13px.svg +++ b/dlls/light.msstyles/blue_checkbox_13px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="13" height="156" fill="#fff" fill-opacity=".98444"/> <g fill="none"> <path d="m0 0h24v24h-24z"/> <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> @@ -30,15 +30,11 @@ <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> </g> <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> - <g> - <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> - <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> - <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> - </g> + <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> + <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> + <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> <path d="m2 110h9v1h-9z"/> - <g> - <path d="m2 123h9v1h-9z" fill="#3096fa"/> - <path d="m2 136h9v1h-9z" fill="#2979ff"/> - <path d="m2 149h9v1h-9z" fill="#aeaeae"/> - </g> + <path d="m2 123h9v1h-9z" fill="#3096fa"/> + <path d="m2 136h9v1h-9z" fill="#2979ff"/> + <path d="m2 149h9v1h-9z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_16px.bmp b/dlls/light.msstyles/blue_checkbox_16px.bmp index 3504ce48ff7b2a97db094252fc1bd13f6ab5fa00..3357120d6a9d8cdd994df075df374e6d8a92f27d 100644 GIT binary patch literal 12426 zcmeI2T}&KR6vr1dAv};65?*-Xjc5~W4Ss|^G&CBMCPpy&;!6cnHAEl87p#>KE!l*m zF==!QEoj6>gQ)~8rZ$m^f(a>76Qv2n8Z_C`O4EXD5tzC69PgRo%-*H5%iQI`VKW;p zXP7y^b3gX{XYZNi;4@u&W6rBf{XVAJ1FDUwRurp>-KT79^Ew@-Ul@zIKXeKYKK<NV z>1)A`?%(3Jy1FVRCMIBLXb1-f2Lm<oC5GAA*;%Px0uci>@+F4*HDS3AVtCAa&eZaJ zO*!@t6HobI(r6C)_)S>y-OBTtm{`4k6OMhuz*7$HB!9=p$6;=6PKC%%Kcqp5!CK%o z$z^r@;?i}2ea(Q!Y7pOkFjynsk6#8{T2O2g;H7Sf!V08)=e;A}(S-E+HDUQ4V{Zt2 z_hEOue9qMJd`&s_4-?O032JE$?5iL1x$UgZ@Oqe9?!%O0|1j{Rg?#gu*xti{V?E~j zA<dEY?j!~FzGSXnVwLt`WkJ|qzY13Oqi7}e25ZXKKK~j(>V{%p0Xcm}qBPLI@|8dL zNbc8&<@a7}2&?BYXT1D*U}|~3rX2f+iRZBdwKNCz)sOkyc2;M2Jxne4Val<8D0roX zyz`fIG<*c)l|FO*D9w@fVCA~f;1P5EI_!erJ$%0V2in6&`~P5d59cjg-lOr~rdH>7 zx_{p(Z#s7J*T=tG`Q5(%FEsrFfM{xJf{~FCxm`~A<zH)SE07jSOG{DJRXJm9<>T?V zB(}4&Q`XhhL3w#O&dkhYjiK}X{r$42s0iEI+JMHryu2)GYHFaevJ&U#=Y4A{oo{Sx zgy!aEHGS}WlgXs0s;a{3>S|nET=dTKy6F7c+M1vjUt_CkQ&CY-fwi@@kV>U8uIoJe z``M|fDOpxlhV}LJu)e<T#R$q%%+b+NSyEDh4Gj&z<22zZ#=yXUEG{m_mX;Q0jZJxq zkw_$DdwaXb?{@tcT>Ve^f9@#Y><?LW=jEth{rF86ICXLRKE(Oy+%dNDW2dFVQf=1# zBH(*ZAm02vdkmfbWmw|ThY&A*;N%vrtq45%EMWWqIyIikJ#XB6tn+8z0Q~A5Ku!Pn z&rN|{Pa>W;gn0LMZr)b9l=tc%Z>f9F@%@M&JrB6Cni)gypU329lfOyqsC8>ydTzr$ zL3#53V^TWLd(OTN-Z)Koit+0OwZ?l8hu?SC*p#OjlV3>u?!z=6)&C)@|JBFCr4E3< za({MH4*J!P;-?efoIm|I!orp8+V$b7jw4o1_ey*4Fj##D5N=<~8bj}2&Yf56J`|HD z-Q3zp347oLus?kYsmAj(LpiwFbY6Vh3gY_?#il?1;qKqU{_GIipEn@>d&lGacvR0* z5bk{j4NHFt>yvu4&#C*Fm8pNde~#&AVezW8&g^$;U8f(P@%wT5IY?fX^t?x0cvIcu z+;Il&pX11D7o~OT5fnehoi#S)DUO`^Qi{u`(tK3^hpPUM_Wx=9NBjTuy^^#W?f>2H z_x11p3a$R<dwmd_PyMIIjd(Yo^ffU#E`;@q>i_8bf0LZg@Xe?G+}t}maU%Zz|NoDu z{tsFGpSkDD(3`Fub(~NAr^kzU_y0xoH8D9Zi1mx=|4`NcCizzg`%jvK$((iHX#P8| JUv~Tc|39u_HR%8V literal 12426 zcmeHNJx|+E6m`_9VW>oxPDmuGP#|HjBN#grmP(bnRLaH=VCmE$A7seX0Wl$xPzlsM zQo@D=AyNk>CPp?U79<vi5GRG#a~)seI0^Q1IwY2#INay!d)}Ad5x&o?f8Ev;qio}M z9(V`*0YXYtc?GMO_o><|LQ%Ru<Pz(jzy0Xlb60z93#(SEky@>G3h01v35q?bR4VgF zM@MzEkwg8Bt?7}M6boJ+Z5aK^aJkXr<Kr;+EgCQTWG!)h#HV$TfnuA#4A)q58((($ z?fp+HUms)tl8zccMy3slCC!ocfGGH9fRuhs-A2S#JR-93Q$PoVOHk~INH5RB)<rgv z6NP2h`lnd%@<6v=2`+CE@qHl-ehV=6BKu`5as9&Qxwy5oP8@5kv(L#|IaK#jxDPK} z;!Fr%m)ZL~S9AYDM@tPLBhyA#KhPX$FS8VdJp*L*TPN*5>?I@ZqITLYX*wWWLf1>$ z$-}RedBoQ{B`qf^68cAMr=;e&Um5Q6`t2@+(RYi+%RX7lbCu<B{3P*tEN(5$fn%+8 z_BmNAhw5Gm_u++0oC)FUW9(mOF4^dmlNp&dD3&yb`PU!HTC`nO&rp}rufc`(gZF>m z<PYP%zmLn8mNDL0{g8i6_4~gM^&i4UJOsWtZO9S(ZwEZmLKFD-QX50~X_K3UJqPZ9 zWngHr@i!3k1pG9EXJIda8z2e{6dS*afCGT$&t(pkYv2la&rY^B{tW!a(G%Y{Z4CAn zxB%XoKEv4f)?4=aDjfGf0|@g?2|iKQfEG{#jB!fxK~qw|Bd|vo9{5Dt1PW9!`BSZb zzvcfBZb)R}hscK<^^cf={9j}eJEp&h^NknvZ|9@mwBgGvWpO5Qj{2QQCr0Yu$``rB z2CkoA4gHJshgsx>m+;+Cjz{~=Ui$dicoo+NG=Gj0Td_I#t}(7FkzE+je;>aPoe`-) z{bLL<#NEPPAn)wczm?B@4zprwaTT%mXrn=SFUPp$Q@qG6t|7i9a`76EQ-*J}kx8V$ zc?1mo%ks@OHt~!KM!ma#g8YAi@_!+eP`j8s{JXC?>VH`N*e<F&roY)KsxRu_&c~TX zntaI3vasjCoxZ1z)W4Olm(&ehKjB=ZtN&jsv$(!QTQ`*B(SEZRE5B1pR@)`@facF} z&9XX&m}}rl>?Q~FZ{>^MpJqfQHSqVpwWr1qcMDvIV!!^aeC~6YZSN;n5qnR$uE4ns z$GGKFJf6iG;#-}fR^xHX@Tm=~Z3>)6z|g-epW472Hua)b=+=$%vLOGTtnYuc|AY5` z+MtROy#IICfqw_@|J^eeoxlJ2F#qRg?Pxvbf6wg(d|#a3(OHkD66F8E_kYSEJ#8M4 zyyTzOz5@Q>`Hgjboa+B+{et{|g7SZ-XKuakCI1Wfy%h-7FUbGRJR<o2-<~X7*Mj`P L7x}|ffB*Xjzuufm diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg index 4646a259e62..35dfb532a23 100644 --- a/dlls/light.msstyles/blue_checkbox_16px.svg +++ b/dlls/light.msstyles/blue_checkbox_16px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="16" height="192" fill="#fff" fill-opacity=".98444"/> <g fill="none"> <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> @@ -27,10 +27,8 @@ <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> - <g> - <path d="m2 135h12v2h-12z"/> - <path d="m2 151h12v2h-12z" fill="#3096fa"/> - <path d="m2 167h12v2h-12z" fill="#2979ff"/> - <path d="m2 183h12v2h-12z"/> - </g> + <path d="m2 135h12v2h-12z"/> + <path d="m2 151h12v2h-12z" fill="#3096fa"/> + <path d="m2 167h12v2h-12z" fill="#2979ff"/> + <path d="m2 183h12v2h-12z"/> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_19px.bmp b/dlls/light.msstyles/blue_checkbox_19px.bmp index 005d8148040fa29a76fe40367fd9396a0689e6f4..6a7e904fde9196374105d254627f38076f4be273 100644 GIT binary patch literal 17466 zcmeI3-A^4w7{)R1ANUV=YvNb@y700ZOh~-(iaQZ$m5{&%7p4@57*JCZHMXT-KY|w| zgecI`kXmYO<RglO@DV=K8v<?bT2n)?XLn|tXZE~@!<@6-o!P0PXHU8eyUhDL@4P$v z?C!JMBk#QNR+;*ols{YL^0Zub<nmP6GiBwn9eq>&DENr7vfv;7B96TMZgWAGhz%9m z-*<O+{i&%bJ~}!ohKGlZ7sMeRoXN>azOk{v<i{667%zxhUtedGk1dD38}T$Q+LolH z`XpgcY|1j5A9}rL-J}hxJ?GpvUBXzj-KM3n*u?5FrNYAT?Mf$H>X%Dh6%X$E;zBJK zZ7&LO{8{q_aTh<};*Wch^F9|pon^v%WUS9>jv?;)8K!uxFG!Wo*m3Cm03MBtwk2t) zK1mo9o3hOItzIu$H)+$_o7MckP%jrc0i6No{Ciy7{FVvdv#S&0ZuByxgZFoQaZd7D zpEuW3%xT1(ui@gs9iKnE>wA|!<eA>rM5gB@^F_vaV;^z;=RL_e#@XCCCYYtR$~bnb zk5N9>9GYAHBR|vkx*C&yonf<1^|6W7V^Wscb+leDS~qEFA5aXf3&G_vX}SdY7qZO8 zwV#8$BFP?q`P*!NFBz89pTs&LbqD(AT{_Cy{DoxtCG`(F$RFO3dU!OMt}4!5-{mzq zJPLRfw)Y;0OT7;BW4u)EYcWpJEO>pU3&oaVy=d$<?P0FhVfH%Uosic`HH_OLjyz<S z8tu~0aanuR#b$2mF;riDJJz?hw%FX<oU}D@Jr=FAVXU2<9X2vDqMi%H<rQOXZ*MEk z%*>2BZ=%oq{5+4!O=nR)m@mHkAbxXmlc8T!emZM*c9u_1Pv<z43(m{vyRfhjnxD?X z`JD104z+7*YmepWEQ$+jS65d#Vip${3-U8%;X8=8w6t`9XTt(-Wo1R>x4gWZ<Jq!^ zhkZizNWvlpwXRt%b;6~7xztto9m+pR;+w$FhOZ6(1b&RQpCdgI_}SpO@R{I8g9Cpj zhHggoA@8#oYkri8A5L(=V?HkpV=av{apJik=kJfl;}v5qj0K$jW5GT_pW!yii#Uhq ztmUf#2hSY5zk>76q`V(Qzo_x*tifh3F4paHsE*j@=zHnY@ceWZ<{0He9BQwh4tSS4 zi}Q3A#f7yKr?|>*?6X3iDGT2*@lC+H@_9~E)!egTf%oHA0dM@|KF^i~-nFlTIYaeG z!XgH>u34^h0?(~-`eo_W!q+DK%IRuWe`wrsTZ}8KtAUR!{phT3OFmZYR>mFhqi?}; zw|r(O<CGsQ{cZR|iG8Mj(2r&tW6b~g6L}2B(`c%%eqLa=ud+<<E6PLnZ?wna6=Si@ zah5szvhc1nsAmM|<KL7TsC?J(>wKNXZeLURU?0<dWeeXi#fuoP&hjTd=H6I+jzeQ- za?U8;FH!?T^3z#@NsSJfXYBXhEboh=yaE>KM@Z|>_HdQo6g2SQInI=YG5f!r$@01- zZ+~CduoUmtQvq-0%N);^736n1c&?PqEeR`seE8it%Y{x9_|cZn4CS1}^SGQJE&c6G z@2lp|`0!jp#=+0V^Fo)`<fZIK_xJa++S*zk*NYFk=NlXxWEB+^%4@Busfooa#u^wH zVCCiIqN=KjcXf3!c(-+Rb&+0-&KepTQu$O?R`R{QJ#`)3-QBHtQRCHF)z#HJpF_uQ zXJ@D4)z{aD=BKkf&+{oC;!xYs(V=(^4Gl$kI*a1M+V=K#j`}q=HWu(qS@@2&wl>9U zYHG@9Dz@9O5ZBVuqIk{C@;*hbCt(o}`@{u{7}VO1k>c}Punx1=aTxvRQr77FxfADi z*K-xTINux9C(UdBx;Cm-_<LHff45$xpwWRJo%Mg?dL{Y&;G4j!RPR~K_oI~`oy5=S zaqCB???(q7a`yTvQg>+I#_j*Oekm)hy*@u&&j}ZP^nv%I`=nQ!K)>?ekA}aE{AkQ3 zt@5L#o~G|d8y!Q=y)@}NMQWx#$BV3|d6`|yrS<wB)$57)(UuyG|KE}CN2l*cN9rrQ eVcZL)K0y3qGQD??U#ryXFss#*s8=a?9e)F5i@&%4 literal 17466 zcmeI3Jx?n~6oyT{NT2!w#Vu^OlGnOjs^}(Csx%Qoq9A3uR1|p4hYW%yDS|?53xuGf zKmt+(gfZmT<TnJ?Mwz^4c8;;vJNC{Dj&8`TIG)|vInSOwvmDm%F7Lki{HvT?e#GY* z>@(P(u!-DE?nAV{eTk2OMdWhv5A6}}zW#Q3V91D$j}rUO&d#PUE-qT<=jUyhurTtw zIXyj{LVF8VxWB*uapEwUHo^D=j8)>nBHGU6s2Oy1bu~#G7_#QR5XZB!=W(3*0{d@M z<H(b7RjbtxOijn)ew#KKmkon`{zt6msuK^$nXF&7b*Hy}_0&~ae|SC&TJn>1RjkZS ziLh`3dw>ZGBfq9tee()!OOy+%;)mChe65(Y<OlzC$qNgSsLnanXvtIOWfF&OEayhI z-=yEOOtOU=5_N5|7jK)iNnhS}Y5Djr4EFUb&P29W<;%TJpw565i7<bM`m-Xwe`|G* zNq(Z755Ynm%+H8$_7AMLRh*`^mHckSYGL~R*V1&m7TmP!K?D;P7De@-dB6X53cjsQ zJ*bFNyV^>AoqBPN<FV!N42xf0Pa>uVIw$UPX*oA84EFUb&P290nJ?ZpY57R(!`njS zCQOZelPvDHX+6s<YbsxnbDcol0Soo7bk}K=%C@|?egze<TKA1$rrjvs#$3C)Dmkdn zbWcwA)G(KO@+R){r${pauj2Au0gN?{$Ckr0t+WpM4)ZKEnmC@t*&W@EIbSrVrY3_P zb6lenqZ#4j(j-RHt@7opbtsL3>far#Y+HB8kLn-QLD&pfw=nCvs_Ln%(X<Yh*P}Jp z0(T=v+8T|yS%MvsuF2zvwK^8&VgdU)YX4CdUK$IWMf5+Sy`<|#jX4lPOqj$4-+A~_ zJk8_d<4?&Keaplfb-wDD-M^36K0!R!%;7lDPtPC(_SJOpC0X>$BgyIEZP0kcx0l9C zve-}8V*IA^*-i3HS#%7X=N9>){kiv;HZ1ao-;VPAiFvjx#oI>iD$l`U2DdJ8F@syh za<0)m_j2#29u2)i>L+fx$&J#rZ>1h%tLKm|M0$3tkGtzkq;E@|snD$xJij(ASW;6; z^Toa;*rBNAGSz4uOH^hTu&)#E&mU#srLiy%i|BuZT|yVDs4)jf#Lya@WQlNY9(@!~ zQ&eYUjTV*svKlw^d<R*D6U1`O9L}Sfb0I2)nl8Qp7HNMf9_DZhU2!8GKf9O4OS0Hc z*COUk=~FK3CV8eTItI>jOZoNHXd9N~h54P>H{Y$%wk#FjHeEBcPKygGCOmzPf%RN< zf}X3z^~>@(7(GAh)~~0!3Z2{PIUo7Sx+-<#SdW&vEi@2QP5OcK=)Y=jUXgy%sRgT~ z13%45_BHZ@9<)w8(s68cAwJ^2sYkaPrKNVgIJ9PQT-0)&d;4fTY7`f+ucP*7s?lkz zs8(7;|6^1OF6kM89McGJA3eNACt2Xkqpw4AB96b1H5zlY9FH4*zDZWQ5u8Nz(lvAV z-07N;V;cePqtoL{vcx`Ww2Fs0+;-}v4LQD6!hQ50FUev*T^rSln<_rsNB8qgS#*r3 zR@_p4eKp#KC3*E=hkP+d-5PDnlDtN+P1g*q)8fL42~VG6V7b?cUOl>AT%l|0DdOyF z<fneuVm%uAHqN)r=WN)vNzbO|h4@b6_2`V#FyedKcfcINGTlcHVJ(2sf#H@dca(*v zVJ*V<5%xPQgc0umHuOF^g*6W!isu?8YcyJV=aYCt&o_m20-s(EHswO~fOs`nYJ4dy zdX1Fh!D`>KjxFNt!3KCKtUl+IjVk(xw+rjzS+Ib}ZNiAxSEDUi#M@T9ZjE+eF|S*r z9a+TdE@NOhYaRauJsNrQ&kVa)k$z<i*BAYsIxjvhvlRM#y{LS>_!>>`-$~s=>9!Wy z3F#(HrAN1<_UWSMgoU+kJeC~30{#2ZoQdo$&wq9g{YcN!=O%5B&sSPj^nEH{?s_!o z$ozhEm@nJ@Uxw79<7YqW{b=ahZgsWg-;dVMf7%|_lhXE?_IZ|B#(chfzLFVG*TnPc t(f<ADWSaZ7Nf*NVNdEokzO0Pi@Za4>=cspt&sT3YMz6o;`FinM$3KC@pAG;3 diff --git a/dlls/light.msstyles/blue_checkbox_19px.svg b/dlls/light.msstyles/blue_checkbox_19px.svg index 9e45a9c8048..9a069746204 100644 --- a/dlls/light.msstyles/blue_checkbox_19px.svg +++ b/dlls/light.msstyles/blue_checkbox_19px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="19" height="228" fill="#fff" fill-opacity=".98444"/> <g transform="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527"> <path d="m2.9e-6 0h36.923v36.965h-36.923z"/> <rect x=".47226" y=".47227" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> diff --git a/dlls/light.msstyles/blue_checkbox_22px.bmp b/dlls/light.msstyles/blue_checkbox_22px.bmp index 8b072c13265e17dae870cae1ce30e7e1141a51c2..153a23ff76fdd90ac9126582b7ec93e1ce1c2894 100644 GIT binary patch literal 23370 zcmeI4|4&v`9LGU&_80VX&L3P<3#;{mKZF{}X10+()QYXvYHe&y*IJvI{M439QPWt` zTuhhRXbrIp0mU)CDAOPmA~%=>I*<tt0}-F+-1F(2dwE~(b9gTIaPRZz9zD;veD1yH zoY(!_&-wDX&*yVt-5VQ=v+U0<@q35Zo)X)W*;!fHSx;x>i2bH_#jklE%F1$nWC^V+ z-2B<RDgh^+P|7XKV%^={ytcNMs;jFbZIaQ`)59fG%BVcGy<|eqv9U3Wh**?OGUPSD zl>1S5-nOdl-m)nBhU@hCgSG?boQ2uY*M9n{=XH-C78lnIE7ki8%Te1I?!%cEYCkOY z82yGdczk?3rR%!%ZMa6NBz#;d{ib9|zey~{=yVyUo%uvxJQHn`jJmztX4dWDk$I{< z_4_z|{i>tmza5eLjRyX-Y#qJ#9?{3U<5AV!aGicLc1W~?I!<(tVMn#T-+8s3-?3kN zoR2Ei>qh0Fz2Q3FO)}LESl0(Tqp$1IH%L3kb-i|X>iv-PZSnieW<zh)?u$8=4C#ZV zFJ|`{JHMC54!=gR@AIN<g266)%gKr{DI@a~eb|NlLeBzQM?TUOx!?H6UzXG{eq_CS z->yH!JP#?=dpBHXY-Ow+xOjFAv(1hlzww}+*FA<E)%tViSBWvb_-(Fz;#z?7QKg^0 zh8r!`2m58JeX$11H5vC3R`THvcU@1HA98%$ejY!v!Sx-g?RAeOL;5z!Ojo=*U2y`$ zHB7wP$t{E(vuZmvmZO%3JvQ8h<A^fv6lOzz_}MoMQ??1>qCBkh(>E*+?F@I}aRxhu zmFc!`y4Lk{`61+Fp|@(E#T-ipV&KLfKYID&si`T}($d23-MgoqUsuPEI&Y_^r&(QH zo&A16Lqh}2%*<%97vf50eSJOE)YQ<GD_8i56DO##v607OB5o59m+<3Cz0RCDV>5?` zhwW$W!NEaGvd^767s&SGHa9oh`rWv3BjNe|+O=!;I|xlpO*|ft`|9n-otT)gu3x{N zz{I`x_4V0od2J>>IPaByTyLFZ`(U@WwkBnV<;rXI_V(I2ySBDACnx6V%P3sQ#(OF4 z?d>9+&t02D<w~|3gOYRU(j^X?rGhJ2U0q##U|_)Q=Tvc_CuF8_;nyD5{4xBo$sf<= z84&OHtQ{ERp(J>a50X1J$mr1foc_Dzu2+Hg06ig9eJ4g3?ON~TKKE=SnjF((g9qv5 z-nq$W_XeWU7l{7&hSQhN5gjPvG<_$S4IU)8ljDr`Z6ez7JW+3>v;K8dTeSUIqVL`e zW`hR_?xFV_{krSiHPyCh`*Fd}B|7*Hr~7yP^#%_T+~I#Lx_l~;iL%ziP998NJLdCj z1s){Y2FaF6hyCLRA{UnA*$O<!AfC7UY`K%OtNh5xvw6$FgY=f^?8|pZWZR>ki1?o8 z83jB@9hO?>)J}(8^||Yh=e+}?w$VA3&kZNP;&icUuAiYNqz*@?4tS6{ZFK5@2dUFW zrw(|?!=@sCJmAS6%e*YEkt!+Qk&^ji$%fuh*peZ0(lUQMo9jjVUN`2Qte#{b4sPdq zmHcnAHj6pO+7Ed0$EnRTK#xGbr8CAv9q=F@B$rPNvG_@`7T(qLnHu`?$q^Pm`nsJf zi61W_n$~0E{vo|~;8UZ5xrt&wyh5yP504#uk>bC+#c3wkAA<+!a;L{x{O8RSt9Y5L zfhK$Xv#y@B9QNCRZ15n#jn{n0V-+uv)!#6;rV6`RJyjxCwTj}^(r5bnWAGrs<+rX{ zR^RCaCd#bKKRJ0Yacznx_s8HtqHU10x{f&P-#!-WfLL3UaSa}%TE5URyLixkcO?FM z$vifAkPC5=mDy{6SXbETPZRtxc#z532AyNAyKTMM+3l`B1`jfbk-S`lAewh_>+fIP zeg+RRdAr5ul);0{7;c*03u5Q@rR6;)=e;Yzp4A)n4kZNx?_H%UUX8et8b670ESZRF znEbJS{<y!tpRHZHmfyT7zJDs~tlzQPFKWG^p&_<>`EongxpL)7(q%8i6|rBoV#Nwt zwrm+~-MW=8S+a!k^78oY+qVPt_T!F@j<Vd`Tw1zxDTx@hz5Z2JR$97jKW=`0KF`U? zp{gp+cN}5c^73*kJ3E_JuU^e3CntUN_TzSTc3Q`d9dp-duieYa$}E}FU9)Blm$7|s z8TS3SDEE_K7ZemE&1;0^%IlSumU5|gVPPRx^BPgOlD%!)Hk(~kRFse(h{~1hEnBwO z?Be2L*B_^XE92@VB_+I~qQdRxRB)5^ZKiUuu0QVaYU7U|z5H>qc^Y&sQ|B@C4!S?x za_}H^+XdAF4>G8}ZaH|6y6uAMfd?5>U$-1QNZocp^}vG+s;^rP9;9x&pnBjz2G!Rs z2M<!WT~IynAcN}bmV;;fvGadBO#b*0%pZ$qeck!s)>HEzVHnBU7_QS7#ty~~-uYq1 zL*jTq9@gZK?Y|W^`Qr@#`&jQ>53#T2JzPH>g5_;%xX!bYv4gRLnHTfFC%E&%<d5CI zKlbKj5kCkcWy}HZZJYdY;{P7?&c!JEYQIEbdD|MUvsM^87(1AGG2d^ddtN;5@oN0P G%>MyXSj58s literal 23370 zcmeI4&ud&&6vro3+A40`L?HwU2HVNhW=3&iTPWQKf(oMGk44=mR1iw6m`q)aoBS#z zBAp51A`5qcrY$YCSj@Pv+jJGkB4lOae^4?rNv_}X-aU^ycix*f@12{%gg4~m++XMO z?mO?t$-C!GF24WX7dh`Uhu=R!1|i1>a=C%riQIE2|NS|Bb$nDV=l@WTy7=x#-*pU$ zX?Wi1Us_r^dh6D$+2!TsEr=2dF{X(LJtJgw%mwqD0&|<VD4(@<C2{r6ojd3C9D{vN z42dwX_dQ}*;^vI&yX;x}p;D<FNh5rKqvmV3_ge3PyAM`kiQ{sAT5a!NT8?d(aea^U zu^+tqI_}Bu*vB?$onnLb1Kro>Y@ax&&pdeW;FxB6^A<9<DF##ARF%R}HJP7<Y(bPz zz!;tOnC1M8kkvVt^5_(p+dlWCI38oJ=k*+eeNTGqqsH6&9yKm$d&c!Wc3Avi??<n7 zK5y*tQSJ7)sCtw=w@bCXT`7<4Gp_H6KK6ruU%z%r9FNuH$+OxITWTUdXZu84r`Y!G z$T7{<@kkUqi81TN&0j{2HEPA{joR3M&00}Ogcyy5;;dRK93?Gbh1oW0r5Vh1oBCSS zqWHMA7K&#*R;{?j+vDq7s+q@H%42)xvF3KEW*%!PkL{Vqn%kwCd90;8wr3t|ZdaAu zku<{g%wrwZ&i!#Z%HC+-2P3f<_HFk9ZkK9%zob02&$zxP`qd9DeGjI4G9S~lx>Y-K zp8P<}1BpY`v1u>HAs%5H|JpuJS|>(BGhIJ-<GFptSOf1^a~3|=Ps85XdNo+*^n9}Q zYAaWf_FAy*?Bi|sr>!3%E;3M*g-R@*>$><M4U=r*xI844?lRw0JT}U>z9;(F58gf4 zbsmz|fo-2SsGB+2Aa)42#PFC|Joa+tflvARmTLRhNO^4E3-|8byCWF4g1?JiWxF^X z$3<Re80Yq;9=DEdyb{Nx{%%~%ZwUPxkR8Yk$S&l`{rmS{j$>n7+uwRT9_@pWHAoZl z{Xoy*66$-mZ{J>xV`E$tw~oFRm>=`DNP~G9?fYndjQx4Z>@&+zT-X=U_o+FS%V1v7 zcJ+Jr?!CzErjFv8W5UX?8z)<A|Iy;&;&FRSS}t)g?}}zWr2C7>mT)zDN;8)0^?L9+ zjFd}k_+nmje&;#6;3}mCz_|(e$|aXsrgkx3lgH&}!1eCIF7n5iYw(<fbMZjpF`d_% z9mEdXM+xf0@SbC{{IR$0f2i`uYN9ZL-1v(6zR+_#wsR_c9kN!}P7h<urZ;XPzpl!s zdy2>1xa!*LL+Iat>|nk(pm!lp)WjRH@fhRU-Y*E|dG*X7`qm&#HCgcDv6?(}3H3e5 zY8)G5!nu?AI{I2*w#8$#U54x<m-HCdQe-@i<dzFXRnCXTW7u5Lc6C*GD>NQQaoHbH z8a^4<wvSZhL`OVM%cbq9@@U1kAALx9HggUVu4YepjB<WiRW1baSjzR-llgg%Gm#JC zu@f#{(*@@yd>+JO7hKb?T<&A8yZrGFg>%{ubYG`;quQ=%c^&UaQU2IxyU8C@PMY53 z(z#w<zfZdMZI1WW>y5Q_v(H5tx#OuIf9yEV!1LqtTB@1HTFPU4=CS5>Q}0yY96|qz zs=nQGJZ2tilSk#J)zic1+tmH*>bKtFG4oiP+@}j;LulWC>@;ho8_>IuC#n`7k1;MZ zzo{0^45Duh(%h+)ym*ZACCDCRHI9ujp<J}rA+1KW)E1AM3#H3wr#$UrRgI3v=nv;s zi^ax5DKs9#=8Cqft6#(8aTM3|b6B}m8ynZQkJRFYj(D7wOWSHxixslR`yLM!-cK>N zFX4J@+yjV#_ea{|v6M?}Fy=KUh{rCtO63N?x!J51gLv$MYx<ST{mKpQ>yF<G0(Z{# ziL_4dG0}NVY@WA-Neq7P%E<M)dhRyY*4x(p5<I_$+F^Zw)~cN4j}P(ponFKB`4^<8 zXIQ$H?PEi2)@K;?O$g-}*C9QzW4J@$Y(RD(^N>BrDkS##xC@uQI=BXDLOz7h=SxUW z>@M6o7`u>9Am-;ARQ4hNKq8-yyKqae`wSBH8Al`edj;}B*nlqFu;FGKv;Rb6M?4mA zX&XO5Xx@K7+TyX03tVmrLhNNo@O<om3taAJ2(g2B?1+nRvgWFguOZ&Y5tng+?qhDY zUXAZNW%2m%<&T4lGeMz`uVe3Tw*<S|b!g@X-#wWhGC!CX$}>10yyvVw%pZI6w*8Z^ zPK+#noPGZ|xa91dO3)!JWL)2YnIAGgn3qy^K6IQ9S^hZ79|zx4<Mn^@nvs;5$6CTN zZJEc~?30w4$6CTNZJEc~?30w4$6CTNZJEc~?30w4$6CTNZJEc~?30w4$6CTNZJEc~ z?30w4$6CTNZJEc~?30w4$6CTNZJEc~?30w4$6CTNZJEb;Sl9nof^xjP4OjZ0^T+h8 z49W7x`2L4^u1L!EdWD2#+Gbqe8<`(6KV;X1>4CmKADpdM<2|F`|79M~_nr9vWnRa9 N$jN#&&69G+{{u0LOQQe) diff --git a/dlls/light.msstyles/blue_checkbox_22px.svg b/dlls/light.msstyles/blue_checkbox_22px.svg index 67d005ab6f8..578bfc896a0 100644 --- a/dlls/light.msstyles/blue_checkbox_22px.svg +++ b/dlls/light.msstyles/blue_checkbox_22px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="22" height="264" fill="#fff" fill-opacity=".98444"/> <g transform="matrix(1.1 0 0 1.1001 .043576 .04358)" fill="none"> <path d="m2.9e-6 0h36.923v36.965h-36.923z" stroke-width=".90907"/> <rect transform="scale(1,-1)" x=".86945" y="-19.05" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> diff --git a/dlls/light.msstyles/blue_checkbox_25px.bmp b/dlls/light.msstyles/blue_checkbox_25px.bmp index 8720209c6081e0c7f097a0822be7c621895e56d4..619f077413e9e75a4b5b889b4aed3c251693bf01 100644 GIT binary patch literal 30138 zcmeHPTWl3Y7;doyc;t~cA9zt{1U2*xk_JN{Atqq-0b>LsJZOBd;lV-)F$5DtO4XE` zBqa#3MkqH6r7e_;g@UDWD@7}9xfH{lQZ79^yW{+`{HJGUXZFl?r$y5_VfoMg`_K37 z{QJ%BoSi={oPBU{4*#rT|1V|RIJQm9&B@8lc{%4L_I=Xx<Lqn3hvww?|G-BJXUr+e zIH>hCPl$3|mz+O;-m9*zraO1;G`0cWg$oxvzz1s*Tf_o<JpVg)?zogvVrm0C;6r@) zZVEdSN9<GPF;m|yhrTXsu9D|U%;7-xQTt+Bm0yh0*;iqy{5qIoj0y|=CasFwa)dQ) za}~~sN+&~^D}3JGy?b}ip64*{5&L9vALl=VHNOH}m|sznB6R<1kA5|c(l1^yw*lUP zH6F)5@Qr5_TRhL2Qje~j>YsaOv(al#JAQZhxo76b;2beMUc^3G4)r|T=1QF#Q8zC# zS0eX7_OU-=Ta{mo)7e*Hsr)*aVvGt4{U)u7+j4}*jm=d!Cn}u`Wv=jf-gU<8^Bm>} z&<}W?SARXY^Aec%IDLfkV1L9M4s;*zVBQAvH#bGdiM5`y<t>^jpJZ$UJaVGU^YP0( zlh`5_Ir*)Zs+i8t-MiUh^qPC!%`Wg|<|jSxQfYkvez8xML;d^E=1QF#Q8zC#S0eX7 z_OU-=Ta{mo)7e*Hsr)*aVvGt4{U)u7+j4}*jm=d!Cn}u`X|B@G^FPc!&)NI{`oZTX zjirM-FM;_F=_3Sqp7%%0;ehuU9?aWder4BEqcv>TQls-Dj(720w0PXazU9!rCNDBq zQ16j+L%pc_krW@={}(v$986eMu1sJfhUNHwj6u9!ChSmNbGw!rUDpQr!L?L7hl?JI z!*LGx`0-=X*x2Y1_K7?8b;h~lIHbP5p4TD(5BtR8$;JViK7Raopw^+KrNxWWmuwu( z&CMKt@7}$%y}jM7s;c6(r0`vrCyJx3t&P`V?%K7B-nw;*V|H|Oa364WcXw;?s5q`) zzn(tluCA^C7S@UE-o2aNyLT^eOx8CQ$FXC_c#c|ITSK{rYku<NNq!veN1!<wHu_W? zeSLl8;>C+0d~63AK79Bv=c%i!^HM3c_MmuAuHsO|XZqnhYHDh@296#*>es1Ac#?1c zUr$dD0nGspXfX2}@Ox4Yz`1?<whP(=tjm`#hcsY<19+}oyT&yQcvr7p4e*%a03OgF z;DM$yYo<+d0MF^ur#VkULqq!7nC5`{TT@e$_vq21w3bbCKwrddC^_sLPJa$(>*2y$ z4QO{b*2CSuL1@JykM=zYjpIOWB;!0(_b7{b#_m03Z~L_f6${z>;Fxnov4%k8AP%9M z7X)h^s+Ohisag8~c-c61Eb;NbETFV;t4o(m^y@Ky+Y)#VMRG-P99r+!Z7j{FwEcvS zdFp51S3H5zi?w<@DvopeT?#nGuTpxZDu`9R%J18<$&_9_8$2fFIx1H`eCXrUeIL%f z$7*r6edZsB+K&6((OOgWqxT-62icl}>UTiuDWT=>`aElAd-Q3Knn%SU>$B*C^H@E@ z*TAL^{5lmeCMs95SeftE--LqZ;9P$x4(HVb2Vh(|?b4Fhe4d64VGSh7Rc61=?qfP+ z8icK7PmsqH2k_N?=WC#35~Z0n(<V7UgO!VYp7QtluZ>9#=nLH6VC>w!(ywLH9GTY$ zzYiq`+!KJ$*2DRE5OWXtvGs8M`bUjQ>~O4y^Lo08^XsP`O~s$XiR=5)IZR(KaVp>8 zwFu6>PuTO9J<lb%SNXDXxDIjlEDF>*kcJig_f!q8Y#ik9avy*5RO+7F?xxni!Rs;I zvp)u(LlIn29B%U_Ubm52|0eaWHE~S0b%*a;_d0d2)NApmINbIcH^p#L<&&w~7JPP+ z#x;K5HWpCtpL1DxR2<Hpk2wxGwJw}{cFoCw&wU<N+u=RB8L0sk2Yq^<kS3TTD&FNf z&xo_*ea_?jG?)D@>3?@2>PyKHaShWL>^z)pv$+PGT_3UECGz)ui8$DKc=tO<ifImT z$f4!oyt0_29MC842CD<!FvZvOnav>$nBV{&_pkj-)02H2{>kQZ%!ivP4!|R)%6+Y| zK4sQSo8$lulDcAFYfN*4(GQNv?r)@~$OA158b`);cp)6N9*&PaQJ?93TMw7kKI&6t zhvQmmXJ;pwHEWjF+uN(1C(NJD`}T(qACmn1d=F}oX3m@$d(Ac*2dtM(pFW-AW4+YE zh3tKw<i4cxW#d?|U;)P;J9aEBD=TyJ^744?S7~W!;5nqi2Y(dDiWMtdIQNkwN7C9_ z|DD^$jT^ad#E22F#-+uh;;5{wbO9$fH<wmaR0Ob!ii&vO#*7(5*?MQ-n5;i4j>5u1 zj<al8_#G&$2hEu?haVp|ZX9Lnxsh5^aj-Q%Qe0fDT#tY9<O!KFWeVq+FkyoC;K2hW zkBURqXVC}eF@F4bu7PROrg^ZoD#pNm5)Np8>Cz<vngeajpFdx!>7*RMbL7Yochsm+ zoM+|Al_3q7-~gWO+qb)*LD;r#W$&|@4>waBfLBsd!Zk2@^k~ZJEYdtCIiNmZ-n@C7 zr=Xx9eQiu~KwsegHh1n^kJVcYO0F>fqBY$Q5g+!E!>*<3ucg|0xc+;FOjE;g4kycl zt`El`THSVW;t(5coVL2Lh>cdaU7R??MjNNCZY*M>)om9i4zbb3X{#HH*l2az#fd{~ zv~k+%#v(Ra-F9)}5F2frwz{#1jaIi^oH)cr8>g*qEMlY8Z5JmFvC+n9s~d~hXm#7g zi9>9(aoXy}BDS5w>CfS8JzVr0&i;M4Ecwa!-OR_SxNa{VH?eOy(!am6-WzSMY_3d< zIT6F^%IZqggo%CBm92-9*TH4x$JWDXjltnq50`ab5HVKM>-Eq7)?gAWRa?uUKd-jA zvbj=?qa=Q-E32y{`cbt_>&n){*?PE$d4@_qGQV9*)xTFk{_tHmT3Jq$`Vbp!Qao9E z#6~NNN$Nvvv`O(~?GYQTEGDTBvC$^QleI@|w6d6_KEy_w6i?P3vC+z6lKK!EZBjg0 zd&EX7i%IH3Y_v)7WbF|ftt=*~53$iE#gny1Y_zhNq&~z(n-ovh9<l9Os{UH)zn=EA Am;e9( literal 30138 zcmeHPO=ufO6jsvO!4%w!FNIQ<5@N|IwuBF%4e=p8^i(JXgQ3uq>CKdqmRL#;GK9oG z&_jsi8r+j_w)02qK#al1`f7ai**f~@9|?Q<z17TSHM_Gj+MTEc&C-{*^X9$pn|T^Z zuiBT~{cijBjCU>I&p#laK)$?^$y~{Np7{Xxc|MQZz{N6|=6_^kcfbANUSQJb_Cv{Q zZEdah*|TT!&!0a(f-s9hc#jDmdd?zlXpLC^BjDGF1NXP3Ev6d2eEISYU%Q{5RDg<L zIX?=wRA$Fvo<5hW^tqCAm}D$gA;+rhvY*LVg{88aV9Gu!EMd2)RospvoB@}sa86W~ z4(H1IKF9a(*Q)g-u~U7(_d(z13-X>UkLTXJd2@~Pc>A%4U!%H>>MK^h*~^N#dB_oj zSrp(6KlboTxjBot;Wd_q9|6DC<QTGA!(k71_}cyaBsn{}7&$*W|0MH{!#ry)SLt&l z=P=1wtU``e*=0YIu?kCNH^G#BR9M1pQ>(ZgM>qp6SK*wfEFI2O^ZWck)@lvMibJ>g zK91N-Zb9CY)iKpQ)7P(Y9$ueVtFZ`g-m9<HZuXup<>wpK{87D{XSRg!&MTvj8R1t8 zbGC4!aL%jwN01uLHJ0*LYq&;r<c^0M$dBrbr?JcXN`s|}bsVb9gzYX@;hd-}s$9wT zBxAuT$ExhIpUGH-rLvn~%04PAVYjJO+>Rrh0hg<APE?jo=F0y*ujH-Pa8w`AKD_#* znqQFjWOGb)4|{U`8uqdv_G1g5@ThL1`pP{^Rh`(T-91Z<&yPGS|5hx|+Za0z^DO?y zxkBd$b$_H1Z?iG`NQ+PL{|64SjMO?NSE;cDfa4IE&})|~eU5}jAXn~LYJ6{-|18zj zaN_ht>u#*!@SJ@R@1@PRZ{L0tofWk;@E-K~7Nb1TBhU}Oee!+r;>8xuAhm!RUpkKE z<>emuY)gKB856)!iuJ$e1qO1o!hMc$KaKkajj^9!gpW?gaR9T#=j*`yhOl6p;<gLe zzSrT?yov+%3CIQH67o|J3*$uyy?!S+|F?p3QTN=}?^6{%u<y_u)?F4hq08m+RoFLp zYz=4NGcgyXRUEHhzaGHcL&g}oiNhCg`@plu;}0<YIPBH5s5n&qK|8GjJck@(7d*Ye zd2yeHgD^HWHnPAt<~V-~+@Ma&L0H(!IB?E5)=Ute?rm^zoJnBO86^2J$YYCx^UQL* zQ|!%uR%4Tc&LHqsIp#lNFE%*{lYhRgzk2m*=zVbr+@Q9-k07?V4{*2|uK5}4f35~{ zLpHyLbNz7Q^hE1!?1y6ya)Wq=zsY_ZX}gA#`w615%F5UK;kVCyx7dXD*Lb2_BW*ek z_VZW|e70NtvTfCHt+BaK4Tt#^?sLpa!_&BLc;iyexQ65Let&0hvp9DpK3@mESHs~o znc}t!XrmfV#ldEVCoo4im#ma)so_{LyU62Cunuhvr{pN+cD%XLa5=a)x@YCgRqShn z$JW^Wo3S;VlH=Zu0j&QaUZBVtj{W*+A7b}-`~kcFg|dcIamZ_r8Z%l)F?Yx@cIk69 z(ogC+j`E4KvEq#^IF3D@nOtNI$JY>fuHvwRbL@U@95`o9tZb-;v%x`pc<m;Eb?M2> za7ztmi^Jn74$pGDQ|gHld$r1eGl=)-s)sp~^J_Sp9Nu2M&$sM4`(wzj;cRn=`~-D} zIb1)S^jRV0-}S=<4`<AMH}=DwJ}nI5dHW_?Y`=z+pZ7<lmOZ)E55Il#J+I`q*xE!} zzr*P`*z#CUy^`N<@v9Wts^MB<u}*m(_3G#f_c^Xt3)8r7c;iamxQ2`4K)*(b&(|AI z3tkO}@f5dR;Po-8;Zz)mpTOJ&<g#8VwA65zTjX&k^`|4+8cxMgUmD$^IlRVYIe%2c zHL9Z<-aL9cPM61GYd94LUh4t$h2VEMMGg1oSAB@x<M9XZSJrSU4tecSV_FB|4>`sz z^{GVprQsmF^X0KDFmUG3yId(m)^KS#hzDnG95`o$)mSQoYB(Dl-hP$}lfb$p!Ry#k z!`b5Sc&ekbO}x?5V9&Ho4myLtTje}{4QG>s_ClX;*u(l+b;PgXY;zEge07oopFz$3 zcGnLV`F9j3Kdv86KB3X$ZhV%CObkLcA#MK-C;i?Vs(pBt`=R$CG`|IDtA;b+=mF+7 z$0rVwwrV&7juno33_T5L@Ud|Xr{O4ZygIa3!$D7R+Xb{y4Hv^P0Sv;qgtXLf7%xI7 zXD1MC4Hv_)!*R;c@^ux44G8hnAh9)E495UsA3`F3hl9NjvIila1BkMQi{U_+_M&wh zLWpM<5?RBg<N$0Y3!yVdJdrh=1r9)G#vx}A;tADomN)>NnS{_8Bx$MPEOG!kGYg@; zoI-9xyvs5NoxxQI@%S~IWe!?5eZH+j{2J~(a1c++)nN|zEY<K?D)nukKfwL_a4o0x z-JnZrxOWL?^RC11bFWvR%_SPSyL}j?$#ZhKa=9|kfVrnTS6!VeSHl_BaIPON{(aJo z{c!OaiJz68+0*}zTE85Jc}iWbT&~PBVD9P8mCKcR2FyJJ=gRfNxqdkFgA?P~js0*j z>CjGfvS&hYX&05iL0}7=074rgu!YtJBybSeLMMRGh6rq-wE+nn1h&u#AhaO@TWD=S z0tbODbOH!%h`<(F8<4<3U<;i9LK`Bmh1Lcna1hu+CxFm~2yCIX0SO!gw$KS6v>^gp zXl+0O2Z8PS;o|?TUe^z2ez@GTRP$Vsr+fZko-daxmn-uOn0vZ&<#J`70dvm|pDXt) I)$m#BzuylKPXGV_ diff --git a/dlls/light.msstyles/blue_checkbox_25px.svg b/dlls/light.msstyles/blue_checkbox_25px.svg index 0815af16e31..bbd354948b1 100644 --- a/dlls/light.msstyles/blue_checkbox_25px.svg +++ b/dlls/light.msstyles/blue_checkbox_25px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="25" height="300" fill="#fff" fill-opacity=".98444"/> <rect x="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> <path d="m4 211h17v3h-17z"/> @@ -21,20 +21,16 @@ <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> </g> - <g> - <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> - <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> - <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> - </g> + <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> + <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> + <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> <g fill="none" stroke-width="2"> <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> </g> - <g> - <path d="m4 236h17v3h-17z" fill="#3096fa"/> - <path d="m4 261h17v3h-17z" fill="#2979ff"/> - <path d="m4 286h17v3h-17z" fill="#aeaeae"/> - </g> + <path d="m4 236h17v3h-17z" fill="#3096fa"/> + <path d="m4 261h17v3h-17z" fill="#2979ff"/> + <path d="m4 286h17v3h-17z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_28px.bmp b/dlls/light.msstyles/blue_checkbox_28px.bmp index 8911e3159873641a1f6c603eef6bafbd995b803c..53921d083514e31def8629eafd6c0c7f4dc76e81 100644 GIT binary patch literal 37770 zcmeI5`)?J;6~}ETAovCTfd0^5_@VS6a6_tAaZ`mBBh-k>>JOz4wNYG@Rz#H=iK;10 ziPDmYrci|H2JECxN)hzoM+~+p!8~mfN*sc*fCdZ(Y|Ohj#*cevXFA{6d-kqx?#_M9 zTq-jb%ei-V@A=$0b7uDJ?m2g#cyhy*67{!1{=Zf(pOnitOG`>hOFmUH9a|FH@iO@* zN=p2HSS6mQsC+KDExT8rNZHNvJa+o@Y2Mn}D(dU&tt`;p+uO^DWs8%lH{7n9H*b1E z2xen}Zm?TgT0}!bgR&v#+zJcdAG)cnj#qe}I(rsw!|=Fr_AH(~X&x{oGtDoiIHV^N zFYH&QUOWFRo`0I^v#=i5f3E++{*dW)*k2H%VeYwo`?j@s5W2wttEZ=j(_Cj;f`u3x za?hSUR$_Uy0lJALSd59bja<C^RUv-yX*&yag8|mwP23tM_4|k0b@7BXe-Y3P_REh8 z@%(3e8+y#z`Gepd3vB3kh1=QLvv3=R&&?lZd*Zr*$pv=R*)w&{EA;*U8!zlvre5pp zX^Iin<9Kd<3Hw8)*Un$;`3qt+%#r=w_ToY424nqKglPF)@#5XqSGkB!Fva}sV|HSB zv<te?F0i~9V_lnh{LQb6SoK0H3v`1)EL)sZy?(ovsy6Y#_pJE~AMEzPRyO=onc@k{ z=MO<!9k1}YM$XsHo(8XJIeQlFli?UcW6xOiB01lfThz5YEzj&RA`?%YJIU{3Ov0|3 z_Nng^w!Mkhj#sqt;QB9*dHf;r&-j~(c<|aud-0&uP4OV>`U4MQ3rq1e=?6=&3C21% z@z|f2Sc&BoOX>y#@jUK#Ah&3$<}cCxs$%6Y(LE~MGqW<6C5~srA?bK|%$uRufb2-p z+0)rmH-5=aNIockK_08gh1yK*B1!Et$%3v-JlbwrQoBe}`%H64A8|-Jo||9DH_}P+ z6Oztf%=in%gHt_!iP}m2V^UIH7S0`teg1%R6_ahz=_*$J!>wDlf_yisM}S?^%?l>h zVJ@L|JDy<Y&!6|u*ZJBu7kgg1bV>C!?0@#`*}Se{WXtRC@As&GslU&iJC`#v8{XBc zR|D3uW5;-RcXu#OFI>2g6EhQUaB$FTY;08dnMaQvRXLmJyD+n_uP<w+j(7d~b+4(Z zNwJO`Il`IzBR|3Cjvqg++6g;fzI-_=rjFOy*{Sp$I&^3fi<p=fy1Kdo=D@%}My8Gz zkH^``lP5VOF;XR%9UUEt3A<mrc1_FF@lth1y@#D)Z}=^kLqkK6OcOkO5BwcId{{Bj z=TX;;O!2^k-47f%5HN8pNVSPc9(2cIG1lJRu9(fu&En3TJCm5Ed0>u@kF$OI_Nj5S zd-rZ}@7}$DX@dvm*w`4`yLYc*qF>3bws_D#Iy$O+=>Glt!FaOCqc(-5;}v$U5Vj>= zhwVvmb-Hny`ni1HQ~d+g3DB|IwxpT_NNT4ICbdh&xKxwy%2cd>_<gdjqwjby-{tEU zk)OLLbE8zgTY0kn0d|$XYh}UxeDJVP{lmk|>v+pkbv60gI~RMN_@^hHU*Ow*e|3I7 zl`XHkQL+;CG}PY*x8=^vhIgvP6Tked->&V?a?$XDpSOv&c5Tm%nTgl?jwjZB&S$;x zw4X<b`*rnelgxK_X3x~|KJ4(suNL~O+8=Te8%vH!<QVRJF2R&`e!nR@rjA#)%GbB` zyIf3+CRya0Ovd?t`H8;|?A_CrnW^JV$T+9zB`(H4`Z$Z2$Wwiz%4e?qybx#F^-LX) zbY_yUbIlKu%yWmMnI?GnK45P9p3i(?kq{T&P0uvN0~2=t<F|a~ugiq0g-f-KNgi~M z4KuN&(r3Q-s1R3sCb!cx56qF<Ol<mwKaPI$Wg&+ClVsZ9fqCyb6R%eIO!O<+)fNx> z|9egP(D%8xJCGbtHhI*huynkn?ZbA-_jTBwRR3_vUOv0%f8UP>Q73?!1Uh!xmMt6n z8e=fmm;2+!22<5PNEX#U9NWU<Z&g^!mqN~2Q2!uVl&@u5PO5(xuvb4#^$)Q+nR6D@ zBiKEE2yEwg%==)wyr?VdYYLcOvbCpore5YYBHw(W@J?(^9z%0s%lRxDo_F?bkNk=D z_qt!totXvC`>-`&v9_OacJQTOoO(Swa${!Td426(?6pUf4dczvsGLn9<mLJUFD96a zgxCAG?3o%KztZK!wm#~!-u_X7CF2D2m;4;t_j8{q$B}ogIXk9?7vHm5>5Df!CFj@B zxeED*7iX;Xr#|zwF9`4azcMp5JP{j}7u{cx=S3sY$6T2c8{hro1oIK$T|B5~>Uh+S zOfo*s;!RZv=3>G7k3=&~@bG=4z2l8f`OIx!6nx;{>6xZ@U`~v%_&>hmGi$yi($?9T z<bgRp%;JClw$H46Oz<1MliO*U2j=J<7T;OvGhZ(k{N|Y?(*{p6`N$0x|Lc?f*p>Yn z%<q<X(9b^_l0Nh_=fi`^@nn$~v<Wt*#qpB1Ae$5-L-tJ8Kgbxr5S^OO@}Un@{R3(c zidz5BDSx9#)icYQi@L9=aYJ!~Q7PkG29`Xo;2s2WirU)R)O|u5_dB5bLHvGe_&!e5 zy=)UcMEOhM-^{{2GZVU_bfosv!_3>baih0p&6?!#MKiVwwP$T@tyfxFs&dZPty`D( z9F$G})z#H`)22<El;6I7{rbF^nRq*P?C_>fpRQPym6d$es#TnF-8XOEoHJ9$liR!* zGiE5((xpo|awFisRaI4r3Hw%8=XP%=iYMnDZ`Q0?inV0P5{{e*@&V+#tX#P=VAj;s zWZljv-ty(kmA>-wavsisASQB8R;*Z|_JO^3?b?+UGm1AdGQw7`Ud@Mx<u&ODzn_?x zV9S;*Q%u-h=JsS{M)9H;sq4|F6%`eVIdkSrA#+}|%tCqK!``qv{C4*2*<%0x{gF%) zJTPS*4_mx=v0~1dGe^igo3u<*JTULxz01nV$`o_%+_^&L;C+l~k_YCE8#ma31q&2& z-n@B2<{D07n&yEi^Bmdy`SaD-MZaPlEjD=2edWp(hIvBfa|SG|x5cCOq)Nw2_I0Xl z@_A48q`aPD)IU(353y~_Q>RV^zu!vjw84aK%9X<T19Hc0@=%)%2C;0kDV@%6yKLsW zg`fXG-@|4+58cEe>3I3iH_o2<+b-Q)?(FI8na(ew);WK1{u1RI>DD`casHCdFQV3k z{e|LOo97R7J(=QciqULKis{4G&22ELT|xar8|nlex0f#!e*ObkHgdAk>BRFN@Eg3? zh8l&?^$Vk~`{aFcFv2#p`TMQVo!VZ<n{>S>r~Y;J%-?qD#+0+Cvu8TLh+60T#raE= zZ=_rA{Kff8I=_fo7xov52W>w8A*hFyvFC$&{sXl$HBL0~9&s*eEKqY>l;=N$>K|mD zy3t%L&2Q==C!X@aP@|AjOc~{iY1Z?B_k!R1rM6jp{(~G3#3AW;1zeMH_B4JxBEKZ* z{L}eo<oxT#pBsN^j;qdJlFwRk^QWQtGf@}7Z9e}Y@jNiZp6Xc)ni!Rik0#`#=Ra7i zfAF8@CZ9Etc>Y5%?srV({H5^yD!N}3Irrr<Pipoh4oSx=V1AKyCOeXJ_H_2t`2hI| zN!`9Cwh@P<37t9}#38BM*TgpBkTjuFr-L{ob^DswMjVnRbn0{vhoo*_6WfSG(u7W( z4&sp1?Q3EiaY&lbsnbCmlDd6OY$Fay6FPM|h(l7huZeBMnacS~6k``7o~K-?{{bio BEyMr- literal 37770 zcmeI5TWnlM8OQCWNoZQ4yySt93LY%QYghKJ0)jLbOr?N8RH=ZpJkUxl5+Fef2t;BB zkRRgs#zk^`ZG?EDNLHLUN}I+aN}9Y8k+=4RJV9c|(1+$Bm+r3Z;r~B7vp#!#cFt|a zMC=^p%b9a#=KG!bpUckp%(wg8^Ft?_yk!Xg{|dGf_Cj-0Q*+a2n>H{<<}<mvh^D5> zKkgFGef66^U(Jh`dOT2UdU|@(%*@P*GiT1+f(c7@8-DwIEL)r!zp`Cq3#1POnr>{9 zzNK#SST8eu<;s<y)W&$dy}ge~9^3198I^T<W)v_`-RT(+B;%$|Pv3K(=Gm8aKM(a$ z;$@UBw7RZ+p%pUjbi9lL2C6$f1A=7SY%o39N8__{Pe$45R;O>tSipKnrj0zGBYX{A zxNu=J$_&H)9Z@#R@zD1$S)#Xnljv^i7u~trFk#8y8w|2~+D=$vgdDrSU2Xg8p74wr zXxo0-rg^NFy>xGvwef@KZF<b7q2pyee@@Sg3f5L{<m(fE-f1>zR92^_?>P|i{7e2k zf7E!jSC*MAot|b0wO$;rR*$S(PS30g*4A$@J=sSS;#ljmwJMm~qHp<JUJyrfL#Ch6 z8h?Z0^_I<&xu_|Z^|NBpV~{o7zNt7~7$}eD=S$;xVZ-Q~439O|*>8gp=CcSE*teNi z9`CR=ekhN1?yE374VRe~md6ji_Bvk1Tc6KQr)NeHebt?wJ~0d=b$a5uT`_4q+z6i0 z&xj}<kHw@#@tALV(dlWLMSqTGR#m6x|Bs&4{@_^N+W4Ui-|SC#{oaZEps#OX^w}Bo zTLeptv}`Vp=Z8vT`Nd$qv2FM!gZ+8VDZ;ymKG?r3zVD##<C4{HkrR9;Ll)m5t=Ie| zk3}Be37Wm@YP|(Dbi7)9l5ROYlPab!@ATB`lQdVOCti1OR;w}d4($=*C6y{xc}@Fb z)lXW;@scX0FYol!>ytFMf%H^;wDp+3bO*X}E>W;wYHQn@Qv@F8Op$Gi<F$+Pm!_ts zHiB~;W^??&*a|QHfoqtpb_M+ofaS$MoIQKCE9pHIxBTqv?0(rM>gvTKaI6%!e$sMb z^A#JJ2hHDLtV>cIRrw@(g7qqF1txG!F?1>M5|@WIy$p_bJ&`BvNK#-N9@_FE{4Yrc zR%hOnX}0x8NtjVQ_&WqEN&j=+JW3&&v3*MJTS41@5SOXr!QVmHL+SSt?vp2!U!*r+ z|6gR@GBo(E%G0fNJotD=`nxtaH}_=Fk9^*qlV!>%|E*w|;I@v3HarDiqtI|`u%6nc zzTjMx%p%s`P<df%9WShW*gonE&Sk{}|7&68xX%QSe$JmizXiOjl6fD@F76L5rg-#A z-NCy~Ca&3g{4B7^qi?ip8+bR!gxx)T`t;}gOq1<XesMmxgY|)Aeu(umD$fRwzR#UI zw*#8ql+3HPdGwF-_cVC#f%}>D;3<ZGZA(u-!=G+2-aM}-oZr2E4NRut`-}3LT||0N zrq$=SwKbj#zvZ(YJlo@kMa8PbKeYCV?$%ot=S!`|KXj9od|qy<Iz71o)RS=?tzR;E zjre_uBklX-@!i2%#v`;_8$a-Us!xxG=OO;&4aU{@&q<PW5<S6s722;z{Zow};_|?F z8CE&J>Yh28OFVvv!-IY=g0&>uHG}ObnO+e+xkTfKD4sadb_l*p(*K+{XOnRQJ-Jg= zW_Mfc@q>;Bp9kUdq4ax6{A_1+{2&fDZNUDwWZp8`9Bcfb<#p%Yk^ZiUUv#V)KZx(| z-iTwGm1WA}Xlvy7LCfoHe+s@vMQ=;p@q?#tciTnDEaF+O9Y5%JaqlbYjC<vBmD$r) zcl=<2$Kw*cySG5wtCD#i+IEE<uPI)I*|HUSUYE>!jD-s_P4X(t{5J4zNakH}Y*)?r z!8FffcDHN??*ot7llu@lSH}-FcpmeYyLNzgQ!=aL2U|RkdF+{|!Fx{}%T>n@HhE+Q z7sm@Kl5IPnXC?ljd)MA<UhCJ!^I(s6&35M)gD@!5Sz``j)NdWG^yfV$`=T-Gq$-1U zfmMxv$oG{e^0$o5j|#+5aLyTH5h}43`952mpkEo+A>$tk*2WJi{-HSDc?ZW(iATWP zu=-b6wjACMzP2_z4|Dx~!s{!os!8-LO?18n?K$UMlqU+mPQ#4LD~%OiQP-0?-(Vh1 z%8bK<elLNs<h5(OFoX4!VxrAIPQr}h6-V=j;JZZsm`6FsIh#T>HDmjfWUhdjX#61S zaeisd{ZO9FA1sY`KJ@Y@IxmSob$vp$MNA*wP@2fUCF?HZ{*66;sK-Nl-mc^ou8FDL zTNF#Jv2P=uwX?E*xj0t%w#uuw*6AsRJD$XKa#H+p*C*@N_vXZQzAKrfkH<QmuUD4) zbv#`?f1ddLo+rS&ESbfn$^6&-`Tn#C9{o{ooX@M0`2ae1`8g_WibsE9<O^HDyDpjc z!s6^q@;v4r^4m%ig&UH2w=`K;Gk%bHYwic7LDIDtDQt(&_od&DaDNt*57X^ae(#?w z>;Uhk$HaM6`)%>)|G`MdPVlZg94*w0A7s0Y>8aWhwzk>6M(0)IA13m9!?ZB5uRK}U z<6SR|6Ijpqhw=Qd*T)7EpF<12Yu0Go1^c=1Kg`c<yq9GB!*RTi_@}M+EYi0Z|A6;7 zCv0(oe&xF(?|l{Wtc@Rh^OvgMnPv0)TX~HK+uGo~pF)y>Ecbo_JzoQ71tws>Nz07M zdj<ZNC5t>-;_(CO#JOI+gJMfCGET!LWt!Ws!xAkK?Rx>vN-+Aq2-^&6hP?^nKI;2J zSnNf^`wE<V45Qz_!m8s3r1@3Ze}*aM_mGaYXn1eK0sXPRvu6B&eH&qCVJt(v55poC z4Ug|QMqqWv56I)+GA_W#r0&}B1M=fsFD#~8cuwDiky(V*9X}w?1dnd0H+3iT0qo1L z&_$zXXnD;}zW4bXjLiG6HSZs=&s6*9ipw_G-(h6lg?%1Yvlwij^1B_0_hDpy1gnl8 zkT%^uy5#aH*gs%o^1N0T3++?BcOt>(#HZB`t}XKXm}=Vbs!|w9`1JJRAJAue)`;T} zC%*Yh{{feCiLA|83i$q=Z~l^s^RU6DZ!gwDjvp8&p!(T1c#J{l_pxj+!hH6Ft90BK za;lB&!u8_+{Ri(jZ1(5r8||uTuj8dZl}^v}+J)70dWNZzexK7by>?+Wot|N;q~GWC zOs`#7O{Zs=D(UwH^t3*HK;LYi?4OafZsQ03y?mX<5A$TPKVSJx1}{!P&I?O5A1Z2| z)oT1hB_<)NyrF#W_a7F#d0>c9NPh+DYl<Ve19Gm}s)km-zqRY}HFMh>Pk)j$x%{qO zr>91sgjr6{gn~sBcX~z$lrY=rnNYBZ;!e*9ff8mrJrfERQ9Ph$r9Wu%_a9c{VgHxE z|4?bCofruAa|gY#!}|RGgD?J}Fkow5R?si!#H)E=j8TZV%u;8UM+*nY=J)-oW8gKL z+F?XR`c@pZcDxADG}%s1jW{W?oSrE}(^PSKYQ#yA<@8J;nx=}=QzK4_ET?A*(KJ>3 zdam{dZT|j4<@dnIf(@xYn(ej!_a9U{Z7|jETBzTD;JXOCXR$ediN4o;{u0`C0$lHX z71Gw?Wqk1uRSh+lvym*ct7iU^5vLj_j;9ePMV8Yug=m^8PEU<EDYBfNDMZs$ae8XR pNs;CBOd*=4N(1R>ef|>rno>{p2iI->5?BN4G=FJ<V+PJ&`Y%4bW`+O& diff --git a/dlls/light.msstyles/blue_checkbox_28px.svg b/dlls/light.msstyles/blue_checkbox_28px.svg index 35e78c0d6ef..7899390b59d 100644 --- a/dlls/light.msstyles/blue_checkbox_28px.svg +++ b/dlls/light.msstyles/blue_checkbox_28px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="28" height="336" fill="#fff" fill-opacity=".98444"/> <rect x=".99999" y="1" width="26" height="26" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <path d="m10.045 130.87-4.534-4.7014-1.5114 1.5672 6.0454 6.2686 12.955-13.433-1.5114-1.5672z"/> <path d="m4 237h20v2h-20z"/> @@ -32,9 +32,9 @@ <rect x="1.0113" y="250.81" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#2979ff"/> <rect x="1.0113" y="275.79" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#aeaeae"/> </g> - <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)"> - <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa" stroke-width=".77367"/> - <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff" stroke-width=".77367"/> - <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae" stroke-width=".77367"/> + <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)" stroke-width=".77367"> + <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa"/> + <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff"/> + <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_31px.bmp b/dlls/light.msstyles/blue_checkbox_31px.bmp index eab02f44485bfc8ec3811f0d5b9e89eed276f225..49296dcb6bb94878e915a1e0f5cd5e47a4d02d55 100644 GIT binary patch literal 46266 zcmeI5+ix9L6~<k`Ta-lk3*eQTR7w#v5p|oA7=(D?6^S4fkl-~4g|-r?KyFZ4LP<e^ zT!1GYoDe&XV<5`KH$vJbaV`&_nl`<}xhf%Tlez58{$|cMvpsdr%$zfO*^#%E$vS6z zynlPGS$oZ_bJjYu`l};@J;~2j^Zzqu`-s`T|3FXA13e$@`H*@1VC(nhq4lGCdeVQ` zr&srVZN2r&N)JC=cvT$7(fRY|)xm=Yb$@@q^9`JH=gui|C74A9_`}1)iLRF~Uyilb zk?ZZsl`ApkF*G!!_wC!4up{&1nv3z3QW0(7+1}<Zea`z@zhB=AB(Ck<yH_{8aqX1( zIpb}U@_t~$E=_M$_2%nb$g<<@g2^#G+s9OYt?2d|eW9!|=3&>aT@%Smu3x{N<t0;7 zQ;O%Sfq?<-dLs*5<b!9<oKb^=gU)kMaKQmDSyxdQ>A!7Ldh_F2|L|k(H*iK?P&x`y zt^~8lIP|>ITUMvK{%2Ce*Ys;A;>5n2dbNJ$Qz<)mUnB?CvB~>r1JCw0cln-=_cg!1 z7fM`v>f>5By>ac7`8nfllk$FGt2ok4Z&mf?>s-jP<L!dUF+JPI)P)jL>60#`_j9c` zKbGbOufHmjms~uP<|P}yp!LCDs4P!-_H$ah-f(Wl`SHM3rNg^XB7gEoy06Le=3HYv z`+2PgH>cb<jG}+OsKP(?>0tYV&NpzP$zLlS2Zs9_CBZB*qRDMW-!CP)sy9t;>S8?? z##C>;9Ah5go;5o7?ZXLMhj+yCvCIaZ?QLH0%|`v-oX5Pc`SsnXPu<I3OMETZ{%I3u zo82<KO4-eyOYaAE<M}W0X&(O)n`f`%>zkCG?XO$>^;*6bn_OEQ%dat=<t6W&lF3VE zrjooQ*!@KvO}vojV}E#52d=kPz8Q`G(tIX*H;TrdQ^C&1oadm)_36%D9gUfs-*8!z z%-UdnKJ7|^gW79wQIqV7({9|eXU{6sB;z&nQ47tvq5i_@d7H7tNHQrs+ih(Pjw@|V z>22<9?rOc$$0)t8=?MKoO>g$`qpc}zn>WqHc=rR_o}-J$v^Aw|a~C{&Ofo4w+sAX; zKbm|@AEWfXwm5u^d5Lr_^nn8hv|S5Lzmt%tNk%>hKIS381c$ZI^N|D3cRw&}&AR)U znHiDyTi6c_+oMMf$2km59lDjLx_XRbOuzE%g==&8!}$2P>Nft>J>KYvIDY(i@_y9* z{rhz{{5ou#OaJVKUzH6zA3b_Bd;jg^$&(6P%%M|$6?Rcy#38JC*t;8k8T(#b#+z>V zW$dxBvCPhR?~zPfcFHefU%h%Yu`AAXHm~@&6Mh*RjN7+wSBmd-`Bm6O9os#x!*806 zc~#}RU>Eu5fx~=?_HxCp!gt9o<GW^q&vlCUJ32a=tyKv&^*?s(m<j^ZpJ(QSO^QvP zEj_z`(Ox4nFTt9yeZtja_5-6o*3N-l_X1;l<|3z0pPttoSfd~K?=LF7b&X6N_Le8C zeqd7*Jy)%^>wQB%&-<VMJtpF7`n7+hb@xAArS;RFOl^JVe_70R<>Se?IL5T8XD?iv z-+edIyT7A!x4j^Bk2iXac6=jUi$8iuC%)Rc7O3r)b=V1a-Rv094ZkWIcK+ShbM9Y$ zp!APFo32U7PV8TWUDOwSFt9Ut<aeTf8T(#b9^-EKW$azw&h0$>Ty}js%dcL4CD*@> z{ma<@ec6oru<1A2GB-EVzrcT^LLFKe8)IL4qgt#<^f&WFjIN@86*hINB8&EKr+?FI z%&#in1-mNW6+7cw$G>QQm+UgWYc}{?r||!sPv&b?f=&H#{(J9czFwu+;1@T~UcA@H zn_B(A)8^b&^a~fyFHW`cl9hQsF#2>|_X1=5r#_LM^9DAieYwcXerEC`<|-~F^02{8 zhHLs!(GPs$B^CbpD<XB+;h(;&(SMxu1E1KQ*PjdYBC}618h<|T2fjEV;%n>&4t70m z`f5It_5<Io_Blb<Yr!02>h9SK*yh3QC>;ErQr-4~)IHw8dr`RW$#gC5ctoqWPIkT~ z>acAt*MB$ss_fw1DBSzaEcQhIcv=O&UzNr`BRjHx6?Q>i^uJ(jt4pWjjGyRV^ZZxF z4&Tp@udy?^j4NI7OW5#d#-3>6SNZj=bv~cPhy9H`IJdU4gst9rH4b*H`hdR0F=z3s z+P{PihPwIY2d{4}y*ZCr{3`laU~}v$au&Z#|AyI#ovQl319oM;BX%XeLw3S9=bJ44 zB>rc<Cx?FOn4R&>Iz^la2fmxf2mv<v;a|U{^c^b)7Gh_1roACOd(mDahkMp0>p;D2 z-j}s~!qH<jb2jY<Hhs8xKd|`@4cEQE82_b*5?!NF^H~7;flXc(>{^{(hw*yQl{9%+ zG-`5g!$qILg$ozrk&zMS--V6OzYiTcl=TCnFPJrulG3h)zI5r5h_A60+Wziu)F?{$ zIT%IzdiEUezcw6a>e~F)ty|IBwQH5BOYYhy>#$L?+1uNz&~vzC$r63|@ZqlbRoOO| z{gd7DtFU3`l`B^!`hvS|-8!{=`SPT9bm`Kix>Ng?v5WeyU%x)N-ZQn>@ro5I5`L%p zw`1Rn%h=N`za6`;uP?Lnh7B9?>sxEBO-@e6w*5^#WM%(r$2N7?F^(tgOnr;8sQ-~8 zM=J5#vB8+0o~{(%CnhFp>tDt$>e%jiUHzM6V_tRmO|$FpU9iD7{V(ydWy`YlKbQZx zVprk2WEc53|6w0D*KG2^y?N8hfz2Ew*wnKqJv+Tm>tef3mF@?=apOjEZzSYq(zVd^ z@l&TxWwp@MpTBb@(UXcAZ1@*?574K@I&@b|jtdTW<Z{16{W)3ocVbD^-7^QakFnJH z28X&+dUk%EEuMdxc<ybU-)r3an)kIP)>Lr}zsCF;^RdOpmSS9J;<=A4KDNw9Y+-&N zm6w2noB-VU%7MW}J_t$unWwmt)EC_3KE1={yQz6!Dwj3b7#keipBMKBMt>N267}a~ zfxGe1wC;Smi@Hzi{mRm~%YI<ohl}$-pI)6YI(;oTWKw#zTibh^dq4MU%&)OdV|Kg0 z^RdOp79U%DY-txGI{lrGE%O^&n3teOzSCn^=kL&WjGO>@$&jf@W_}=<kD(73_Xo!P ziK##5;Yx1mP5YmbhvGiHrcX=u{=nPPeqh68ub4>vd8@V@`r>|AV5_%fd@bt--u*;Y z@2*Xso`|2DzVFP=EgN{Y+xO4WYwvBI-Xqofn)fv)an7$Xe=hOoP`B3*evSDx=GU0q z8f)bT_$~`4=gdNWjK1UKI@NG-pWf`6RiYo5`IzYg&ia8{d094()@z!69`0F_^gr|d zz|x;V&s7WU>ND@T#+{E^XuIZsbCU3JGRUOlehEn?r38}<GAX%VLXt@-!6buBO754C zWKv2n$sm)G`z0iqloCub$fV?c2}vfU1d|LhDY;)ll1VASB!f&!?w62cQc5t%Ad`~& zB_x@Y5==74q~v}HNhYNPlMFH`xnDw(Nh!f3gG@^9myl#qN-)VFlal)-B$<>FOftx1 fE%03TXX9&|ly+WX*FtkX5|a6#bRG&GYN7uReHkGq literal 46266 zcmeI5TW=J}7010<Fob0z<$a})2nCO=;PE2Z02?4k(LUuRA0lsgh!SaSlSuXkjIp_C zHy$q!k(GT!+$0?5@_?mHzC;uWakB|GXKf)xcm%coQ&Xp1Q|@tBU#h%_)1o-lJw5g7 zbNW<uA9tPU<3In$Y?odp@c-{nzK8PLx4OFC>e|)yHtKcrIjYv8y1H8bXq!6z(Jy{u zedtx);_P+l(xt7}uV4S<+O=!<P*j9MoRgO?U+y;C7)+OO3hcW^*W->!f~<md)bJJ{ zSE&vgd^-rtX>@*mev4s~9fa-JC&a4QT#qH<YayJ=X;XYH-PbVIy{x*h>9cHZjkoT# zr||mgz{WN0?W&8f-n?H3nRUKHFu6@(r}uBRPY5YC7n^U={rP=!?Kl|1uiZAUUcI{C z@E)Rm#=34Tp&q)tA|7I~vvYHE+fYA;@|3nkD9^yXFf%i=UHx+3RyADvL=DyMp{NMu z9(X6!NME<%#$Y;(o>S2CuGV$1FG>uohI)<~+b%$^>iVzWixLB?kz-p7o9rNLcOVF` zE;iR=iTGLo-*TH2UrYBjjCHT7E^PZOn_J_pbL}a9jeRZHBVFH86&GK<dA|@c>wJe` za+|_V@84{n5K?R|HdmW+f8KMyb?xYh5(BFfeFx07>LKJA>$<gsdgwyeXQc*v&#GVT z-lpYH?WuJPm0dei+I*%4Yv(oh(!Q-Prt2r0)AjqSjk*e5i1VURKcz1Bb-!o~{2??i zt$pyvu>CH5)|~49X^1h@ZL|5ufg_sNs4qaSQeB-t7%c`So+-k1Pfmb!x`v9)#m@t{ z*19Ie*Yw!7Zd^nEdsTH|<7e62>iazImX@yryXyFt+Vj<$_X{Dj&UXkVw<+xO{>}CY zA;som^Ub+GAGk-?j^<STPzb+v+gzRQKR`UhM2m<6&sf*3CDcO~eN6;=QhmC6+v-&R zSumei$58s3xj|b`SEuXeiA!^#@eF(f<#vSU&&qH{i3{Gz7)+OeV;I9Wnv+b=+@m}P z#&h>$hWF4&Me}W3pA5CmOqRk9W$Cqc+14z@=4-YIRbyMT6q|>#^jf=YYnI<2n<I0G zvWF@yiQ=p;OGodjxzt{=Fq7psh@Bi`hzje=($PBvGHH{UEQOtzCRl}S%~EV0%+yK4 zY-^Tc^Tag4Dr{>=9UmY@`Ef9q)iC0c1BU&W<|JFk5o10wGtQa0(39Z*H_|Z>=N!$2 zjvWJodk01514E9YupMH`32-_8`Dd0(1gpZQj~HDaLpG_7^ZuP+K&xT%_Xf7Fur1q! zsur<1@=tccFJ@6n&4bCyzIpTJ4lr+#PogZB8GrMz9WMK4VZJZh*!fGNFXf|rL3*?P zkh$&e!*=zhYYzDz@oaux`)9E`aoP9F@Uz%xdk%%q?Km@SdE>^7L)d4<?B{*{v)HiX zVbkt8o9EUIKRN$C_RnGy1MU34Wu>j>)!&Dm#_6;z55H<Q9g{CV1UrTQRoeLv#rENc zWM}b1vx#r@QyM4!PTOdS!6uIJzxmnO+3(UiEwR`wTKoUP*4K+S^*;51xek8V?iFFy z(DyhW_zCKq4@`NwOA!kFUI+F0izWu9xa^VH#`g@NB*pwzK5*{{=1bpBnKK<?KK7j? zA9$#DG!nC2kHOjmxUKx>;aZd!SbbbOVsw2B+0^xs-BDs-o%6kx>n-ds!%17KMQn~7 z`JM2KzaV!!cMN93^Rm^*z8&DsYo8pdJttqa+sjkW!)|eVZy7H4(ZYORwz2b<7WWI( zm(4n4e*62d*XfHq7_u$#EPihNv)G-ud|u1&GueZ+xx~)HwbU3`o#;7a>F;g-O!m;8 z!)SL!4fSpq1Fz$ssAc{QK8vl->);Q)Vqn9^aq1krO#OY>d~SVY9{sCkYdg8;zk~fl zuzmTV*cN~7{5$%GWM}b1vo$~Ir`rFM7&r#o(tlnJ{wRroW3h?vF2dG+@TT6UKG4^J zkNcv;z-q8>zvd0so<MRwFy-ln&IP9SUuyPX?P4n*nBuaYM|#^@yu$Z|RZEJ)E~t@R z+ZE*lPt`{-Z~FEIbEm7Emwkuwk6Zb`{iBhXZO4!K=M$?9Gw=TMdXyNL^MRr7W0WT8 ztv>xAP7I85Y}r}Z?nNiSI`yl(HdlYz^DcaIu52zyUbdRt`wotE-W>1qW@F%JQIq6h zJ6!Igh55d0HPyEhy8hETKYvDj*{m-YvA+*{oxaF_Av-reA2?|7pVL^8$NpJte7*zi z^Z8YjcVo9-hM&bIe>QeS&e1?>4D9fiY27})PW3D{etY6D*ekBSZhH>j%l=txV*LNJ zz2A3PY3mL@Q-2?J8mH4XhrglzRkP`seEA{RzWh*ZAAU%-<|Fse8h<bjzMuRJC^XyR zuh2MwG2(Bujg}Z};?Q^x_AS-0V&DSTZ)&TGC6?Z4$0}@{2fb<c$jwIm0rdm?PEnK? zcy+42pLi%wtbAbl9gWbrz|{Ur&7Q7bq`cf#TvmUix3!Lm?+HUlio-6bnPb~&u0NiE z{~phu|BbQ~x`6c`Fh(&SaWmhIM9<vyoP#S@u6&d>7F4|rdh=Z9XJG5+`!q+fYEGy2 zn8{Muoh((|cD6N351YRWI^6@59{-rhGK2jNnDZ!<bNC$P7)s%VnJhP8+gxIo<};IJ z2R7OHUxr7_8I-Tg`U+$r`!kbe3ft9p5-eKwp)8>k)}NUy9d;)!v1uvAXC_OB{a3V4 zdQlleNn1X^M%(^}({@VR#!QwDn|@b>&L`VBtqI!Z>VLG;j`ntDvUJ$A>n?l$4eAtg z<kFv+EK}GU;MRSVOMhmvEXk&W@#Zs=Wd&?+J~LTX#3nxd&1V^f`~N!sV<yWA*_nK1 zvaFcx@{<^tK42!x0Bq(Hx9yn(Gg$^=6Mx;pOqRl4XQIkCu&r5clFfBKFwM`eT)~tE z5tqDg^!*>@X0h&&OA!jqxu)NU`pn7)PJS<mJ_}eVANV4@|B7N!)K8=Ed#OTlsqOpF zdCYLfvCh0D)I%3$5qA+q!PkD0;u@82vSQ%m9LMTobe>69y9m4TQ{2{|*nG|3#Mjzf zqw*E;HSsm+W0iNSwg#n-NgtCw*48B|Uy(kh`<RXo5HEQD9k|SiKuqwVi3^BJze&Y$ z!V>DC3$rGyd|(}yS;xWqR4o@^<1@t7@97=tJ&k$T=Dk#UE`HT>udVjL8SWi3?*|^Y z=6=VRf8II{<fVbT*kboaiGi(rV0sT%>o|~yS;l{Tzf12qOPInIoBKLWf&IkStnpL& zcL5Lb|BCpU_!{N9`+H3BJ;m3=*TmO~_aC2cN*~jG%)}*oqQt-odB-L;KwQ!@X~hZg z;xYPtCVD?`D<9eDZ;dw`vs5b=G;gG@Tj%9Y^`DOXe&8|le&BIy?sts&=Xzc_<)vZn z`698KjlEG~V9p1A(dd83IwSWY&h;DbA!a5^Vf&2A#rL6i%dxFlip`7L)90IFbDh_t z$2jpdACD=%kNBGSn)I>a{m18<(#NEay=i@n;{*CF3!gqxb|1<+ru$RkA|{&TdsWDY z@mPI=^MN@ovyLM~E->Q0`U2%Y6BqLjy6KrPo;~yXa;tvk?6yao)5L|e=R&*t1zU%{ zV_@rN?y=?^(41>9NvFilW&JnL_YFI-X`b(v-B;MH`6XrTnCJUqbFq0Ie<`!C_?q}y z8UM-iUGX*XwLJb(W?%6&@wGDkljpmZuj#lXVm>gvKak@R`kkaCMu=D+--Nl)ixl@# G9QrjU(2gnq diff --git a/dlls/light.msstyles/blue_checkbox_31px.svg b/dlls/light.msstyles/blue_checkbox_31px.svg index 731c5af121a..ea2a02ea77d 100644 --- a/dlls/light.msstyles/blue_checkbox_31px.svg +++ b/dlls/light.msstyles/blue_checkbox_31px.svg @@ -5,25 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="31" height="372" fill="#fff" fill-opacity=".98444"/> <rect x="1" y="1" width="29" height="29" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <path d="m11.682 144.66-5.0112-5.0148-1.6705 1.6717 6.6816 6.6864 14.318-14.328-1.6705-1.6717z"/> <path d="m5 262h21v3h-21z"/> <g transform="matrix(1.2787 0 0 1.2336 -.27878 -.23525)" fill="none" stroke-width="1.5924"> - <g> - <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> - <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> - <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> - </g> + <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> <rect x="1.0142" y="101.5" width="22.68" height="23.508" rx="1.5641" ry="1.6213" fill="none" stroke="#aeaeae"/> - <g> - <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> - <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> - <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> - </g> + <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> </g> <g transform="matrix(1.2494 0 0 1.2335 .4349 -.23356)" stroke-width=".6481"> <path d="m9.0017 142.59-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#3096fa"/> @@ -32,11 +28,9 @@ </g> <g transform="matrix(1.2522 0 0 1.2335 -.2522 -.23356)" fill="none" stroke-width="1.6092"> <rect x="1.006" y="202.04" width="23.16" height="23.509" rx="1.5972" ry="1.6213" fill="none" stroke="#aeaeae"/> - <g> - <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> - <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> - <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> - </g> + <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> </g> <g transform="matrix(1.3032 0 0 1.2335 -.88963 -.23356)" stroke-width=".70069"> <path d="m4.5192 237.72h16.114v2.432h-16.114z" fill="#3096fa"/> -- 2.32.0

1 0

[PATCH 2/8] light.msstyles: Adjust scroll bar arrow width and height to 17 pixels.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Themed scroll bar width and height are 17 pixels on XP. Fix that Light theme scroll bar arrow glyphs look off by 1 pixel. The combo button glyphs also have to be moved by 1 pixel because it was designed against the old scroll bar arrow button width and height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../light.msstyles/blue_combobutton_glyph.bmp | Bin 1258 -> 1258 bytes .../light.msstyles/blue_combobutton_glyph.svg | 27 ++++++++---------- dlls/light.msstyles/light.rc | 4 +-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp index 2c0bd8a357fbffce7007fb3606beba2cf9a7b606..251f3772bb850b8c422c1c99665f5f4004dfc6e7 100644 GIT binary patch literal 1258 zcmd5&I}U<C6kMZ~SJ22BdR=2jX=7#M3A}@?C$RNH+{PXPBwT=Fa0d?{hGv}yo5%_z zHbyrL^LFOFN0`Ox)?>xl<Glm=z!2y#&br`@_EA=jVyt{fQ;X$#TQNT>8`pj`X*NYs zWQSpxdY(5jo!2c00t-Ef@B0pM9LM9ATUOY^$s;C(_BHiFlkf)RRQaYEeB)ZxeqAf2 zY#;?%bAe|83E*h1<pP~+kJCS)9yRqslYo&6?lk*XxjZg&J3r0R>@si7B|FZn{4A2Y z6b^BAnACE~T)_(uOu5j$rrz8Y^6pNJT#8v&{8cXa1sh0#)?DCOKms_LYq>z@+9Rez S`)KC9S3)y#!JPwN$>j-~Je*+w literal 1258 zcmd6jO>ToQ5QQBztDK>W-XP8iKy13|CMU=pDrJQd3wGTDQg<AHpL68~luGV52}HOc z#G+DT@!2zPo{{{5x64{x*9UtD8+eA5dQnfDhi*<eSXQaqCz=gj_wR$@qH^-Li*CB6 zvMlquu0LJX?W(GZAS{Z);6J(3TgNOGPd^hc{kiYu<gSNy9BNXF5B%TyfA-ee9A<N2 z9zh5OCUZfL#nZo~^E$bpc`(Wa?F<i<%U7!N?@Z6;(j?ocO}Al_Xw#;<$y}Or7mKIQ z<?79}lM8pfHqoP8T72+Ox$ur0W^-X4fxOwkWG?72+;gEe;N(K@!6=u`=X3t~`T;?t Bf*t?> diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg index 0caf1c4b696..b501a5496bd 100644 --- a/dlls/light.msstyles/blue_combobutton_glyph.svg +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -5,24 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g> - <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> - <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> - <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> - <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> - <g> - <g stroke-width=".26458"> - <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> - <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> - <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> - <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> - </g> - <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> - <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> + <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0.52915 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.2496 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g transform="translate(.13227)"> + <g stroke-width=".26458"> + <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> + <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> + <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> + <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> </g> + <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> + <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bfb04faf9e8..a8e35f9c5d7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,8 +144,8 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"ScrollbarWidth = 16\r\n" -"ScrollbarHeight = 16\r\n" +"ScrollbarWidth = 17\r\n" +"ScrollbarHeight = 17\r\n" "\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n" -- 2.32.0

1 0

[PATCH 1/8] light.msstyles: Use stretch sizing type for scroll bar arrow button background.
by Zhiyi Zhang 11 Feb '22

11 Feb '22

Scroll bar arrow button background within its sizing margins is all white, using stretch instead of tile has no visual difference and is more efficient. On Windows, stretch sizing type is also used for this part. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index ba27c9461bc..bfb04faf9e8 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -607,7 +607,7 @@ BLUE_INI TEXTFILE "BgType = ImageFile\r\n" "SizingMargins = 5, 5, 5, 5\r\n" "ContentMargins = 0, 0, 3, 3\r\n" -"SizingType = Tile\r\n" +"SizingType = Stretch\r\n" "ImageFile = blue_scrollbar_arrows.bmp\r\n" "ImageCount = 16\r\n" "ImageLayout = Vertical\r\n" -- 2.32.0

1 0

[PATCH 1/2] mfreadwrite/reader: Use separate refcount for events callbacks.
by Nikolay Sivov 11 Feb '22

11 Feb '22

From: Rémi Bernon <rbernon(a)codeweavers.com> This resolves circular dependency, with source and streams holding references to the callbacks, subscribed to their event queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Replaces 226173. dlls/mfreadwrite/reader.c | 91 ++++++++++++++++++++------------- dlls/mfreadwrite/tests/mfplat.c | 3 +- 2 files changed, 58 insertions(+), 36 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 6d35a59f3a8..0b6c6fa8583 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -154,6 +154,7 @@ struct source_reader IMFAsyncCallback stream_events_callback; IMFAsyncCallback async_commands_callback; LONG refcount; + LONG public_refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; IMFSourceReaderCallback *async_callback; @@ -203,6 +204,51 @@ static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVi return CONTAINING_RECORD(iface, struct media_stream, notify_cb); } +static void source_reader_release_responses(struct source_reader *reader, struct media_stream *stream); + +static ULONG source_reader_addref(struct source_reader *reader) +{ + return InterlockedIncrement(&reader->refcount); +} + +static ULONG source_reader_release(struct source_reader *reader) +{ + ULONG refcount = InterlockedDecrement(&reader->refcount); + unsigned int i; + + if (!refcount) + { + if (reader->async_callback) + IMFSourceReaderCallback_Release(reader->async_callback); + if (reader->descriptor) + IMFPresentationDescriptor_Release(reader->descriptor); + if (reader->attributes) + IMFAttributes_Release(reader->attributes); + IMFMediaSource_Release(reader->source); + + for (i = 0; i < reader->stream_count; ++i) + { + struct media_stream *stream = &reader->streams[i]; + + if (stream->stream) + IMFMediaStream_Release(stream->stream); + if (stream->current) + IMFMediaType_Release(stream->current); + if (stream->decoder.transform) + IMFTransform_Release(stream->decoder.transform); + if (stream->allocator) + IMFVideoSampleAllocatorEx_Release(stream->allocator); + } + source_reader_release_responses(reader, NULL); + free(reader->streams); + MFUnlockWorkQueue(reader->queue); + DeleteCriticalSection(&reader->cs); + free(reader); + } + + return refcount; +} + static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -325,13 +371,13 @@ static HRESULT WINAPI source_reader_callback_QueryInterface(IMFAsyncCallback *if static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return source_reader_addref(reader); } static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return source_reader_release(reader); } static HRESULT WINAPI source_reader_callback_GetParameters(IMFAsyncCallback *iface, @@ -611,13 +657,13 @@ static const IMFAsyncCallbackVtbl source_events_callback_vtbl = static ULONG WINAPI source_reader_stream_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return source_reader_addref(reader); } static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return source_reader_release(reader); } static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, struct media_stream *stream) @@ -888,13 +934,13 @@ static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = static ULONG WINAPI source_reader_async_commands_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return source_reader_addref(reader); } static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return source_reader_release(reader); } static struct stream_response * media_stream_detach_response(struct source_reader *reader, struct stream_response *response) @@ -1326,7 +1372,7 @@ static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID r static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - ULONG refcount = InterlockedIncrement(&reader->refcount); + ULONG refcount = InterlockedIncrement(&reader->public_refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1336,41 +1382,15 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - ULONG refcount = InterlockedDecrement(&reader->refcount); - unsigned int i; + ULONG refcount = InterlockedDecrement(&reader->public_refcount); TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { - if (reader->async_callback) - IMFSourceReaderCallback_Release(reader->async_callback); if (reader->flags & SOURCE_READER_SHUTDOWN_ON_RELEASE) IMFMediaSource_Shutdown(reader->source); - if (reader->descriptor) - IMFPresentationDescriptor_Release(reader->descriptor); - if (reader->attributes) - IMFAttributes_Release(reader->attributes); - IMFMediaSource_Release(reader->source); - - for (i = 0; i < reader->stream_count; ++i) - { - struct media_stream *stream = &reader->streams[i]; - - if (stream->stream) - IMFMediaStream_Release(stream->stream); - if (stream->current) - IMFMediaType_Release(stream->current); - if (stream->decoder.transform) - IMFTransform_Release(stream->decoder.transform); - if (stream->allocator) - IMFVideoSampleAllocatorEx_Release(stream->allocator); - } - source_reader_release_responses(reader, NULL); - free(reader->streams); - MFUnlockWorkQueue(reader->queue); - DeleteCriticalSection(&reader->cs); - free(reader); + source_reader_release(reader); } return refcount; @@ -2268,6 +2288,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->async_commands_callback.lpVtbl = &async_commands_callback_vtbl; + object->public_refcount = 1; object->refcount = 1; list_init(&object->responses); if (shutdown_on_release) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index f484925b28a..8417a0d37b7 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -862,7 +862,8 @@ skip_read_sample: hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_ALL_STREAMS); ok(hr == S_OK, "Failed to flush all streams, hr %#x.\n", hr); - IMFSourceReader_Release(reader); + refcount = IMFSourceReader_Release(reader); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Async mode. */ callback = create_async_callback(); -- 2.34.1

1 1

[PATCH] mfmediaengine: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/Makefile.in | 1 - dlls/mfmediaengine/main.c | 70 +++++++++++++++++----------------- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index e410f31a99b..a0e944c0633 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfmediaengine.dll IMPORTS = oleaut32 ole32 mfplat mf mfuuid dxguid uuid diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5bfb35efbac..31aee0209f6 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -209,7 +209,7 @@ static HRESULT media_engine_lock_d3d_device(struct media_engine *engine, ID3D11D { if (FAILED(hr = IMFDXGIDeviceManager_OpenDeviceHandle(engine->device_manager, &engine->device_handle))) { - WARN("Failed to open device handle, hr %#x.\n", hr); + WARN("Failed to open device handle, hr %#lx.\n", hr); return hr; } } @@ -225,7 +225,7 @@ static HRESULT media_engine_lock_d3d_device(struct media_engine *engine, ID3D11D if (FAILED(hr = IMFDXGIDeviceManager_OpenDeviceHandle(engine->device_manager, &engine->device_handle))) { - WARN("Failed to open a device handle, hr %#x.\n", hr); + WARN("Failed to open a device handle, hr %#lx.\n", hr); return hr; } hr = IMFDXGIDeviceManager_LockDevice(engine->device_manager, engine->device_handle, &IID_ID3D11Device, @@ -335,7 +335,7 @@ static HRESULT media_engine_create_d3d11_video_frame_resources(struct media_engi if (FAILED(hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &engine->video_frame.d3d11.vb))) { - WARN("Failed to create a vertex buffer, hr %#x.\n", hr); + WARN("Failed to create a vertex buffer, hr %#lx.\n", hr); goto failed; } @@ -344,7 +344,7 @@ static HRESULT media_engine_create_d3d11_video_frame_resources(struct media_engi if (FAILED(hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &engine->video_frame.d3d11.ps_cb))) { - WARN("Failed to create a buffer, hr %#x.\n", hr); + WARN("Failed to create a buffer, hr %#lx.\n", hr); goto failed; } @@ -363,14 +363,14 @@ static HRESULT media_engine_create_d3d11_video_frame_resources(struct media_engi if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &engine->video_frame.d3d11.source))) { - WARN("Failed to create source texture, hr %#x.\n", hr); + WARN("Failed to create source texture, hr %#lx.\n", hr); goto failed; } if (FAILED(hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)engine->video_frame.d3d11.source, NULL, &engine->video_frame.d3d11.srv))) { - WARN("Failed to create SRV, hr %#x.\n", hr); + WARN("Failed to create SRV, hr %#lx.\n", hr); goto failed; } @@ -383,7 +383,7 @@ static HRESULT media_engine_create_d3d11_video_frame_resources(struct media_engi if (FAILED(hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &engine->video_frame.d3d11.sampler))) { - WARN("Failed to create a sampler state, hr %#x.\n", hr); + WARN("Failed to create a sampler state, hr %#lx.\n", hr); goto failed; } @@ -391,20 +391,20 @@ static HRESULT media_engine_create_d3d11_video_frame_resources(struct media_engi if (FAILED(hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &engine->video_frame.d3d11.input_layout))) { - WARN("Failed to create input layout, hr %#x.\n", hr); + WARN("Failed to create input layout, hr %#lx.\n", hr); goto failed; } /* Shaders */ if (FAILED(hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &engine->video_frame.d3d11.vs))) { - WARN("Failed to create the vertex shader, hr %#x.\n", hr); + WARN("Failed to create the vertex shader, hr %#lx.\n", hr); goto failed; } if (FAILED(hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &engine->video_frame.d3d11.ps))) { - WARN("Failed to create the pixel shader, hr %#x.\n", hr); + WARN("Failed to create the pixel shader, hr %#lx.\n", hr); goto failed; } @@ -469,7 +469,7 @@ static ULONG WINAPI media_error_AddRef(IMFMediaError *iface) struct media_error *me = impl_from_IMFMediaError(iface); ULONG refcount = InterlockedIncrement(&me->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -479,7 +479,7 @@ static ULONG WINAPI media_error_Release(IMFMediaError *iface) struct media_error *me = impl_from_IMFMediaError(iface); ULONG refcount = InterlockedDecrement(&me->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) free(me); @@ -519,7 +519,7 @@ static HRESULT WINAPI media_error_SetExtendedErrorCode(IMFMediaError *iface, HRE { struct media_error *me = impl_from_IMFMediaError(iface); - TRACE("%p, %#x.\n", iface, code); + TRACE("%p, %#lx.\n", iface, code); me->extended_code = code; @@ -576,7 +576,7 @@ static ULONG WINAPI time_range_AddRef(IMFMediaTimeRange *iface) struct time_range *range = impl_from_IMFMediaTimeRange(iface); ULONG refcount = InterlockedIncrement(&range->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -586,7 +586,7 @@ static ULONG WINAPI time_range_Release(IMFMediaTimeRange *iface) struct time_range *range = impl_from_IMFMediaTimeRange(iface); ULONG refcount = InterlockedDecrement(&range->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -610,7 +610,7 @@ static HRESULT WINAPI time_range_GetStart(IMFMediaTimeRange *iface, DWORD idx, d { struct time_range *range = impl_from_IMFMediaTimeRange(iface); - TRACE("%p, %u, %p.\n", iface, idx, start); + TRACE("%p, %lu, %p.\n", iface, idx, start); if (idx >= range->count) return E_INVALIDARG; @@ -624,7 +624,7 @@ static HRESULT WINAPI time_range_GetEnd(IMFMediaTimeRange *iface, DWORD idx, dou { struct time_range *range = impl_from_IMFMediaTimeRange(iface); - TRACE("%p, %u, %p.\n", iface, idx, end); + TRACE("%p, %lu, %p.\n", iface, idx, end); if (idx >= range->count) return E_INVALIDARG; @@ -814,7 +814,7 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology IMFMediaTypeHandler_Release(handler); if (FAILED(hr)) { - WARN("Failed to get current media type %#x.\n", hr); + WARN("Failed to get current media type %#lx.\n", hr); return; } @@ -873,13 +873,13 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface if (FAILED(hr = IMFMediaSession_EndGetEvent(engine->session, result, &event))) { - WARN("Failed to get session event, hr %#x.\n", hr); + WARN("Failed to get session event, hr %#lx.\n", hr); goto failed; } if (FAILED(hr = IMFMediaEvent_GetType(event, &event_type))) { - WARN("Failed to get event type, hr %#x.\n", hr); + WARN("Failed to get event type, hr %#lx.\n", hr); goto failed; } @@ -955,7 +955,7 @@ failed: IMFMediaEvent_Release(event); if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, iface, NULL))) - WARN("Failed to subscribe to session events, hr %#x.\n", hr); + WARN("Failed to subscribe to session events, hr %#lx.\n", hr); return S_OK; } @@ -1086,7 +1086,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return hr; if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(pd, &stream_count))) - WARN("Failed to get stream count, hr %#x.\n", hr); + WARN("Failed to get stream count, hr %#lx.\n", hr); /* Enable first video stream and first audio stream. */ @@ -1154,10 +1154,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi if (sd_audio) { if (FAILED(hr = media_engine_create_source_node(source, pd, sd_audio, &audio_src))) - WARN("Failed to create audio source node, hr %#x.\n", hr); + WARN("Failed to create audio source node, hr %#lx.\n", hr); if (FAILED(hr = media_engine_create_audio_renderer(engine, &sar_node))) - WARN("Failed to create audio renderer node, hr %#x.\n", hr); + WARN("Failed to create audio renderer node, hr %#lx.\n", hr); if (sar_node && audio_src) { @@ -1175,10 +1175,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi if (SUCCEEDED(hr) && sd_video) { if (FAILED(hr = media_engine_create_source_node(source, pd, sd_video, &video_src))) - WARN("Failed to create video source node, hr %#x.\n", hr); + WARN("Failed to create video source node, hr %#lx.\n", hr); if (FAILED(hr = media_engine_create_video_renderer(engine, &grabber_node))) - WARN("Failed to create video grabber node, hr %#x.\n", hr); + WARN("Failed to create video grabber node, hr %#lx.\n", hr); if (grabber_node && video_src) { @@ -1249,7 +1249,7 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object); if (FAILED(hr)) - WARN("Failed to create source object, hr %#x.\n", hr); + WARN("Failed to create source object, hr %#lx.\n", hr); if (object) { @@ -1322,7 +1322,7 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngineEx *iface) struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); ULONG refcount = InterlockedIncrement(&engine->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1356,7 +1356,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngineEx *iface) struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); ULONG refcount = InterlockedDecrement(&engine->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) free_media_engine(engine); @@ -2187,7 +2187,7 @@ static HRESULT media_engine_transfer_to_d3d11_texture(struct media_engine *engin if (FAILED(hr = media_engine_create_d3d11_video_frame_resources(engine, device))) { - WARN("Failed to create d3d resources, hr %#x.\n", hr); + WARN("Failed to create d3d resources, hr %#lx.\n", hr); goto done; } @@ -2206,7 +2206,7 @@ static HRESULT media_engine_transfer_to_d3d11_texture(struct media_engine *engin if (FAILED(hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv))) { - WARN("Failed to create an rtv, hr %#x.\n", hr); + WARN("Failed to create an rtv, hr %#lx.\n", hr); goto done; } @@ -2456,21 +2456,21 @@ static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, D static HRESULT WINAPI media_engine_GetStreamAttribute(IMFMediaEngineEx *iface, DWORD stream_index, REFGUID attribute, PROPVARIANT *value) { - FIXME("%p, %d, %s, %p stub.\n", iface, stream_index, debugstr_guid(attribute), value); + FIXME("%p, %ld, %s, %p stub.\n", iface, stream_index, debugstr_guid(attribute), value); return E_NOTIMPL; } static HRESULT WINAPI media_engine_GetStreamSelection(IMFMediaEngineEx *iface, DWORD stream_index, BOOL *enabled) { - FIXME("%p, %d, %p stub.\n", iface, stream_index, enabled); + FIXME("%p, %ld, %p stub.\n", iface, stream_index, enabled); return E_NOTIMPL; } static HRESULT WINAPI media_engine_SetStreamSelection(IMFMediaEngineEx *iface, DWORD stream_index, BOOL enabled) { - FIXME("%p, %d, %d stub.\n", iface, stream_index, enabled); + FIXME("%p, %ld, %d stub.\n", iface, stream_index, enabled); return E_NOTIMPL; } @@ -3036,7 +3036,7 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac struct media_engine *object; HRESULT hr; - TRACE("%p, %#x, %p, %p.\n", iface, flags, attributes, engine); + TRACE("%p, %#lx, %p, %p.\n", iface, flags, attributes, engine); if (!attributes || !engine) return E_POINTER; -- 2.34.1

1 0

[PATCH] mfplay/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/tests/Makefile.in | 1 - dlls/mfplay/tests/mfplay.c | 152 +++++++++++++++++----------------- 2 files changed, 76 insertions(+), 77 deletions(-) diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index 06f77c94fec..4eabb5ae0ab 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfplay.dll IMPORTS = mfplay user32 uuid mfuuid diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 727ab1e3b9a..3c2782a9412 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -37,7 +37,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -88,40 +88,40 @@ static void test_create_player(void) HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, NULL); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, NULL); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); player = (void *)0xdeadbeef; hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, &player); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(!player, "Unexpected pointer %p.\n", player); hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, &player); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); hr = MFPCreateMediaPlayer(NULL, TRUE, 0, &callback, NULL, &player); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(player, &IID_IMFPMediaPlayer, TRUE); check_interface(player, &IID_IPropertyStore, TRUE); hr = IMFPMediaPlayer_QueryInterface(player, &IID_IPropertyStore, (void **)&propstore); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(propstore, &IID_IMFPMediaPlayer, TRUE); hr = IPropertyStore_QueryInterface(propstore, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_QueryInterface(player, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk == unk2, "Unexpected interface.\n"); IUnknown_Release(unk); IUnknown_Release(unk2); @@ -131,10 +131,10 @@ static void test_create_player(void) IMFPMediaPlayer_Release(player); hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, (HWND)0x1, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetVideoWindow(player, &window); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(window == (HWND)0x1, "Unexpected window.\n"); IMFPMediaPlayer_Release(player); @@ -155,89 +155,89 @@ static void test_shutdown(void) HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetState(player, &state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(state == MFP_MEDIAPLAYER_STATE_EMPTY, "Unexpected state %d.\n", state); hr = IMFPMediaPlayer_Shutdown(player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Check methods in shutdown state. */ hr = IMFPMediaPlayer_Play(player); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_Pause(player); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_Stop(player); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetSupportedRates(player, TRUE, &slowest, &fastest); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetState(player, &state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(state == MFP_MEDIAPLAYER_STATE_SHUTDOWN, "Unexpected state %d.\n", state); hr = IMFPMediaPlayer_GetIdealVideoSize(player, &min_size, &max_size); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetBorderColor(player, &color); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetBorderColor(player, 0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); todo_wine - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_ClearMediaItem(player); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetMediaItem(player, &item); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetVideoWindow(player, &window); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetDuration(player, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_Shutdown(player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); } @@ -249,20 +249,20 @@ static void test_media_item(void) HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetMediaItem(player, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); /* Async mode, no callback was specified. */ hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", FALSE, 0, &item); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", FALSE, 0, NULL); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); } @@ -282,82 +282,82 @@ static void test_video_control(void) ok(!!window, "Failed to create output window.\n"); hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, window, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* No active media item */ rect.left = rect.top = 0.0f; rect.right = rect.bottom = 1.0f; hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetVideoSourceRect(player, NULL); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetBorderColor(player, 0); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetBorderColor(player, &color); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); todo_wine - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); /* No active media item, no output window.*/ hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); rect.left = rect.top = 0.0f; rect.right = rect.bottom = 1.0f; hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetVideoSourceRect(player, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetBorderColor(player, 0); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetBorderColor(player, &color); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); todo_wine - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); @@ -371,32 +371,32 @@ static void test_duration(void) HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* No media item. */ hr = IMFPMediaPlayer_GetDuration(player, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetDuration(player, &IID_IUnknown, &propvar); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, &IID_IUnknown, &propvar); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); } -- 2.34.1

1 0

[PATCH] mfplay: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/Makefile.in | 1 - dlls/mfplay/player.c | 44 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 509208234c0..4d465fbec39 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfplay.dll IMPORTLIB = mfplay IMPORTS = mfplat mf ole32 user32 uuid mfuuid strmiids diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 01438060dbd..7f9188e5619 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -175,7 +175,7 @@ static ULONG WINAPI media_event_AddRef(IUnknown *iface) struct media_event *event = impl_event_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&event->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -185,7 +185,7 @@ static ULONG WINAPI media_event_Release(IUnknown *iface) struct media_event *event = impl_event_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&event->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -330,7 +330,7 @@ static ULONG WINAPI media_item_AddRef(IMFPMediaItem *iface) struct media_item *item = impl_from_IMFPMediaItem(iface); ULONG refcount = InterlockedIncrement(&item->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -340,7 +340,7 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) struct media_item *item = impl_from_IMFPMediaItem(iface); ULONG refcount = InterlockedDecrement(&item->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -419,7 +419,7 @@ static HRESULT WINAPI media_item_SetUserData(IMFPMediaItem *iface, DWORD_PTR use { struct media_item *item = impl_from_IMFPMediaItem(iface); - TRACE("%p, %lx.\n", iface, user_data); + TRACE("%p, %Ix.\n", iface, user_data); item->user_data = user_data; @@ -607,7 +607,7 @@ static HRESULT WINAPI media_item_GetStreamSelection(IMFPMediaItem *iface, DWORD IMFStreamDescriptor *sd; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, index, selected); + TRACE("%p, %lu, %p.\n", iface, index, selected); if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, selected, &sd))) IMFStreamDescriptor_Release(sd); @@ -619,7 +619,7 @@ static HRESULT WINAPI media_item_SetStreamSelection(IMFPMediaItem *iface, DWORD { struct media_item *item = impl_from_IMFPMediaItem(iface); - TRACE("%p, %u, %d.\n", iface, index, select); + TRACE("%p, %lu, %d.\n", iface, index, select); return select ? IMFPresentationDescriptor_SelectStream(item->pd, index) : IMFPresentationDescriptor_DeselectStream(item->pd, index); @@ -633,7 +633,7 @@ static HRESULT WINAPI media_item_GetStreamAttribute(IMFPMediaItem *iface, DWORD BOOL selected; HRESULT hr; - TRACE("%p, %u, %s, %p.\n", iface, index, debugstr_guid(key), value); + TRACE("%p, %lu, %s, %p.\n", iface, index, debugstr_guid(key), value); if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, &selected, &sd))) { @@ -681,7 +681,7 @@ static HRESULT WINAPI media_item_SetStreamSink(IMFPMediaItem *iface, DWORD index BOOL selected; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, index, sink); + TRACE("%p, %lu, %p.\n", iface, index, sink); if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, &selected, &sd))) return hr; @@ -778,7 +778,7 @@ static HRESULT media_item_set_source(struct media_item *item, IUnknown *object) if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) { - WARN("Failed to get presentation descriptor, hr %#x.\n", hr); + WARN("Failed to get presentation descriptor, hr %#lx.\n", hr); IMFMediaSource_Release(source); return hr; } @@ -834,7 +834,7 @@ static ULONG WINAPI media_player_AddRef(IMFPMediaPlayer *iface) struct media_player *player = impl_from_IMFPMediaPlayer(iface); ULONG refcount = InterlockedIncrement(&player->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -844,7 +844,7 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) struct media_player *player = impl_from_IMFPMediaPlayer(iface); ULONG refcount = InterlockedDecrement(&player->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1082,7 +1082,7 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface struct media_player *player = impl_from_IMFPMediaPlayer(iface); HRESULT hr; - TRACE("%p, %s, %d, %lx, %p.\n", iface, debugstr_w(url), sync, user_data, item); + TRACE("%p, %s, %d, %Ix, %p.\n", iface, debugstr_w(url), sync, user_data, item); EnterCriticalSection(&player->cs); if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) @@ -1174,7 +1174,7 @@ static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *if struct media_player *player = impl_from_IMFPMediaPlayer(iface); HRESULT hr; - TRACE("%p, %p, %d, %lx, %p.\n", iface, object, sync, user_data, item); + TRACE("%p, %p, %d, %Ix, %p.\n", iface, object, sync, user_data, item); EnterCriticalSection(&player->cs); if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) @@ -1249,12 +1249,12 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me else if (IsEqualGUID(&major, &MFMediaType_Audio)) { if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink))) - WARN("Failed to create SAR activation object, hr %#x.\n", hr); + WARN("Failed to create SAR activation object, hr %#lx.\n", hr); } else if (IsEqualGUID(&major, &MFMediaType_Video) && player->output_window && !video_added) { if (FAILED(hr = MFCreateVideoRendererActivate(player->output_window, (IMFActivate **)&sink))) - WARN("Failed to create EVR activation object, hr %#x.\n", hr); + WARN("Failed to create EVR activation object, hr %#lx.\n", hr); video_added = SUCCEEDED(hr); } @@ -1482,7 +1482,7 @@ static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DW IMFVideoDisplayControl *display_control; HRESULT hr; - TRACE("%p, %u.\n", iface, mode); + TRACE("%p, %lu.\n", iface, mode); if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { @@ -1535,7 +1535,7 @@ static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORR IMFVideoDisplayControl *display_control; HRESULT hr; - TRACE("%p, %#x.\n", iface, color); + TRACE("%p, %#lx.\n", iface, color); if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { @@ -1678,7 +1678,7 @@ static HRESULT WINAPI media_player_propstore_GetAt(IPropertyStore *iface, DWORD { struct media_player *player = impl_from_IPropertyStore(iface); - TRACE("%p, %u, %p.\n", iface, prop, key); + TRACE("%p, %lu, %p.\n", iface, prop, key); return IPropertyStore_GetAt(player->propstore, prop, key); } @@ -1784,7 +1784,7 @@ static HRESULT WINAPI media_player_resolver_callback_Invoke(IMFAsyncCallback *if } if (FAILED(hr)) - WARN("Failed to set media source, hr %#x.\n", hr); + WARN("Failed to set media source, hr %#lx.\n", hr); if (FAILED(media_event_create(player, MFP_EVENT_TYPE_MEDIAITEM_CREATED, hr, &item->IMFPMediaItem_iface, &event))) @@ -2111,7 +2111,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C { if (FAILED(hr = media_player_create_item_from_url(object, url, TRUE, 0, &item))) { - WARN("Failed to create media item, hr %#x.\n", hr); + WARN("Failed to create media item, hr %#lx.\n", hr); goto failed; } @@ -2119,7 +2119,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C IMFPMediaItem_Release(item); if (FAILED(hr)) { - WARN("Failed to set media item, hr %#x.\n", hr); + WARN("Failed to set media item, hr %#lx.\n", hr); goto failed; } -- 2.34.1

1 0

[PATCH] combase/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/tests/Makefile.in | 1 - dlls/combase/tests/roapi.c | 14 +++++++------- dlls/combase/tests/string.c | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index b98b0e37c6a..1c3d77725b3 100644 --- a/dlls/combase/tests/Makefile.in +++ b/dlls/combase/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = combase.dll IMPORTS = combase diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 1efcc801dcb..b1ac15a08cb 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -37,27 +37,27 @@ static void test_ActivationFactories(void) hr = WindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = WindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = RoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory); - ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#lx.\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if(factory) IActivationFactory_Release(factory); hr = RoActivateInstance(str2, &inspect); - ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspect); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "UNexpected hr %#lx.\n", hr); if(inspect) IInspectable_Release(inspect); diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 232d37304d6..ceb8ffa6e09 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -514,7 +514,7 @@ static void test_hstring_struct(void) ok(prv->header.flags == 0, "Expected 0 in flags field, got %#x.\n", prv->header.flags); ok(prv->header.length == 6, "Expected 6 in length field, got %u.\n", prv->header.length); ok(prv->header.str == prv->buffer, "Expected str to point at buffer, instead pointing at %p.\n", prv->header.str); - ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + ok(prv->refcount == 1, "Expected 1 in refcount, got %lu.\n", prv->refcount); ok(wcscmp(input_string, prv->buffer) == 0, "Expected strings to match.\n"); ok(prv->buffer[prv->header.length] == '\0', "Expected buffer to be null terminated.\n"); @@ -522,13 +522,13 @@ static void test_hstring_struct(void) prv2 = CONTAINING_RECORD(str2, struct hstring_private, header); - ok(prv->refcount == 2, "Expected 2 in refcount, got %u.\n", prv->refcount); - ok(prv2->refcount == 2, "Expected 2 in refcount, got %u.\n", prv2->refcount); + ok(prv->refcount == 2, "Expected 2 in refcount, got %lu.\n", prv->refcount); + ok(prv2->refcount == 2, "Expected 2 in refcount, got %lu.\n", prv2->refcount); ok(wcscmp(input_string, prv2->buffer) == 0, "Expected strings to match.\n"); ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); - ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + ok(prv->refcount == 1, "Expected 1 in refcount, got %lu.\n", prv->refcount); ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); -- 2.34.1

1 0

[PATCH] shcore: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/Makefile.in | 1 - dlls/shcore/main.c | 96 ++++++++++++++++++++--------------------- 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index 084ff0d87c7..7c4d161a558 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = shcore.dll IMPORTLIB = shcore IMPORTS = user32 gdi32 ole32 advapi32 diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 633628b4c72..6cc18ad1473 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -41,7 +41,7 @@ static IUnknown *process_ref; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - TRACE("(%p, %u, %p)\n", instance, reason, reserved); + TRACE("%p, %lu, %p.\n", instance, reason, reserved); switch (reason) { @@ -97,7 +97,7 @@ HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) ULONG read; HRESULT hr; - TRACE("(%p, %p, %u)\n", stream, dest, size); + TRACE("%p, %p, %lu.\n", stream, dest, size); hr = IStream_Read(stream, dest, size, &read); if (SUCCEEDED(hr) && read != size) @@ -135,7 +135,7 @@ HRESULT WINAPI _IStream_Write(IStream *stream, const void *src, ULONG size) ULONG written; HRESULT hr; - TRACE("(%p, %p, %u)\n", stream, src, size); + TRACE("%p, %p, %lu.\n", stream, src, size); hr = IStream_Write(stream, src, size, &written); if (SUCCEEDED(hr) && written != size) @@ -226,22 +226,22 @@ HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) return E_FAIL; hr = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void **)&objwithsite); - TRACE("ObjectWithSite %p, hr %#x.\n", objwithsite, hr); + TRACE("ObjectWithSite %p, hr %#lx.\n", objwithsite, hr); if (SUCCEEDED(hr)) { hr = IObjectWithSite_SetSite(objwithsite, site); - TRACE("SetSite() hr %#x.\n", hr); + TRACE("SetSite() hr %#lx.\n", hr); IObjectWithSite_Release(objwithsite); } else { hr = IUnknown_QueryInterface(obj, &IID_IInternetSecurityManager, (void **)&sec_manager); - TRACE("InternetSecurityManager %p, hr %#x.\n", sec_manager, hr); + TRACE("InternetSecurityManager %p, hr %#lx.\n", sec_manager, hr); if (FAILED(hr)) return hr; hr = IInternetSecurityManager_SetSecuritySite(sec_manager, (IInternetSecurityMgrSite *)site); - TRACE("SetSecuritySite() hr %#x.\n", hr); + TRACE("SetSecuritySite() hr %#lx.\n", hr); IInternetSecurityManager_Release(sec_manager); } @@ -573,7 +573,7 @@ static ULONG WINAPI shstream_AddRef(IStream *iface) struct shstream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE("(%p)->(%u)\n", stream, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -583,7 +583,7 @@ static ULONG WINAPI memstream_Release(IStream *iface) struct shstream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE("(%p)->(%u)\n", stream, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -599,7 +599,7 @@ static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size struct shstream *stream = impl_from_IStream(iface); DWORD length; - TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); + TRACE("%p, %p, %lu, %p.\n", iface, buff, buff_size, read_len); if (stream->u.mem.position >= stream->u.mem.length) { @@ -626,7 +626,7 @@ static HRESULT WINAPI memstream_Write(IStream *iface, const void *buff, ULONG bu struct shstream *stream = impl_from_IStream(iface); DWORD length = stream->u.mem.position + buff_size; - TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, written); + TRACE("%p, %p, %lu, %p.\n", iface, buff, buff_size, written); if (length < stream->u.mem.position) /* overflow */ return STG_E_INSUFFICIENTMEMORY; @@ -654,7 +654,7 @@ static HRESULT WINAPI memstream_Seek(IStream *iface, LARGE_INTEGER move, DWORD o struct shstream *stream = impl_from_IStream(iface); LARGE_INTEGER tmp; - TRACE("(%p)->(%s, %d, %p)\n", stream, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); + TRACE("%p, %s, %ld, %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); if (origin == STREAM_SEEK_SET) tmp = move; @@ -748,9 +748,7 @@ static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTE static HRESULT WINAPI shstream_Commit(IStream *iface, DWORD flags) { - struct shstream *stream = impl_from_IStream(iface); - - TRACE("(%p, %#x)\n", stream, flags); + TRACE("%p, %#lx.\n", iface, flags); /* Commit is not supported by this stream */ return E_NOTIMPL; @@ -790,7 +788,7 @@ static HRESULT WINAPI memstream_Stat(IStream *iface, STATSTG *statstg, DWORD fla { struct shstream *stream = impl_from_IStream(iface); - TRACE("(%p, %p, %#x)\n", stream, statstg, flags); + TRACE("%p, %p, %#lx.\n", iface, statstg, flags); memset(statstg, 0, sizeof(*statstg)); statstg->type = STGTY_STREAM; @@ -884,7 +882,7 @@ static ULONG WINAPI filestream_Release(IStream *iface) struct shstream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE("(%p)->(%u)\n", stream, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -901,11 +899,11 @@ static HRESULT WINAPI filestream_Read(IStream *iface, void *buff, ULONG size, UL struct shstream *stream = impl_from_IStream(iface); DWORD read = 0; - TRACE("(%p, %p, %u, %p)\n", stream, buff, size, read_len); + TRACE("%p, %p, %lu, %p.\n", iface, buff, size, read_len); if (!ReadFile(stream->u.file.handle, buff, size, &read, NULL)) { - WARN("error %d reading file\n", GetLastError()); + WARN("error %ld reading file\n", GetLastError()); return S_FALSE; } @@ -920,7 +918,7 @@ static HRESULT WINAPI filestream_Write(IStream *iface, const void *buff, ULONG s struct shstream *stream = impl_from_IStream(iface); DWORD written_len = 0; - TRACE("(%p, %p, %u, %p)\n", stream, buff, size, written); + TRACE("%p, %p, %lu, %p.\n", iface, buff, size, written); switch (stream->u.file.mode & 0xf) { @@ -945,7 +943,7 @@ static HRESULT WINAPI filestream_Seek(IStream *iface, LARGE_INTEGER move, DWORD struct shstream *stream = impl_from_IStream(iface); DWORD position; - TRACE("(%p, %s, %d, %p)\n", stream, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); + TRACE("%p, %s, %ld, %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); position = SetFilePointer(stream->u.file.handle, move.u.LowPart, NULL, origin); if (position == INVALID_SET_FILE_POINTER) @@ -1031,9 +1029,7 @@ static HRESULT WINAPI filestream_CopyTo(IStream *iface, IStream *dest, ULARGE_IN static HRESULT WINAPI filestream_Commit(IStream *iface, DWORD flags) { - struct shstream *stream = impl_from_IStream(iface); - - TRACE("(%p, %#x)\n", stream, flags); + TRACE("%p, %#lx.\n", iface, flags); return S_OK; } @@ -1043,7 +1039,7 @@ static HRESULT WINAPI filestream_Stat(IStream *iface, STATSTG *statstg, DWORD fl struct shstream *stream = impl_from_IStream(iface); BY_HANDLE_FILE_INFORMATION fi; - TRACE("(%p, %p, %#x)\n", stream, statstg, flags); + TRACE("%p, %p, %#lx.\n", iface, statstg, flags); if (!statstg) return STG_E_INVALIDPOINTER; @@ -1102,7 +1098,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(const WCHAR *path, DWORD mode, DWORD attri struct shstream *stream; HANDLE hFile; - TRACE("(%s, %d, 0x%08X, %d, %p, %p)\n", debugstr_w(path), mode, attributes, + TRACE("%s, %ld, %#lx, %d, %p, %p)\n", debugstr_w(path), mode, attributes, create, template, ret); if (!path || !ret || template) @@ -1180,7 +1176,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(const WCHAR *path, DWORD mode, DWORD attri */ HRESULT WINAPI SHCreateStreamOnFileW(const WCHAR *path, DWORD mode, IStream **stream) { - TRACE("(%s, %#x, %p)\n", debugstr_w(path), mode, stream); + TRACE("%s, %#lx, %p.\n", debugstr_w(path), mode, stream); if (!path || !stream) return E_INVALIDARG; @@ -1200,7 +1196,7 @@ HRESULT WINAPI SHCreateStreamOnFileA(const char *path, DWORD mode, IStream **str HRESULT hr; DWORD len; - TRACE("(%s, %#x, %p)\n", debugstr_a(path), mode, stream); + TRACE("%s, %#lx, %p.\n", debugstr_a(path), mode, stream); if (!path) return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); @@ -1222,7 +1218,7 @@ static ULONG WINAPI regstream_Release(IStream *iface) struct shstream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE("(%p)->(%u)\n", stream, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1272,7 +1268,7 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, const WCHAR *subkey, const WCHAR * DWORD length = 0; LONG ret; - TRACE("(%p, %s, %s, %#x)\n", hKey, debugstr_w(subkey), debugstr_w(value), mode); + TRACE("%p, %s, %s, %#lx.\n", hKey, debugstr_w(subkey), debugstr_w(value), mode); if (mode == STGM_READ) ret = RegOpenKeyExW(hKey, subkey, 0, KEY_READ, &hStrKey); @@ -1319,7 +1315,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, const char *subkey, const char *va WCHAR *subkeyW = NULL, *valueW = NULL; IStream *stream; - TRACE("(%p, %s, %s, %#x)\n", hKey, debugstr_a(subkey), debugstr_a(value), mode); + TRACE("%p, %s, %s, %#lx.\n", hKey, debugstr_a(subkey), debugstr_a(value), mode); if (subkey && FAILED(SHStrDupA(subkey, &subkeyW))) return NULL; @@ -1343,7 +1339,7 @@ IStream * WINAPI SHOpenRegStreamA(HKEY hkey, const char *subkey, const char *val WCHAR *subkeyW = NULL, *valueW = NULL; IStream *stream; - TRACE("(%p, %s, %s, %#x)\n", hkey, debugstr_a(subkey), debugstr_a(value), mode); + TRACE("%p, %s, %s, %#lx.\n", hkey, debugstr_a(subkey), debugstr_a(value), mode); if (subkey && FAILED(SHStrDupA(subkey, &subkeyW))) return NULL; @@ -1406,7 +1402,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, const WCHAR *subkey, const WCHAR *v { IStream *stream; - TRACE("(%p, %s, %s, %#x)\n", hkey, debugstr_w(subkey), debugstr_w(value), mode); + TRACE("%p, %s, %s, %#lx.\n", hkey, debugstr_w(subkey), debugstr_w(value), mode); stream = SHOpenRegStream2W(hkey, subkey, value, mode); return stream ? stream : &dummyregstream.IStream_iface; } @@ -1448,7 +1444,7 @@ static ULONG WINAPI threadref_AddRef(IUnknown *iface) struct threadref *threadref = threadref_impl_from_IUnknown(iface); LONG refcount = InterlockedIncrement(threadref->refcount); - TRACE("(%p, %d)\n", threadref, refcount); + TRACE("%p, refcount %ld.\n", threadref, refcount); return refcount; } @@ -1458,7 +1454,7 @@ static ULONG WINAPI threadref_Release(IUnknown *iface) struct threadref *threadref = threadref_impl_from_IUnknown(iface); LONG refcount = InterlockedDecrement(threadref->refcount); - TRACE("(%p, %d)\n", threadref, refcount); + TRACE("%p, refcount %ld.\n", threadref, refcount); if (!refcount) heap_free(threadref); @@ -1631,7 +1627,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE thread_proc, void *data, DWORD struct thread_data thread_data; BOOL called = FALSE; - TRACE("(%p, %p, %#x, %p)\n", thread_proc, data, flags, callback); + TRACE("%p, %p, %#lx, %p.\n", thread_proc, data, flags, callback); thread_data.thread_proc = thread_proc; thread_data.callback = callback; @@ -1953,7 +1949,7 @@ DWORD WINAPI SHCopyKeyA(HKEY hkey_src, const char *subkey, HKEY hkey_dst, DWORD WCHAR *subkeyW = NULL; DWORD ret; - TRACE("(%p, %s, %p, %d)\n", hkey_src, debugstr_a(subkey), hkey_dst, reserved); + TRACE("%p, %s, %p, %ld.\n", hkey_src, debugstr_a(subkey), hkey_dst, reserved); if (subkey && FAILED(SHStrDupA(subkey, &subkeyW))) return 0; @@ -1974,7 +1970,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hkey_src, const WCHAR *subkey, HKEY hkey_dst, DWORD DWORD max_data_len = 0, i; DWORD ret = 0; - TRACE("(%p, %s, %p, %d)\n", hkey_src, debugstr_w(subkey), hkey_dst, reserved); + TRACE("%p, %s, %p, %ld.\n", hkey_src, debugstr_w(subkey), hkey_dst, reserved); if (!hkey_dst || !hkey_src) return ERROR_INVALID_PARAMETER; @@ -2059,7 +2055,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hkey_src, const WCHAR *subkey, HKEY hkey_dst, DWORD */ LONG WINAPI SHEnumKeyExA(HKEY hkey, DWORD index, char *subkey, DWORD *length) { - TRACE("(%p, %d, %s, %p)\n", hkey, index, debugstr_a(subkey), length); + TRACE("%p, %ld, %s, %p.\n", hkey, index, debugstr_a(subkey), length); return RegEnumKeyExA(hkey, index, subkey, length, NULL, NULL, NULL, NULL); } @@ -2069,7 +2065,7 @@ LONG WINAPI SHEnumKeyExA(HKEY hkey, DWORD index, char *subkey, DWORD *length) */ LONG WINAPI SHEnumKeyExW(HKEY hkey, DWORD index, WCHAR *subkey, DWORD *length) { - TRACE("(%p, %d, %s, %p)\n", hkey, index, debugstr_w(subkey), length); + TRACE("%p, %ld, %s, %p.\n", hkey, index, debugstr_w(subkey), length); return RegEnumKeyExW(hkey, index, subkey, length, NULL, NULL, NULL, NULL); } @@ -2080,7 +2076,7 @@ LONG WINAPI SHEnumKeyExW(HKEY hkey, DWORD index, WCHAR *subkey, DWORD *length) LONG WINAPI SHEnumValueA(HKEY hkey, DWORD index, char *value, DWORD *length, DWORD *type, void *data, DWORD *data_len) { - TRACE("(%p, %d, %s, %p, %p, %p, %p)\n", hkey, index, debugstr_a(value), length, type, data, data_len); + TRACE("%p, %ld, %s, %p, %p, %p, %p.\n", hkey, index, debugstr_a(value), length, type, data, data_len); return RegEnumValueA(hkey, index, value, length, NULL, type, data, data_len); } @@ -2091,7 +2087,7 @@ LONG WINAPI SHEnumValueA(HKEY hkey, DWORD index, char *value, DWORD *length, DWO LONG WINAPI SHEnumValueW(HKEY hkey, DWORD index, WCHAR *value, DWORD *length, DWORD *type, void *data, DWORD *data_len) { - TRACE("(%p, %d, %s, %p, %p, %p, %p)\n", hkey, index, debugstr_w(value), length, type, data, data_len); + TRACE("%p, %ld, %s, %p, %p, %p, %p.\n", hkey, index, debugstr_w(value), length, type, data, data_len); return RegEnumValueW(hkey, index, value, length, NULL, type, data, data_len); } @@ -2270,7 +2266,7 @@ DWORD WINAPI SHRegGetPathA(HKEY hkey, const char *subkey, const char *value, cha { DWORD length = MAX_PATH; - TRACE("(%p, %s, %s, %p, %#x)\n", hkey, debugstr_a(subkey), debugstr_a(value), path, flags); + TRACE("%p, %s, %s, %p, %#lx.\n", hkey, debugstr_a(subkey), debugstr_a(value), path, flags); return SHGetValueA(hkey, subkey, value, 0, path, &length); } @@ -2282,7 +2278,7 @@ DWORD WINAPI SHRegGetPathW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, W { DWORD length = MAX_PATH; - TRACE("(%p, %s, %s, %p, %d)\n", hkey, debugstr_w(subkey), debugstr_w(value), path, flags); + TRACE("%p, %s, %s, %p, %#lx.\n", hkey, debugstr_w(subkey), debugstr_w(value), path, flags); return SHGetValueW(hkey, subkey, value, 0, path, &length); } @@ -2296,7 +2292,7 @@ DWORD WINAPI SHSetValueW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, DWO DWORD ret = ERROR_SUCCESS, dummy; HKEY hsubkey; - TRACE("(%p, %s, %s, %d, %p, %d)\n", hkey, debugstr_w(subkey), debugstr_w(value), + TRACE("%p, %s, %s, %ld, %p, %ld.\n", hkey, debugstr_w(subkey), debugstr_w(value), type, data, data_len); if (subkey && *subkey) @@ -2323,7 +2319,7 @@ DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, DWORD ret = ERROR_SUCCESS, dummy; HKEY hsubkey; - TRACE("(%p, %s, %s, %d, %p, %d)\n", hkey, debugstr_a(subkey), debugstr_a(value), + TRACE("%p, %s, %s, %ld, %p, %ld.\n", hkey, debugstr_a(subkey), debugstr_a(value), type, data, data_len); if (subkey && *subkey) @@ -2346,7 +2342,7 @@ DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, */ DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) { - FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + FIXME("%p, %s, %s, %s, %#lx - semi-stub\n", hkey, debugstr_a(subkey), debugstr_a(value), debugstr_a(path), flags); /* FIXME: PathUnExpandEnvStringsA() */ @@ -2359,7 +2355,7 @@ DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, con */ DWORD WINAPI SHRegSetPathW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, const WCHAR *path, DWORD flags) { - FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_w(subkey), + FIXME("%p, %s, %s, %s, %#lx semi-stub\n", hkey, debugstr_w(subkey), debugstr_w(value), debugstr_w(path), flags); /* FIXME: PathUnExpandEnvStringsW(); */ @@ -2404,7 +2400,7 @@ BOOL WINAPI IsOS(DWORD feature) platform = osvi.dwPlatformId; #define ISOS_RETURN(x) \ - TRACE("(0x%x) ret=%d\n",feature,(x)); \ + TRACE("(%#lx) ret %d\n",feature,(x)); \ return (x) switch(feature) { @@ -2502,7 +2498,7 @@ BOOL WINAPI IsOS(DWORD feature) #undef ISOS_RETURN - WARN("(0x%x) unknown parameter\n", feature); + WARN("(%#lx) unknown parameter\n", feature); return FALSE; } -- 2.34.1

1 0

[PATCH] scrrun/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/tests/Makefile.in | 1 - dlls/scrrun/tests/dictionary.c | 320 +++++++------- dlls/scrrun/tests/filesystem.c | 750 +++++++++++++++++---------------- 3 files changed, 529 insertions(+), 542 deletions(-) diff --git a/dlls/scrrun/tests/Makefile.in b/dlls/scrrun/tests/Makefile.in index 88f08303eee..e9eccb686d2 100644 --- a/dlls/scrrun/tests/Makefile.in +++ b/dlls/scrrun/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = scrrun.dll IMPORTS = ole32 shlwapi uuid oleaut32 user32 diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index d20456a5096..16a195955ac 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -40,13 +40,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); - ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#lx.\n", hr); hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); - ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#lx.\n", hr); hr = ITypeInfo_GetTypeAttr(ti, &attr); - ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#lx.\n", hr); ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); @@ -74,19 +74,19 @@ static void test_interfaces(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&key); VariantInit(&value); hr = IDispatch_QueryInterface(disp, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); - ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(disp, &CLSID_Dictionary); @@ -95,12 +95,12 @@ static void test_interfaces(void) V_VT(&value) = VT_BSTR; V_BSTR(&value) = SysAllocString(L"a"); hr = IDictionary_Add(dict, &key, &value); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantClear(&value); exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(exists == VARIANT_TRUE, "Expected TRUE but got FALSE.\n"); VariantClear(&key); @@ -108,13 +108,13 @@ static void test_interfaces(void) V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(L"b"); hr = IDictionary_Exists(dict, &key, &exists); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(exists == VARIANT_FALSE, "Expected FALSE but got TRUE.\n"); VariantClear(&key); hr = IDictionary_get_Count(dict, &count); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - ok(count == 1, "got %d, expected 1\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 1, "Unexpected value %lu.\n", count); IDictionary_Release(dict); IDispatch_Release(disp); @@ -129,29 +129,29 @@ static void test_comparemode(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (0) /* crashes on native */ hr = IDictionary_get_CompareMode(dict, NULL); method = 10; hr = IDictionary_get_CompareMode(dict, &method); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(method == BinaryCompare, "got %d\n", method); /* invalid mode value is not checked */ hr = IDictionary_put_CompareMode(dict, 10); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_get_CompareMode(dict, &method); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(method == 10, "got %d\n", method); hr = IDictionary_put_CompareMode(dict, DatabaseCompare); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_get_CompareMode(dict, &method); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(method == DatabaseCompare, "got %d\n", method); /* try to change mode of a non-empty dict */ @@ -159,10 +159,10 @@ static void test_comparemode(void) V_I2(&key) = 0; VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_put_CompareMode(dict, BinaryCompare); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "Unexpected hr %#lx.\n", hr); IDictionary_Release(dict); } @@ -356,58 +356,56 @@ static void test_hash_value(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_BSTR; V_BSTR(&key) = NULL; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == 0, "got %d\n", V_I4(&hash)); + ok(!V_I4(&hash), "Unexpected hash %#lx.\n", V_I4(&hash)); - for (i = 0; i < ARRAY_SIZE(str_hash_tests); i++) { + for (i = 0; i < ARRAY_SIZE(str_hash_tests); ++i) + { expected = get_str_hash(str_hash_tests[i], BinaryCompare); hr = IDictionary_put_CompareMode(dict, BinaryCompare); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(str_hash_tests[i]); VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: binary mode: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: db mode: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); VariantClear(&key); expected = get_str_hash(str_hash_tests[i], TextCompare); hr = IDictionary_put_CompareMode(dict, TextCompare); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(str_hash_tests[i]); VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: text mode: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: db mode: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); VariantClear(&key); expected = get_str_hash(str_hash_tests[i], DatabaseCompare); hr = IDictionary_put_CompareMode(dict, DatabaseCompare); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(str_hash_tests[i]); VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: db mode: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: db mode: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); VariantClear(&key); } @@ -415,49 +413,49 @@ static void test_hash_value(void) V_INT(&key) = 1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + ok(V_I4(&hash) == ~0u, "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_UINT; V_UINT(&key) = 1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + ok(V_I4(&hash) == ~0u, "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_I1; V_I1(&key) = 1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0xa1), "got hash 0x%08x\n", V_I4(&hash)); + ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0xa1), "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_I8; V_I8(&key) = 1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + ok(V_I4(&hash) == ~0u, "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_UI2; V_UI2(&key) = 1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + ok(V_I4(&hash) == ~0u, "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_UI4; V_UI4(&key) = 1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + ok(V_I4(&hash) == ~0u, "Unexpected hash %#lx.\n", V_I4(&hash)); for (i = 0; i < ARRAY_SIZE(int_hash_tests); i++) { SHORT i2; @@ -470,59 +468,53 @@ static void test_hash_value(void) V_I2(&key) = int_hash_tests[i]; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); i2 = int_hash_tests[i]; V_VT(&key) = VT_I2|VT_BYREF; V_I2REF(&key) = &i2; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); V_VT(&key) = VT_I4; V_I4(&key) = int_hash_tests[i]; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); i4 = int_hash_tests[i]; V_VT(&key) = VT_I4|VT_BYREF; V_I4REF(&key) = &i4; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); expected = get_num_hash((FLOAT)(BYTE)int_hash_tests[i]); V_VT(&key) = VT_UI1; V_UI1(&key) = int_hash_tests[i]; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); ui1 = int_hash_tests[i]; V_VT(&key) = VT_UI1|VT_BYREF; V_UI1REF(&key) = &ui1; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); } /* nan */ @@ -533,10 +525,10 @@ static void test_hash_value(void) V_R4(&key) = fx4.f; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || - V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "Unexpected hr %#lx.\n", V_I4(&hash)); /* inf */ fx4.f = 10.0; @@ -547,9 +539,9 @@ static void test_hash_value(void) V_R4(&key) = fx4.f; V_I4(&hash) = 10; hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + ok(!V_I4(&hash), "Unexpected hash %#lx.\n", V_I4(&hash)); /* nan */ fx8.d = 10.0; @@ -559,19 +551,19 @@ static void test_hash_value(void) V_R8(&key) = fx8.d; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || - V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_DATE; V_DATE(&key) = fx8.d; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || - V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "Unexpected hash %#lx.\n", V_I4(&hash)); /* inf */ fx8.d = 10.0; @@ -583,17 +575,17 @@ static void test_hash_value(void) V_R8(&key) = fx8.d; V_I4(&hash) = 10; hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + ok(!V_I4(&hash), "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_DATE; V_DATE(&key) = fx8.d; V_I4(&hash) = 10; hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + ok(!V_I4(&hash), "Unexpected hash %#lx.\n", V_I4(&hash)); for (i = 0; i < ARRAY_SIZE(float_hash_tests); i++) { double dbl; @@ -606,58 +598,52 @@ static void test_hash_value(void) V_R4(&key) = float_hash_tests[i]; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); flt = float_hash_tests[i]; V_VT(&key) = VT_R4|VT_BYREF; V_R4REF(&key) = &flt; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); V_VT(&key) = VT_R8; V_R8(&key) = float_hash_tests[i]; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); dbl = float_hash_tests[i]; V_VT(&key) = VT_R8|VT_BYREF; V_R8REF(&key) = &dbl; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); V_VT(&key) = VT_DATE; V_DATE(&key) = float_hash_tests[i]; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); V_VT(&key) = VT_DATE|VT_BYREF; date = float_hash_tests[i]; V_DATEREF(&key) = &date; VariantInit(&hash); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), - expected); + ok(V_I4(&hash) == expected, "%d: got hash %#lx, expected %#lx.\n", i, V_I4(&hash), expected); } /* interface pointers as keys */ @@ -666,9 +652,9 @@ static void test_hash_value(void) VariantInit(&hash); V_I4(&hash) = 1; hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == 0, "got hash 0x%08x, expected 0\n", V_I4(&hash)); + ok(!V_I4(&hash), "Unexpected hash %#lx.\n", V_I4(&hash)); /* QI doesn't work */ V_VT(&key) = VT_UNKNOWN; @@ -676,18 +662,18 @@ static void test_hash_value(void) VariantInit(&hash); expected = get_ptr_hash(&test_unk2); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k */, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == ~0u, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == ~0u, "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_UNKNOWN; V_UNKNOWN(&key) = &test_unk; VariantInit(&hash); expected = get_ptr_hash(&test_unk); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); /* interface without IDispatch support */ V_VT(&key) = VT_DISPATCH; @@ -695,18 +681,18 @@ static void test_hash_value(void) VariantInit(&hash); expected = get_ptr_hash(&test_unk); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); V_VT(&key) = VT_DISPATCH; V_DISPATCH(&key) = &test_disp; VariantInit(&hash); expected = get_ptr_hash(&test_disp); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); /* same with BYREF */ if (0) { /* crashes on native */ @@ -720,9 +706,9 @@ if (0) { /* crashes on native */ VariantInit(&hash); V_I4(&hash) = 1; hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == 0, "got hash 0x%08x, expected 0\n", V_I4(&hash)); + ok(!V_I4(&hash), "Unexpected hash %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_UNKNOWN|VT_BYREF; unk = &test_unk; @@ -730,9 +716,9 @@ if (0) { /* crashes on native */ VariantInit(&hash); expected = get_ptr_hash(&test_unk); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); /* interface without IDispatch support */ V_VT(&key) = VT_DISPATCH|VT_BYREF; @@ -741,9 +727,9 @@ if (0) { /* crashes on native */ VariantInit(&hash); expected = get_ptr_hash(&test_unk); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); V_VT(&key) = VT_DISPATCH|VT_BYREF; disp = &test_disp; @@ -751,9 +737,9 @@ if (0) { /* crashes on native */ VariantInit(&hash); expected = get_ptr_hash(&test_disp); hr = IDictionary_get_HashVal(dict, &key, &hash); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); - ok(V_I4(&hash) == expected, "got hash 0x%08x, expected 0x%08x\n", V_I4(&hash), expected); + ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); IDictionary_Release(dict); } @@ -767,7 +753,7 @@ static void test_Exists(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (0) /* crashes on native */ hr = IDictionary_Exists(dict, NULL, NULL); @@ -775,34 +761,34 @@ static void test_Exists(void) V_VT(&key) = VT_I2; V_I2(&key) = 0; hr = IDictionary_Exists(dict, &key, NULL); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; exists = VARIANT_TRUE; hr = IDictionary_Exists(dict, &key, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(exists == VARIANT_FALSE, "got %x\n", exists); VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_R4; V_R4(&key) = 0.0; hr = IDictionary_Add(dict, &key, &item); - ok(hr == CTL_E_KEY_ALREADY_EXISTS, "got 0x%08x\n", hr); + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; hr = IDictionary_Exists(dict, &key, NULL); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(exists == VARIANT_TRUE, "got %x\n", exists); /* key of different type, but resolves to same hash value */ @@ -810,7 +796,7 @@ static void test_Exists(void) V_R4(&key) = 0.0; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(exists == VARIANT_TRUE, "got %x\n", exists); IDictionary_Release(dict); @@ -825,14 +811,14 @@ static void test_Keys(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_Keys(dict, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&keys); hr = IDictionary_Keys(dict, &keys); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); VariantClear(&keys); @@ -840,25 +826,25 @@ static void test_Keys(void) V_R4(&key) = 0.0; VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&keys); hr = IDictionary_Keys(dict, &keys); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); VariantInit(&key); index = 0; hr = SafeArrayGetElement(V_ARRAY(&keys), &index, &key); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&key) == VT_R4, "got %d\n", V_VT(&key)); index = SafeArrayGetDim(V_ARRAY(&keys)); - ok(index == 1, "got %d\n", index); + ok(index == 1, "Unexpected value %ld.\n", index); hr = SafeArrayGetUBound(V_ARRAY(&keys), 1, &index); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(index == 0, "got %d\n", index); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index == 0, "Unexpected value %ld.\n", index); VariantClear(&keys); @@ -873,7 +859,7 @@ static void test_Remove(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (0) hr = IDictionary_Remove(dict, NULL); @@ -882,14 +868,14 @@ static void test_Remove(void) V_VT(&key) = VT_R4; V_R4(&key) = 0.0; hr = IDictionary_Remove(dict, &key); - ok(hr == CTL_E_ELEMENT_NOT_FOUND, "got 0x%08x\n", hr); + ok(hr == CTL_E_ELEMENT_NOT_FOUND, "Unexpected hr %#lx.\n", hr); VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_Remove(dict, &key); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDictionary_Release(dict); } @@ -902,21 +888,21 @@ static void test_Item(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 10; V_VT(&item) = VT_I2; V_I2(&item) = 123; hr = IDictionary_get_Item(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&item) == VT_EMPTY, "got %d\n", V_VT(&item)); V_VT(&key) = VT_I2; V_I2(&key) = 10; V_VT(&item) = VT_I2; hr = IDictionary_get_Item(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&item) == VT_EMPTY, "got %d\n", V_VT(&item)); IDictionary_Release(dict); @@ -931,7 +917,7 @@ static void test_Add(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"testW"); V_VT(&key) = VT_I2; @@ -939,10 +925,10 @@ static void test_Add(void) V_VT(&item) = VT_BSTR|VT_BYREF; V_BSTRREF(&item) = &str; hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_get_Item(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); SysFreeString(str); @@ -961,107 +947,107 @@ static void test_IEnumVARIANT(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDictionary, (void**)&dict); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (0) /* crashes on native */ hr = IDictionary__NewEnum(dict, NULL); hr = IDictionary__NewEnum(dict, &enum1); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary__NewEnum(dict, &enum2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(enum1 != enum2, "got %p, %p\n", enum2, enum1); IUnknown_Release(enum2); hr = IUnknown_QueryInterface(enum1, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(enum1); /* dictionary is empty */ hr = IEnumVARIANT_Skip(enumvar, 1); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 1; V_VT(&item) = VT_I4; V_I4(&item) = 100; hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 4000; V_VT(&item) = VT_I4; V_I4(&item) = 200; hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; V_VT(&item) = VT_I4; V_I4(&item) = 300; hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&key); hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&key) == VT_I2, "got %d\n", V_VT(&key)); ok(V_I2(&key) == 1, "got %d\n", V_I2(&key)); - ok(fetched == 1, "got %u\n", fetched); + ok(fetched == 1, "Unexpected value %lu.\n", fetched); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDictionary_Remove(dict, &key); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&key); hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&key) == VT_I2, "got %d\n", V_VT(&key)); ok(V_I2(&key) == 4000, "got %d\n", V_I2(&key)); - ok(fetched == 1, "got %u\n", fetched); + ok(fetched == 1, "Unexpected value %lu.\n", fetched); VariantInit(&key); hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&key) == VT_I2, "got %d\n", V_VT(&key)); ok(V_I2(&key) == 0, "got %d\n", V_I2(&key)); - ok(fetched == 1, "got %u\n", fetched); + ok(fetched == 1, "Unexpected value %lu.\n", fetched); /* enumeration reached the bottom, add one more pair */ VariantInit(&key); hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 13; V_VT(&item) = VT_I4; V_I4(&item) = 350; hr = IDictionary_Add(dict, &key, &item); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* still doesn't work until Reset() */ VariantInit(&key); hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); IEnumVARIANT_Release(enumvar); IDictionary_Release(dict); @@ -1077,7 +1063,7 @@ START_TEST(dictionary) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); if(FAILED(hr)) { - win_skip("Dictionary object is not supported: %08x\n", hr); + win_skip("Dictionary object is not supported: hr %#lx.\n", hr); CoUninitialize(); return; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 24b52384aa5..098060a90bb 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -69,10 +69,10 @@ static IDrive *get_fixed_drive(void) HRESULT hr; hr = IFileSystem3_get_Drives(fs3, &drives); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDriveCollection_Release(drives); while (1) { @@ -84,14 +84,14 @@ static IDrive *get_fixed_drive(void) drive = NULL; break; } - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantClear(&var); hr = IDrive_get_DriveType(drive, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (type == Fixed) break; @@ -112,13 +112,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); - ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#lx.\n", hr); hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); - ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#lx.\n", hr); hr = ITypeInfo_GetTypeAttr(ti, &attr); - ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#lx.\n", hr); ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); @@ -153,59 +153,59 @@ static void test_interfaces(void) test_provideclassinfo(disp, &CLSID_FileSystemObject); hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); - ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); b = VARIANT_TRUE; hr = IFileSystem3_FileExists(fs3, NULL, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE, "got %x\n", b); hr = IFileSystem3_FileExists(fs3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); path = SysAllocString(L"path"); b = VARIANT_TRUE; hr = IFileSystem3_FileExists(fs3, path, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE, "got %x\n", b); SysFreeString(path); path = SysAllocString(file_path); b = VARIANT_FALSE; hr = IFileSystem3_FileExists(fs3, path, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_TRUE, "got %x\n", b); SysFreeString(path); path = SysAllocString(windows_path); b = VARIANT_TRUE; hr = IFileSystem3_FileExists(fs3, path, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE, "got %x\n", b); SysFreeString(path); /* Folder Exists */ hr = IFileSystem3_FolderExists(fs3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); path = SysAllocString(windows_path); hr = IFileSystem3_FolderExists(fs3, path, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_TRUE, "Folder doesn't exists\n"); SysFreeString(path); path = SysAllocString(L"c:\\Nonexistent"); hr = IFileSystem3_FolderExists(fs3, path, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE, "Folder exists\n"); SysFreeString(path); path = SysAllocString(file_path); hr = IFileSystem3_FolderExists(fs3, path, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE, "Folder exists\n"); SysFreeString(path); @@ -222,13 +222,13 @@ static void test_createfolder(void) get_temp_path(NULL, buffW); ret = CreateDirectoryW(buffW, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); /* create existing directory */ path = SysAllocString(buffW); folder = (void*)0xdeabeef; hr = IFileSystem3_CreateFolder(fs3, path, &folder); - ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); ok(folder == NULL, "got %p\n", folder); SysFreeString(path); RemoveDirectoryW(buffW); @@ -250,98 +250,98 @@ static void test_textstream(void) name = SysAllocString(testfileW); b = VARIANT_FALSE; hr = IFileSystem3_FileExists(fs3, name, &b); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_TRUE, "got %x\n", b); /* different mode combinations */ hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting | ForAppending, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_OpenTextFile(fs3, name, ForReading | ForAppending, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting | ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, 1, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, 1, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* try to write when open for reading */ hr = ITextStream_WriteLine(stream, name); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Write(stream, name); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_get_AtEndOfStream(stream, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); - ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE), "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_TRUE, "got 0x%x\n", b); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); b = 10; hr = ITextStream_get_AtEndOfLine(stream, &b); todo_wine { - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE || broken(b == 10), "got 0x%x\n", b); } hr = ITextStream_Read(stream, 1, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_ReadLine(stream, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_ReadAll(stream, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); b = 10; hr = ITextStream_get_AtEndOfLine(stream, &b); todo_wine { - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE || broken(b == 10), "got 0x%x\n", b); } hr = ITextStream_Read(stream, 1, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_ReadLine(stream, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_ReadAll(stream, &data); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); @@ -352,10 +352,10 @@ todo_wine { CloseHandle(file); hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(b == VARIANT_FALSE, "got 0x%x\n", b); ITextStream_Release(stream); @@ -376,7 +376,7 @@ static void test_GetFileVersion(void) path = SysAllocString(filenameW); hr = IFileSystem3_GetFileVersion(fs3, path, &version); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*version != 0, "got %s\n", wine_dbgstr_w(version)); SysFreeString(version); SysFreeString(path); @@ -387,7 +387,7 @@ static void test_GetFileVersion(void) path = SysAllocString(filenameW); version = (void*)0xdeadbeef; hr = IFileSystem3_GetFileVersion(fs3, path, &version); - ok(broken(hr == S_OK) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(broken(hr == S_OK) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { ok(*version == 0, "got %s\n", wine_dbgstr_w(version)); @@ -421,13 +421,13 @@ static void test_GetParentFolderName(void) int i; hr = IFileSystem3_GetParentFolderName(fs3, NULL, NULL); - ok(hr == E_POINTER, "GetParentFolderName returned %x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetParentFolderName(fs3, path, &result); - ok(hr == S_OK, "%d) GetParentFolderName returned %x, expected S_OK\n", i, hr); + ok(hr == S_OK, "%d: unexpected hr %#lx.\n", i, hr); if(!tests[i].result) ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); else @@ -458,13 +458,13 @@ static void test_GetFileName(void) int i; hr = IFileSystem3_GetFileName(fs3, NULL, NULL); - ok(hr == E_POINTER, "GetFileName returned %x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetFileName(fs3, path, &result); - ok(hr == S_OK, "%d) GetFileName returned %x, expected S_OK\n", i, hr); + ok(hr == S_OK, "%d: unexpected hr %#lx.\n", i, hr); if(!tests[i].result) ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); else @@ -480,10 +480,10 @@ static void test_GetTempName(void) HRESULT hr; hr = IFileSystem3_GetTempName(fs3, NULL); - ok(hr == E_POINTER, "GetTempName returned %x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); result = (BSTR)0xdeadbeef; hr = IFileSystem3_GetTempName(fs3, &result); - ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); SysFreeString(result); } @@ -511,13 +511,13 @@ static void test_GetBaseName(void) int i; hr = IFileSystem3_GetBaseName(fs3, NULL, NULL); - ok(hr == E_POINTER, "GetBaseName returned %x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetBaseName(fs3, path, &result); - ok(hr == S_OK, "%d) GetBaseName returned %x, expected S_OK\n", i, hr); + ok(hr == S_OK, "%d, unexpected hr %#lx.\n", i, hr); if(!tests[i].result) ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); else @@ -541,10 +541,10 @@ static void test_GetAbsolutePathName(void) HRESULT hr; hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, NULL); - ok(hr == E_POINTER, "GetAbsolutePathName returned %x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, &result); - ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); GetFullPathNameW(L".", MAX_PATH, buf, NULL); ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); @@ -558,14 +558,14 @@ static void test_GetAbsolutePathName(void) path = SysAllocString(dir_match1); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); - ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); GetFullPathNameW(dir_match1, MAX_PATH, buf2, NULL); ok(!lstrcmpiW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); SysFreeString(result); ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); - ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); GetFullPathNameW(dir1, MAX_PATH, buf, NULL); ok(!lstrcmpiW(buf, result) || broken(!lstrcmpiW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); @@ -573,7 +573,7 @@ static void test_GetAbsolutePathName(void) ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); - ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if(!lstrcmpiW(buf, result) || !lstrcmpiW(buf2, result)) { ok(!lstrcmpiW(buf, result) || broken(!lstrcmpiW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); @@ -587,7 +587,7 @@ static void test_GetAbsolutePathName(void) SysFreeString(path); path = SysAllocString(dir_match2); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); - ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); GetFullPathNameW(dir_match2, MAX_PATH, buf, NULL); ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); @@ -614,14 +614,14 @@ static void test_GetFile(void) path = SysAllocString(pathW); hr = IFileSystem3_GetFile(fs3, path, NULL); - ok(hr == E_POINTER, "GetFile returned %x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_GetFile(fs3, NULL, &file); - ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); file = (IFile*)0xdeadbeef; hr = IFileSystem3_GetFile(fs3, path, &file); ok(!file, "file != NULL\n"); - ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); if(hf == INVALID_HANDLE_VALUE) { @@ -632,21 +632,21 @@ static void test_GetFile(void) CloseHandle(hf); hr = IFileSystem3_GetFile(fs3, path, &file); - ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFile_get_DateLastModified(file, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); date = 0.0; hr = IFile_get_DateLastModified(file, &date); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(date > 0.0, "got %f\n", date); hr = IFile_get_Path(file, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFile_get_Path(file, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpiW(str, pathW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -656,53 +656,52 @@ static void test_GetFile(void) hr = IFile_get_Attributes(file, &fa); gfa = GetFileAttributesW(pathW) & FILE_ATTR_MASK; - ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); - ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(fa == gfa, "Unexpected flags %#x, expected %lx.\n", fa, gfa); hr = IFile_put_Attributes(file, gfa | FILE_ATTRIBUTE_READONLY); - ok(hr == S_OK, "put_Attributes failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); new_gfa = GetFileAttributesW(pathW) & FILE_ATTR_MASK; - ok(new_gfa == (gfa|FILE_ATTRIBUTE_READONLY), "new_gfa = %x, expected %x\n", new_gfa, gfa|FILE_ATTRIBUTE_READONLY); + ok(new_gfa == (gfa|FILE_ATTRIBUTE_READONLY), "Unexpected flags %#lx, expected %lx\n", new_gfa, gfa|FILE_ATTRIBUTE_READONLY); hr = IFile_get_Attributes(file, &fa); - ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); - ok(fa == new_gfa, "fa = %x, expected %x\n", fa, new_gfa); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(fa == new_gfa, "Unexpected flags %#x, expected %lx.\n", fa, new_gfa); hr = IFile_put_Attributes(file, gfa); - ok(hr == S_OK, "put_Attributes failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); new_gfa = GetFileAttributesW(pathW) & FILE_ATTR_MASK; - ok(new_gfa == gfa, "new_gfa = %x, expected %x\n", new_gfa, gfa); + ok(new_gfa == gfa, "Unexpected flags %#lx, expected %lx.\n", new_gfa, gfa); hr = IFile_get_Attributes(file, &fa); - ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); - ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(fa == gfa, "Unexpected flags %#x, expected %lx.\n", fa, gfa); hr = IFile_get_Size(file, &size); - ok(hr == S_OK, "get_Size returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&size) == VT_I4, "V_VT(&size) = %d, expected VT_I4\n", V_VT(&size)); - ok(V_I4(&size) == 0, "V_I4(&size) = %d, expected 0\n", V_I4(&size)); + ok(V_I4(&size) == 0, "V_I4(&size) = %ld, expected 0\n", V_I4(&size)); IFile_Release(file); hr = IFileSystem3_DeleteFile(fs3, path, FALSE); - ok(hr==CTL_E_PERMISSIONDENIED || broken(hr==S_OK), - "DeleteFile returned %x, expected CTL_E_PERMISSIONDENIED\n", hr); + ok(hr == CTL_E_PERMISSIONDENIED || broken(hr == S_OK), "Unexpected hr %#lx.\n", hr); if(hr != S_OK) { hr = IFileSystem3_DeleteFile(fs3, path, TRUE); - ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } hr = IFileSystem3_DeleteFile(fs3, path, TRUE); - ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); SysFreeString(path); /* try with directory */ lstrcatW(pathW, L"\\"); ret = CreateDirectoryW(pathW, NULL); - ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); path = SysAllocString(pathW); hr = IFileSystem3_GetFile(fs3, path, &file); - ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected S_OK\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); SysFreeString(path); RemoveDirectoryW(pathW); @@ -743,36 +742,36 @@ static void test_CopyFolder(void) create_path(filesystem3_dir, dstW, tmp); bdst = SysAllocString(tmp); hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); ok(create_file(bsrc), "can't create %s file\n", wine_dbgstr_w(bsrc)); hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == S_OK, "CopyFile returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_DeleteFile(fs3, bsrc, VARIANT_FALSE); - ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(CreateDirectoryW(bsrc, NULL), "can't create %s\n", wine_dbgstr_w(bsrc)); hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == CTL_E_FILEALREADYEXISTS, "CopyFolder returned %x, expected CTL_E_FILEALREADYEXISTS\n", hr); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_DeleteFile(fs3, bdst, VARIANT_TRUE); - ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); create_path(tmp, src1W, tmp); ok(GetFileAttributesW(tmp) == INVALID_FILE_ATTRIBUTES, "%s file exists\n", wine_dbgstr_w(tmp)); @@ -782,7 +781,7 @@ static void test_CopyFolder(void) SysFreeString(bdst); bdst = SysAllocString(tmp); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); create_path(tmp, src1W, tmp); ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); @@ -795,17 +794,17 @@ static void test_CopyFolder(void) SysFreeString(bsrc); bsrc = SysAllocString(tmp); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); create_path(filesystem3_dir, dstW, tmp); create_path(tmp, src1W, tmp); ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); hr = IFileSystem3_DeleteFolder(fs3, bdst, VARIANT_FALSE); - ok(hr == S_OK, "DeleteFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); create_path(filesystem3_dir, src1W, tmp); SysFreeString(bsrc); @@ -813,19 +812,19 @@ static void test_CopyFolder(void) create_path(tmp, src1W, tmp); ok(create_file(tmp), "can't create %s file\n", wine_dbgstr_w(tmp)); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); - ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); - ok(hr == CTL_E_FILEALREADYEXISTS, "CopyFolder returned %x, expected CTL_E_FILEALREADYEXISTS\n", hr); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); - ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(bsrc); SysFreeString(bdst); bsrc = SysAllocString(filesystem3_dir); hr = IFileSystem3_DeleteFolder(fs3, bsrc, VARIANT_FALSE); - ok(hr == S_OK, "DeleteFolder returned %x, expected S_OK\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(bsrc); } @@ -868,18 +867,18 @@ static void test_BuildPath(void) int i = 0; hr = IFileSystem3_BuildPath(fs3, NULL, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ret = (BSTR)0xdeadbeef; hr = IFileSystem3_BuildPath(fs3, NULL, NULL, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*ret == 0, "got %p\n", ret); SysFreeString(ret); ret = (BSTR)0xdeadbeef; path = bstr_from_str("path"); hr = IFileSystem3_BuildPath(fs3, path, NULL, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(ret, path), "got %s\n", wine_dbgstr_w(ret)); SysFreeString(ret); SysFreeString(path); @@ -887,7 +886,7 @@ static void test_BuildPath(void) ret = (BSTR)0xdeadbeef; path = bstr_from_str("path"); hr = IFileSystem3_BuildPath(fs3, NULL, path, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(ret, path), "got %s\n", wine_dbgstr_w(ret)); SysFreeString(ret); SysFreeString(path); @@ -901,7 +900,7 @@ static void test_BuildPath(void) name = bstr_from_str(ptr->name); result = bstr_from_str(ptr->result); hr = IFileSystem3_BuildPath(fs3, path, name, &ret); - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", i, hr); if (hr == S_OK) { ok(!lstrcmpW(ret, result), "%d: got wrong path %s, expected %s\n", i, wine_dbgstr_w(ret), @@ -926,28 +925,28 @@ static void test_GetFolder(void) folder = (void*)0xdeadbeef; hr = IFileSystem3_GetFolder(fs3, NULL, &folder); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(folder == NULL, "got %p\n", folder); hr = IFileSystem3_GetFolder(fs3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); /* something that doesn't exist */ str = SysAllocString(L"dummy"); hr = IFileSystem3_GetFolder(fs3, str, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); folder = (void*)0xdeadbeef; hr = IFileSystem3_GetFolder(fs3, str, &folder); - ok(hr == CTL_E_PATHNOTFOUND, "got 0x%08x\n", hr); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); ok(folder == NULL, "got %p\n", folder); SysFreeString(str); GetWindowsDirectoryW(buffW, MAX_PATH); str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); test_provideclassinfo(folder, &CLSID_Folder); IFolder_Release(folder); @@ -961,17 +960,17 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG cou VARIANT var, var2; hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", line, hr); VariantInit(&var); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); - ok(fetched == 1, "%d: got %d\n", line, fetched); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", line, hr); + ok(fetched == 1, "%d: unexpected value %lu.\n", line, fetched); /* clone enumerator */ hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", line, hr); ok(clone != enumvar, "%d: got %p, %p\n", line, enumvar, clone); /* check if clone inherits position */ @@ -980,21 +979,21 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG cou hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); if (position_inherited && count == 1) { - ok(hr == S_FALSE, "%d: got 0x%08x\n", line, hr); - ok(fetched == 0, "%d: got %d\n", line, fetched); + ok(hr == S_FALSE, "%d: Unexpected hr %#lx.\n", line, hr); + ok(!fetched, "%d: unexpected value %lu.\n", line, fetched); } else { - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); - ok(fetched == 1, "%d: got %d\n", line, fetched); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", line, hr); + ok(fetched == 1, "%d: unexpected value %lu.\n", line, fetched); if (!position_inherited) todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); else { fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); - ok(fetched == 1, "%d: got %d\n", line, fetched); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", line, hr); + ok(fetched == 1, "%d: unexpected value %lu.\n", line, fetched); todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); } } @@ -1004,7 +1003,7 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG cou IEnumVARIANT_Release(clone); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", line, hr); } #define test_clone(a, b, c) _test_clone(a, b, c, __LINE__) @@ -1017,7 +1016,7 @@ static void test_FolderCollection(void) IFolderCollection *folders; WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; IEnumVARIANT *enumvar; - LONG count, ref, ref2, i; + LONG count, ref, ref2; IUnknown *unk, *unk2; IFolder *folder; ULONG fetched; @@ -1025,23 +1024,24 @@ static void test_FolderCollection(void) HRESULT hr; BSTR str; int found_a = 0, found_b = 0, found_c = 0; + unsigned int i; get_temp_path(L"foo", buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = IFolder_get_SubFolders(folder, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFolder_get_Path(folder, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFolder_get_Path(folder, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpiW(buffW, str), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); @@ -1054,14 +1054,14 @@ static void test_FolderCollection(void) CreateDirectoryW(pathW, NULL); hr = IFolder_get_SubFolders(folder, &folders); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(folders, &CLSID_Folders); IFolder_Release(folder); count = 0; hr = IFolderCollection_get_Count(folders, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 2, "got %d\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 2, "Unexpected value %lu.\n", count); lstrcpyW(pathW, buffW); lstrcatW(pathW, cW); @@ -1070,37 +1070,37 @@ static void test_FolderCollection(void) /* every time property is requested it scans directory */ count = 0; hr = IFolderCollection_get_Count(folders, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 3, "got %d\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 3, "Unexpected value %lu.\n", count); hr = IFolderCollection_get__NewEnum(folders, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFolderCollection_QueryInterface(folders, &IID_IEnumVARIANT, (void**)&unk); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); /* NewEnum creates new instance each time it's called */ ref = GET_REFCOUNT(folders); unk = NULL; hr = IFolderCollection_get__NewEnum(folders, &unk); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref2 = GET_REFCOUNT(folders); - ok(ref2 == ref + 1, "got %d, %d\n", ref2, ref); + ok(ref2 == ref + 1, "Unexpected value %ld, %ld.\n", ref2, ref); unk2 = NULL; hr = IFolderCollection_get__NewEnum(folders, &unk2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk != unk2, "got %p, %p\n", unk2, unk); IUnknown_Release(unk2); /* now get IEnumVARIANT */ ref = GET_REFCOUNT(folders); hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref2 = GET_REFCOUNT(folders); - ok(ref2 == ref, "got %d, %d\n", ref2, ref); + ok(ref2 == ref, "Unexpected value %ld, %ld.\n", ref2, ref); test_clone(enumvar, FALSE, count); @@ -1109,16 +1109,16 @@ static void test_FolderCollection(void) VariantInit(&var); fetched = 0; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); - ok(fetched == 1, "%d: got %d\n", i, fetched); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", i, hr); + ok(fetched == 1, "%d: unexpected value %lu.\n", i, fetched); ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var)); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = NULL; hr = IFolder_get_Name(folder, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (!lstrcmpW(str, aW + 1)) found_a++; else if (!lstrcmpW(str, bW + 1)) @@ -1140,26 +1140,26 @@ static void test_FolderCollection(void) VariantInit(&var); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_FALSE, "got 0x%08x\n", hr); - ok(fetched == 0, "got %d\n", fetched); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(!fetched, "Unexpected value %lu.\n", fetched); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&var2[0]); VariantInit(&var2[1]); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 0, var2, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 0, "got %d\n", fetched); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!fetched, "Unexpected value %lu.\n", fetched); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); - ok(hr == S_FALSE, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(fetched == 1, "Unexpected value %lu.\n", fetched); ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); VariantClear(&var2[0]); VariantClear(&var2[1]); @@ -1192,7 +1192,7 @@ static void test_FileCollection(void) IFileCollection *files; IFile *file; IEnumVARIANT *enumvar; - LONG count, ref, ref2, i; + LONG count, ref, ref2; IUnknown *unk, *unk2; ULONG fetched; VARIANT var, var2[2]; @@ -1200,17 +1200,18 @@ static void test_FileCollection(void) BSTR str; HANDLE file_a, file_b, file_c; int found_a = 0, found_b = 0, found_c = 0; + unsigned int i; get_temp_path(L"\\foo", buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = IFolder_get_Files(folder, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); lstrcpyW(pathW, buffW); lstrcatW(pathW, aW); @@ -1222,14 +1223,14 @@ static void test_FileCollection(void) FILE_FLAG_DELETE_ON_CLOSE, 0); hr = IFolder_get_Files(folder, &files); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(files, &CLSID_Files); IFolder_Release(folder); count = 0; hr = IFileCollection_get_Count(files, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 2, "got %d\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 2, "Unexpected value %lu.\n", count); lstrcpyW(pathW, buffW); lstrcatW(pathW, cW); @@ -1239,37 +1240,37 @@ static void test_FileCollection(void) /* every time property is requested it scans directory */ count = 0; hr = IFileCollection_get_Count(files, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 3, "got %d\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 3, "Unexpected value %lu.\n", count); hr = IFileCollection_get__NewEnum(files, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFileCollection_QueryInterface(files, &IID_IEnumVARIANT, (void**)&unk); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); /* NewEnum creates new instance each time it's called */ ref = GET_REFCOUNT(files); unk = NULL; hr = IFileCollection_get__NewEnum(files, &unk); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref2 = GET_REFCOUNT(files); - ok(ref2 == ref + 1, "got %d, %d\n", ref2, ref); + ok(ref2 == ref + 1, "Unexpected value %ld, %ld.\n", ref2, ref); unk2 = NULL; hr = IFileCollection_get__NewEnum(files, &unk2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk != unk2, "got %p, %p\n", unk2, unk); IUnknown_Release(unk2); /* now get IEnumVARIANT */ ref = GET_REFCOUNT(files); hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref2 = GET_REFCOUNT(files); - ok(ref2 == ref, "got %d, %d\n", ref2, ref); + ok(ref2 == ref, "Unexpected value %ld, %ld.\n", ref2, ref); test_clone(enumvar, FALSE, count); @@ -1278,17 +1279,17 @@ static void test_FileCollection(void) VariantInit(&var); fetched = 0; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); - ok(fetched == 1, "%d: got %d\n", i, fetched); + ok(hr == S_OK, "%d: Unexpected hr %#lx.\n", i, hr); + ok(fetched == 1, "%d: unexpected value %lu.\n", i, fetched); ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var)); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFile, (void **)&file); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(file, &CLSID_File); str = NULL; hr = IFile_get_Name(file, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (!lstrcmpW(str, aW + 1)) found_a++; else if (!lstrcmpW(str, bW + 1)) @@ -1310,26 +1311,26 @@ static void test_FileCollection(void) VariantInit(&var); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_FALSE, "got 0x%08x\n", hr); - ok(fetched == 0, "got %d\n", fetched); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(!fetched, "Unexpected value %lu.\n", fetched); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantInit(&var2[0]); VariantInit(&var2[1]); - fetched = -1; + fetched = 1; hr = IEnumVARIANT_Next(enumvar, 0, var2, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 0, "got %d\n", fetched); - fetched = -1; + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!fetched, "Unexpected value %lu.\n", fetched); + fetched = 0; hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); - ok(hr == S_FALSE, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(fetched == 1, "Unexpected value %lu.\n", fetched); ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); VariantClear(&var2[0]); VariantClear(&var2[1]); @@ -1355,35 +1356,35 @@ static void test_DriveCollection(void) LONG count; hr = IFileSystem3_get_Drives(fs3, &drives); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(drives, &CLSID_Drives); hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDriveCollection_get_Count(drives, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); count = 0; hr = IDriveCollection_get_Count(drives, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count > 0, "got %d\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count > 0, "Unexpected value %ld.\n", count); V_VT(&var) = VT_EMPTY; - fetched = -1; + fetched = 1; hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 0, "got %d\n", fetched); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!fetched, "Unexpected value %lu.\n", fetched); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, count); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); test_clone(enumvar, TRUE, count); @@ -1393,39 +1394,39 @@ static void test_DriveCollection(void) BSTR str; hr = IDrive_get_DriveType(drive, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDrive_get_DriveLetter(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IDrive_get_DriveLetter(drive, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(SysStringLen(str) == 1, "got string %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IDrive_get_IsReady(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IDrive_get_TotalSize(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IDrive_get_AvailableSpace(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IDrive_get_FreeSpace(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); if (type == Fixed) { VARIANT_BOOL ready = VARIANT_FALSE; VARIANT size; hr = IDrive_get_IsReady(drive, &ready); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ready == VARIANT_TRUE, "got %x\n", ready); if (ready != VARIANT_TRUE) { hr = IDrive_get_DriveLetter(drive, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); skip("Drive %s is not ready, skipping some tests\n", wine_dbgstr_w(str)); @@ -1436,30 +1437,30 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); else - ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); + ok(V_I4(&size) > 0, "got %ld\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) ok(V_R8(&size) > (double)INT_MAX, "got %f\n", V_R8(&size)); else - ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); + ok(V_I4(&size) > 0, "got %ld\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_FreeSpace(drive, &size); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); else - ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); + ok(V_I4(&size) > 0, "got %ld\n", V_I4(&size)); } VariantClear(&var); } @@ -1491,27 +1492,27 @@ static void test_CreateTextFile(void) /* dir doesn't exist */ nameW = SysAllocString(pathW); hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == CTL_E_PATHNOTFOUND, "got 0x%08x\n", hr); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); ret = CreateDirectoryW(dirW, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(stream, &CLSID_TextStream); hr = ITextStream_Read(stream, 1, &str); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Close(stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, 1, &str); - ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Close(stream); - ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); @@ -1522,16 +1523,16 @@ static void test_CreateTextFile(void) /* try to create again with no-overwrite mode */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); /* now overwrite */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); /* overwrite in Unicode mode, check for BOM */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); /* check contents */ @@ -1539,7 +1540,7 @@ static void test_CreateTextFile(void) ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); r = 0; ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); - ok(ret && r == 2, "read %d, got %d, %d\n", r, ret, GetLastError()); + ok(ret && r == 2, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); ok( buffW[0] == 0xfeff, "got %04x\n", buffW[0] ); CloseHandle(file); @@ -1566,29 +1567,29 @@ static void test_FolderCreateTextFile(void) lstrcatW(pathW, nameW); ret = CreateDirectoryW(dirW, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); str = SysAllocString(dirW); hr = IFileSystem3_GetFolder(fs3, str, &folder); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(stream, &CLSID_TextStream); hr = ITextStream_Read(stream, 1, &str); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Close(stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, 1, &str); - ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Close(stream); - ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); @@ -1599,16 +1600,16 @@ static void test_FolderCreateTextFile(void) /* try to create again with no-overwrite mode */ hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); /* now overwrite */ hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); /* overwrite in Unicode mode, check for BOM */ hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); /* check contents */ @@ -1616,7 +1617,7 @@ static void test_FolderCreateTextFile(void) ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); r = 0; ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); - ok(ret && r==2, "read %d, got %d, %d\n", r, ret, GetLastError()); + ok(ret && r == 2, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); buffW[r/sizeof(WCHAR)] = 0; buff2W[0] = 0xfeff; @@ -1644,15 +1645,15 @@ static void test_WriteLine(void) get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); /* create as ASCII file first */ nameW = SysAllocString(pathW); hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_WriteLine(stream, nameW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); /* check contents */ @@ -1660,7 +1661,7 @@ static void test_WriteLine(void) ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); r = 0; ret = ReadFile(file, buffA, sizeof(buffA), &r, NULL); - ok(ret && r, "read %d, got %d, %d\n", r, ret, GetLastError()); + ok(ret && r, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, ARRAY_SIZE(buffW)); buffW[len] = 0; @@ -1672,10 +1673,10 @@ static void test_WriteLine(void) /* same for unicode file */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_WriteLine(stream, nameW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); /* check contents */ @@ -1683,7 +1684,7 @@ static void test_WriteLine(void) ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); r = 0; ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); - ok(ret && r, "read %d, got %d, %d\n", r, ret, GetLastError()); + ok(ret && r, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); buffW[r/sizeof(WCHAR)] = 0; buff2W[0] = 0xfeff; @@ -1714,43 +1715,43 @@ static void test_ReadAll(void) get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); /* Unicode file -> read with ascii stream */ nameW = SysAllocString(pathW); hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(firstlineW); hr = ITextStream_WriteLine(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(secondlineW); hr = ITextStream_WriteLine(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = ITextStream_ReadAll(stream, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_ReadAll(stream, &str); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ok(str == NULL || broken(str == (void*)0xdeadbeef) /* win2k */, "got %p\n", str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_ReadAll(stream, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); /* Buffer content is not interpreted - BOM is kept, all data is converted to WCHARs */ str = NULL; hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "Unexpected hr %#lx.\n", hr); buffW[0] = 0; lstrcpyA(buffA, utf16bom); lstrcatA(buffA, "first"); @@ -1761,7 +1762,7 @@ static void test_ReadAll(void) /* Unicode file -> read with unicode stream */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); @@ -1769,30 +1770,30 @@ static void test_ReadAll(void) lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* ReadAll one more time */ str = (void*)0xdeadbeef; hr = ITextStream_ReadAll(stream, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL || broken(str == (void*)0xdeadbeef) /* win2k */, "got %p\n", str); /* ReadLine fails the same way */ str = (void*)0xdeadbeef; hr = ITextStream_ReadLine(stream, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL || broken(str == (void*)0xdeadbeef) /* win2k */, "got %p\n", str); ITextStream_Release(stream); /* Open again and skip first line before ReadAll */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = NULL; hr = ITextStream_ReadLine(stream, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(str != NULL, "got %p\n", str); ok(!wcscmp(str, firstlineW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1801,7 +1802,7 @@ static void test_ReadAll(void) lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1809,19 +1810,19 @@ static void test_ReadAll(void) /* ASCII file, read with Unicode stream */ /* 1. one byte content, not enough for Unicode read */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(aW); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_ReadAll(stream, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL || broken(str == (void*)0xdeadbeef) /* win2k */, "got %p\n", str); ITextStream_Release(stream); @@ -1846,59 +1847,59 @@ static void test_Read(void) get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); /* Unicode file -> read with ascii stream */ nameW = SysAllocString(pathW); hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(firstlineW); hr = ITextStream_WriteLine(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(secondlineW); hr = ITextStream_WriteLine(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = ITextStream_Read(stream, 0, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, 1, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, -1, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 1, &str); - ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); ok(str == NULL, "got %p\n", str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream, 1, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, -1, &str); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(str == NULL, "got %p\n", str); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 0, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(str == NULL, "got %p\n", str); /* Buffer content is not interpreted - BOM is kept, all data is converted to WCHARs */ str = NULL; hr = ITextStream_Read(stream, 2, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); buffW[0] = 0; lstrcpyA(buffA, utf16bom); @@ -1911,7 +1912,7 @@ static void test_Read(void) /* Unicode file -> read with unicode stream */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); @@ -1919,30 +1920,30 @@ static void test_Read(void) lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* ReadAll one more time */ str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 10, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL, "got %p\n", str); /* ReadLine fails the same way */ str = (void*)0xdeadbeef; hr = ITextStream_ReadLine(stream, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL || broken(str == (void*)0xdeadbeef), "got %p\n", str); ITextStream_Release(stream); /* Open again and skip first line before ReadAll */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = NULL; hr = ITextStream_ReadLine(stream, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(str != NULL, "got %p\n", str); SysFreeString(str); @@ -1950,14 +1951,14 @@ static void test_Read(void) lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_Read(stream, 100, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream); /* default read will use Unicode */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); @@ -1965,7 +1966,7 @@ static void test_Read(void) lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1973,22 +1974,22 @@ static void test_Read(void) /* default append will use Unicode */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"123"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); lstrcatW(buffW, L"123"); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1996,60 +1997,60 @@ static void test_Read(void) /* default write will use ASCII */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"123"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); /* ASCII file, read with default stream */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"test"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); /* default append will use Unicode */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"123"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2057,21 +2058,21 @@ static void test_Read(void) /* default write will use ASCII as well */ hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"test string"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -2079,19 +2080,19 @@ static void test_Read(void) /* ASCII file, read with Unicode stream */ /* 1. one byte content, not enough for Unicode read */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"A"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL, "got %p\n", str); ITextStream_Release(stream); @@ -2099,25 +2100,25 @@ static void test_Read(void) /* ASCII file, read with Unicode stream */ /* 3. one byte content, 2 are interpreted as a character, 3rd is lost */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"abc"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "Unexpected hr %#lx.\n", hr); ok(SysStringLen(str) == 1, "len = %u\n", SysStringLen(str)); SysFreeString(str); str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(str == NULL, "got %p\n", str); ITextStream_Release(stream); @@ -2143,7 +2144,7 @@ static void test_ReadLine(void) get_temp_filepath(L"test.txt", path, dir); ret = CreateDirectoryW(dir, NULL); - ok(ret, "got %d, %d\n", ret, GetLastError()); + ok(ret, "Unexpected retval %d, error %ld.\n", ret, GetLastError()); file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -2155,45 +2156,45 @@ static void test_ReadLine(void) str = SysAllocString(path); hr = IFileSystem3_OpenTextFile(fs3, str, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); for (i = 0; i < 1000; i++) { hr = ITextStream_ReadLine(stream, &str); - ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"first line"), "ReadLine returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = ITextStream_ReadLine(stream, &str); - ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"second"), "ReadLine returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = ITextStream_ReadLine(stream, &str); - ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!*str, "ReadLine returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = ITextStream_ReadLine(stream, &str); - ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"\rt\r\re \rst"), "ReadLine returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); } str = NULL; hr = ITextStream_ReadLine(stream, &str); - ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#lx.\n", hr); ok(!str, "ReadLine returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream); ret = DeleteFileW(path); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(ret, "Unexpected retval %ld.\n", GetLastError()); ret = RemoveDirectoryW(dir); - ok(ret, "RemoveDirectory failed: %u\n", GetLastError()); + ok(ret, "Unexpected retval %ld.\n", GetLastError()); } struct driveexists_test { @@ -2225,16 +2226,16 @@ static void test_DriveExists(void) WCHAR root[] = L"?:\\"; hr = IFileSystem3_DriveExists(fs3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ret = VARIANT_TRUE; hr = IFileSystem3_DriveExists(fs3, NULL, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ret == VARIANT_FALSE, "got %x\n", ret); drivespec = SysAllocString(root); hr = IFileSystem3_DriveExists(fs3, drivespec, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); SysFreeString(drivespec); for (; *ptr->drivespec; ptr++) { @@ -2254,7 +2255,7 @@ static void test_DriveExists(void) drivespec[0] = root[0]; ret = ptr->expected_ret == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE; hr = IFileSystem3_DriveExists(fs3, drivespec, &ret); - ok(hr == S_OK, "got 0x%08x for drive spec %s (%s)\n", + ok(hr == S_OK, "Unexpected hr %#lx. for drive spec %s (%s)\n", hr, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); ok(ret == ptr->expected_ret, "got %d, expected %d for drive spec %s (%s)\n", ret, ptr->expected_ret, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); @@ -2264,7 +2265,7 @@ static void test_DriveExists(void) ret = ptr->expected_ret == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE; hr = IFileSystem3_DriveExists(fs3, drivespec, &ret); - ok(hr == S_OK, "got 0x%08x for drive spec %s (%s)\n", + ok(hr == S_OK, "Unexpected hr %#lx. for drive spec %s (%s)\n", hr, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); ok(ret == ptr->expected_ret, "got %d, expected %d for drive spec %s (%s)\n", ret, ptr->expected_ret, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); @@ -2296,18 +2297,18 @@ static void test_GetDriveName(void) BSTR name; hr = IFileSystem3_GetDriveName(fs3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); name = (void*)0xdeadbeef; hr = IFileSystem3_GetDriveName(fs3, NULL, &name); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(name == NULL, "got %p\n", name); while (*ptr->path) { BSTR path = SysAllocString(ptr->path); name = (void*)0xdeadbeef; hr = IFileSystem3_GetDriveName(fs3, path, &name); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (name) ok(!lstrcmpW(ptr->drive, name), "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); else @@ -2333,7 +2334,7 @@ static void test_GetDrive(void) drive = (void*)0xdeadbeef; hr = IFileSystem3_GetDrive(fs3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ok(drive == (void*)0xdeadbeef, "got %p\n", drive); for (root[0] = 'A'; root[0] <= 'Z'; root[0]++) @@ -2346,7 +2347,7 @@ static void test_GetDrive(void) drivespec = SysAllocString(root); drive = (void*)0xdeadbeef; hr = IFileSystem3_GetDrive(fs3, drivespec, &drive); - ok(hr == CTL_E_DEVICEUNAVAILABLE, "got 0x%08x\n", hr); + ok(hr == CTL_E_DEVICEUNAVAILABLE, "Unexpected hr %#lx.\n", hr); ok(drive == NULL, "got %p\n", drive); SysFreeString(drivespec); } @@ -2358,7 +2359,7 @@ static void test_GetDrive(void) } hr = IDrive_get_DriveLetter(drive_fixed, &dl_fixed); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (FAILED(hr)) skip("Could not retrieve drive letter of fixed drive, skipping test.\n"); @@ -2383,7 +2384,7 @@ static void test_GetDrive(void) drivespec = SysAllocString(ptr->drivespec); drive = (void*)0xdeadbeef; hr = IFileSystem3_GetDrive(fs3, drivespec, &drive); - ok(hr == ptr->res, "got 0x%08x, expected 0x%08x for drive spec %s\n", + ok(hr == ptr->res, "Unexpected hr %#lx, expected %#lx for drive spec %s.\n", hr, ptr->res, wine_dbgstr_w(ptr->drivespec)); ok(!lstrcmpW(ptr->drivespec, drivespec), "GetDrive modified its DriveSpec argument\n"); SysFreeString(drivespec); @@ -2391,7 +2392,7 @@ static void test_GetDrive(void) if (*ptr->driveletter) { BSTR driveletter; hr = IDrive_get_DriveLetter(drive, &driveletter); - ok(hr == S_OK, "got 0x%08x for drive spec %s\n", hr, wine_dbgstr_w(ptr->drivespec)); + ok(hr == S_OK, "Unexpected hr %#lx. for drive spec %s\n", hr, wine_dbgstr_w(ptr->drivespec)); if (SUCCEEDED(hr)) { ok(!lstrcmpW(ptr->driveletter, driveletter), "got %s, expected %s for drive spec %s\n", wine_dbgstr_w(driveletter), wine_dbgstr_w(ptr->driveletter), @@ -2421,28 +2422,28 @@ static void test_SerialNumber(void) } hr = IDrive_get_SerialNumber(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); serial = 0xdeadbeef; hr = IDrive_get_SerialNumber(drive, &serial); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(serial != 0xdeadbeef, "got %x\n", serial); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(serial != 0xdeadbeef, "Unexpected value %#lx.\n", serial); hr = IDrive_get_FileSystem(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); name = NULL; hr = IDrive_get_FileSystem(drive, &name); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(name != NULL, "got %p\n", name); SysFreeString(name); hr = IDrive_get_VolumeName(drive, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); name = NULL; hr = IDrive_get_VolumeName(drive, &name); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(name != NULL, "got %p\n", name); SysFreeString(name); @@ -2470,7 +2471,7 @@ static void test_GetExtensionName(void) path = SysAllocString(extension_tests[i].path); ext = NULL; hr = IFileSystem3_GetExtensionName(fs3, path, &ext); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (*extension_tests[i].ext) ok(!lstrcmpW(ext, extension_tests[i].ext), "%d: path %s, got %s, expected %s\n", i, wine_dbgstr_w(path), wine_dbgstr_w(ext), wine_dbgstr_w(extension_tests[i].ext)); @@ -2492,36 +2493,36 @@ static void test_GetSpecialFolder(void) BSTR path; hr = IFileSystem3_GetSpecialFolder(fs3, WindowsFolder, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_GetSpecialFolder(fs3, TemporaryFolder+1, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_GetSpecialFolder(fs3, TemporaryFolder+1, &folder); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IFileSystem3_GetSpecialFolder(fs3, WindowsFolder, &folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFolder_get_Path(folder, &path); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); SysFreeString(path); IFolder_Release(folder); hr = IFileSystem3_GetSpecialFolder(fs3, SystemFolder, &folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFolder_get_Path(folder, &path); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); SysFreeString(path); IFolder_Release(folder); hr = IFileSystem3_GetSpecialFolder(fs3, TemporaryFolder, &folder); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IFolder_get_Path(folder, &path); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = GetTempPathW(ARRAY_SIZE(pathW), pathW); if (ret && pathW[ret-1] == '\\') pathW[ret-1] = 0; @@ -2539,56 +2540,56 @@ static void test_MoveFile(void) str = SysAllocString(L"test.txt"); hr = IFileSystem3_CreateTextFile(fs3, str, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(L"test"); hr = ITextStream_Write(stream, str); - ok(hr == S_OK, "Write failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); str = SysAllocString(L"test2.txt"); hr = IFileSystem3_CreateTextFile(fs3, str, VARIANT_FALSE, VARIANT_FALSE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); ITextStream_Release(stream); src = SysAllocString(L"test.txt"); dst = SysAllocString(L"test3.txt"); hr = IFileSystem3_MoveFile(fs3, src, dst); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(src); SysFreeString(dst); str = SysAllocString(L"test.txt"); hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); - ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); SysFreeString(str); src = SysAllocString(L"test3.txt"); dst = SysAllocString(L"test2.txt"); /* already exists */ hr = IFileSystem3_MoveFile(fs3, src, dst); - ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x, expected CTL_E_FILEALREADYEXISTS\n", hr); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); SysFreeString(src); SysFreeString(dst); src = SysAllocString(L"nonexistent.txt"); dst = SysAllocString(L"test4.txt"); hr = IFileSystem3_MoveFile(fs3, src, dst); - ok(hr == CTL_E_FILENOTFOUND, "got 0x%08x, expected CTL_E_FILENOTFOUND\n", hr); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#lx.\n", hr); SysFreeString(src); SysFreeString(dst); str = SysAllocString(L"test3.txt"); hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(L"test2.txt"); hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); } @@ -2613,17 +2614,17 @@ static void test_DoOpenPipeStream(void) hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ok(!!stream_read, "Unexpected stream pointer.\n"); ret = WriteFile(pipewrite, testdata, sizeof(testdata), &written, NULL); ok(ret, "Failed to write to the pipe.\n"); - ok(written == sizeof(testdata), "Write to anonymous pipe wrote %d bytes.\n", written); + ok(written == sizeof(testdata), "Write to anonymous pipe wrote %ld bytes.\n", written); hr = ITextStream_Read(stream_read, 4, &str); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"test"), "Unexpected data read %s.\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2644,29 +2645,29 @@ static void test_DoOpenPipeStream(void) stream_read = NULL; hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream_write = NULL; hr = pDoOpenPipeStream(pipewrite, ForWriting, &stream_write); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { str = SysAllocString(L"data"); hr = ITextStream_Write(stream_write, str); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Write(stream_read, str); - ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#x.\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = ITextStream_Read(stream_write, 1, &str); - ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#x.\n", hr); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream_read, 4, &str); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"data"), "Unexpected data.\n"); SysFreeString(str); } @@ -2685,8 +2686,9 @@ START_TEST(filesystem) hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IFileSystem3, (void**)&fs3); - if(FAILED(hr)) { - win_skip("Could not create FileSystem object: %08x\n", hr); + if(FAILED(hr)) + { + win_skip("Could not create FileSystem object, hr %#lx.\n", hr); return; } -- 2.34.1

1 0

[PATCH] wshom/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 11 Feb '22

11 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/tests/Makefile.in | 1 - dlls/wshom.ocx/tests/wshom.c | 218 +++++++++++++++---------------- 2 files changed, 108 insertions(+), 111 deletions(-) diff --git a/dlls/wshom.ocx/tests/Makefile.in b/dlls/wshom.ocx/tests/Makefile.in index 1251173ffd4..f115163aceb 100644 --- a/dlls/wshom.ocx/tests/Makefile.in +++ b/dlls/wshom.ocx/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wshom.ocx IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index c5e56c84aba..0e30ea9ed9a 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -28,9 +28,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#define EXPECT_HR(hr,hr_exp) \ - ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) - #define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) { @@ -40,13 +37,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); - ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#lx.\n", hr); hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); - ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#lx.\n", hr); hr = ITypeInfo_GetTypeAttr(ti, &attr); - ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#lx.\n", hr); ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); @@ -89,45 +86,45 @@ static void test_wshshell(void) hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(disp, &IID_IWshShell3); hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - EXPECT_HR(hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); IDispatch_Release(disp); hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IWshShell3_QueryInterface(sh3, &IID_IObjectWithSite, (void**)&unk); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell, (void**)&unk); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell2, (void**)&unk); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); hr = IWshShell3_get_SpecialFolders(sh3, &coll); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(coll, &IID_IWshCollection); hr = IWshCollection_QueryInterface(coll, &IID_IFolderCollection, (void**)&folders); - EXPECT_HR(hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IWshCollection_QueryInterface(coll, &IID_IDispatch, (void**)&disp); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDispatch_GetTypeInfo(disp, 0, 0, &ti); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITypeInfo_GetTypeAttr(ti, &tattr); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualIID(&tattr->guid, &IID_IWshCollection), "got wrong type guid\n"); ITypeInfo_ReleaseTypeAttr(ti, tattr); @@ -140,12 +137,12 @@ static void test_wshshell(void) dp.cArgs = 1; dp.cNamedArgs = 0; hr = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 1033, DISPATCH_PROPERTYGET, &dp, &res, &ei, &err); - EXPECT_HR(hr, DISP_E_MEMBERNOTFOUND); + ok(hr == DISP_E_MEMBERNOTFOUND, "Unexpected hr %#lx.\n", hr); /* try Item() directly, it returns directory path apparently */ V_VT(&res) = VT_EMPTY; hr = IWshCollection_Item(coll, &arg, &res); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); CHECK_BSTR_LENGTH(V_BSTR(&res)); SysFreeString(str); @@ -154,54 +151,54 @@ static void test_wshshell(void) /* CreateShortcut() */ str = SysAllocString(L"file.lnk"); hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); - EXPECT_HR(hr, S_OK); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(shortcut, &IID_IWshShortcut); hr = IWshShortcut_get_Arguments(shcut, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IWshShortcut_get_IconLocation(shcut, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); IWshShortcut_Release(shcut); IDispatch_Release(shortcut); /* ExpandEnvironmentStrings */ hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"%PATH%"); hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); SysFreeString(str); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"SYSTEM"); hr = IWshShell3_get_Environment(sh3, &arg, &env); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantClear(&arg); hr = IWshEnvironment_get_Item(env, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); test_provideclassinfo(env, &IID_IWshEnvironment); ret = (BSTR)0x1; hr = IWshEnvironment_get_Item(env, NULL, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ret && !*ret, "got %p\n", ret); SysFreeString(ret); /* invalid var name */ str = SysAllocString(L"file.lnk"); hr = IWshEnvironment_get_Item(env, str, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ret = NULL; hr = IWshEnvironment_get_Item(env, str, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); CHECK_BSTR_LENGTH(ret); SysFreeString(ret); @@ -210,7 +207,7 @@ static void test_wshshell(void) /* valid name */ str = SysAllocString(L"PATH"); hr = IWshEnvironment_get_Item(env, str, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); CHECK_BSTR_LENGTH(ret); SysFreeString(ret); @@ -225,24 +222,24 @@ static void test_wshshell(void) str = SysAllocString(L"notepad.exe"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); retval = 10; hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); - ok(hr == E_POINTER, "got 0x%08x\n", hr); - ok(retval == 10, "got %u\n", retval); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(retval == 10, "Unexpected retval %lu.\n", retval); retval = 10; hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); - ok(hr == E_POINTER, "got 0x%08x\n", hr); - ok(retval == 10, "got %u\n", retval); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(retval == 10, "Unexpected retval %lu.\n", retval); retval = 10; V_VT(&arg2) = VT_ERROR; V_ERROR(&arg2) = 0; hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); - ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); - ok(retval == 10, "got %u\n", retval); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#lx.\n", hr); + ok(retval == 10, "Unexpected retval %lu.\n", retval); SysFreeString(str); V_VT(&arg2) = VT_BOOL; @@ -251,15 +248,15 @@ static void test_wshshell(void) retval = 0xdeadbeef; str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); - ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); SysFreeString(str); retval = 0xdeadbeef; str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); - ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); SysFreeString(str); GetSystemDirectoryW(path, ARRAY_SIZE(path)); @@ -282,8 +279,8 @@ static void test_wshshell(void) retval = 0xdeadbeef; str = SysAllocString(buf); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); - ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); SysFreeString(str); DeleteFileW(path2); @@ -296,45 +293,45 @@ static void test_wshshell(void) str = NULL; hr = IWshShell3_get_CurrentDirectory(sh3, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(str && str[0] != 0, "got empty string\n"); CHECK_BSTR_LENGTH(str); SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); ok(hr == E_INVALIDARG || - broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "got 0x%08x\n", hr); + broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "Unexpected hr %#lx.\n", hr); str = SysAllocString(emptyW); hr = IWshShell3_put_CurrentDirectory(sh3, str); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(L"deadparrot"); hr = IWshShell3_put_CurrentDirectory(sh3, str); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); SysFreeString(str); /* Exec */ hr = IWshShell3_Exec(sh3, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IWshShell3_Exec(sh3, NULL, &shexec); - ok(hr == DISP_E_EXCEPTION, "got 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Unexpected hr %#lx.\n", hr); str = SysAllocString(emptyW); hr = IWshShell3_Exec(sh3, str, &shexec); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(L"%deadbeaf% /c echo test"); hr = IWshShell3_Exec(sh3, str, &shexec); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); SysFreeString(str); str = SysAllocString(L"%ComSpec% /c echo test"); hr = IWshShell3_Exec(sh3, str, &shexec); - ok(hr == HRESULT_FROM_WIN32(ERROR_SUCCESS), "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); IWshCollection_Release(coll); @@ -380,49 +377,49 @@ static void test_registry(void) hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IWshShell3, (void**)&sh3); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* RegRead() */ V_VT(&value) = VT_I2; hr = IWshShell3_RegRead(sh3, NULL, &value); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); name = SysAllocString(L"HKEY_broken_key"); hr = IWshShell3_RegRead(sh3, name, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); V_VT(&value) = VT_I2; hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); SysFreeString(name); name = SysAllocString(L"HKEY_CURRENT_USERa"); V_VT(&value) = VT_I2; hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); SysFreeString(name); ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); dwvalue = 10; ret = RegSetValueExA(root, "regdword", 0, REG_DWORD, (const BYTE*)&dwvalue, sizeof(dwvalue)); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); dwvalue = 11; ret = RegSetValueExA(root, "regbinary", 0, REG_BINARY, (const BYTE*)&dwvalue, sizeof(dwvalue)); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); /* REG_SZ */ lstrcpyW(pathW, keypathW); @@ -430,7 +427,7 @@ static void test_registry(void) name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), L"foobar"), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); CHECK_BSTR_LENGTH(V_BSTR(&value)); @@ -443,7 +440,7 @@ static void test_registry(void) name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); CHECK_BSTR_LENGTH(V_BSTR(&value)); @@ -456,9 +453,9 @@ static void test_registry(void) name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); - ok(V_I4(&value) == 10, "got %d\n", V_I4(&value)); + ok(V_I4(&value) == 10, "Unexpected value %ld.\n", V_I4(&value)); SysFreeString(name); /* REG_BINARY */ @@ -467,26 +464,26 @@ static void test_registry(void) name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); dim = SafeArrayGetDim(V_ARRAY(&value)); ok(dim == 1, "got %u\n", dim); hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(bound == 0, "got %u\n", bound); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(bound == 0, "Unexpected value %lu.\n", bound); hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(bound == 3, "got %u\n", bound); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(bound == 3, "Unexpected value %lu.\n", bound); hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(vartype == VT_VARIANT, "got %d\n", vartype); bound = 0; hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&v) == VT_UI1, "got %d\n", V_VT(&v)); ok(V_UI1(&v) == 11, "got %u\n", V_UI1(&v)); VariantClear(&v); @@ -499,7 +496,7 @@ static void test_registry(void) name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); SysFreeString(name); @@ -507,20 +504,20 @@ static void test_registry(void) ok(dim == 1, "got %u\n", dim); hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(bound == 0, "got %u\n", bound); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(bound == 0, "Unexpected value %lu.\n", bound); hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(bound == 1, "got %u\n", bound); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(bound == 1, "Unexpected value %lu.\n", bound); hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(vartype == VT_VARIANT, "got %d\n", vartype); bound = 0; hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"foo"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); CHECK_BSTR_LENGTH(V_BSTR(&v)); @@ -530,7 +527,7 @@ static void test_registry(void) name = SysAllocString(L"HKEY_CURRENT_USER\\Software\\Wine\\Test\\regsz1"); V_VT(&value) = VT_I2; hr = IWshShell3_RegRead(sh3, name, &value); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); VariantClear(&value); SysFreeString(name); @@ -539,76 +536,76 @@ static void test_registry(void) /* RegWrite() */ ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root); - ok(ret == 0, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); hr = IWshShell3_RegWrite(sh3, NULL, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); lstrcpyW(pathW, keypathW); lstrcatW(pathW, regszW); name = SysAllocString(pathW); hr = IWshShell3_RegWrite(sh3, name, NULL, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); VariantInit(&value); hr = IWshShell3_RegWrite(sh3, name, &value, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IWshShell3_RegWrite(sh3, name, &value, &value); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* type is optional */ V_VT(&v) = VT_ERROR; V_ERROR(&v) = DISP_E_PARAMNOTFOUND; hr = IWshShell3_RegWrite(sh3, name, &value, &v); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* default type is REG_SZ */ V_VT(&value) = VT_I4; V_I4(&value) = 12; hr = IWshShell3_RegWrite(sh3, name, &value, &v); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = REG_NONE; ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ok(type == REG_SZ, "got %d\n", type); + ok(!ret, "Unexpected retval %ld.\n", ret); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); ret = RegDeleteValueA(root, "regsz"); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); V_VT(&value) = VT_BSTR; V_BSTR(&value) = SysAllocString(regszW); hr = IWshShell3_RegWrite(sh3, name, &value, &v); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantClear(&value); type = REG_NONE; ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ok(type == REG_SZ, "got %d\n", type); + ok(!ret, "Unexpected retval %ld.\n", ret); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); ret = RegDeleteValueA(root, "regsz"); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); V_VT(&value) = VT_R4; V_R4(&value) = 1.2; hr = IWshShell3_RegWrite(sh3, name, &value, &v); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); VariantClear(&value); type = REG_NONE; ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ok(type == REG_SZ, "got %d\n", type); + ok(!ret, "Unexpected retval %ld.\n", ret); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); ret = RegDeleteValueA(root, "regsz"); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!ret, "Unexpected retval %ld.\n", ret); V_VT(&value) = VT_R4; V_R4(&value) = 1.2; V_VT(&v) = VT_I2; V_I2(&v) = 1; hr = IWshShell3_RegWrite(sh3, name, &value, &v); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); VariantClear(&value); SysFreeString(name); @@ -627,17 +624,17 @@ static void test_popup(void) hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IWshShell, (void **)&sh); - ok(hr == S_OK, "Failed to create WshShell object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); button = 123; text = SysAllocString(L"Text"); hr = IWshShell_Popup(sh, NULL, NULL, NULL, NULL, &button); - ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ok(button == 123, "Unexpected button id %d.\n", button); hr = IWshShell_Popup(sh, text, NULL, NULL, NULL, &button); - ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ok(button == 123, "Unexpected button id %d.\n", button); V_VT(&optional) = VT_ERROR; @@ -653,11 +650,11 @@ static void test_popup(void) V_BSTR(&title) = NULL; hr = IWshShell_Popup(sh, text, &timeout, &optional, &type, &button); - ok(hr == S_OK, "Unexpected retval %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(button == -1, "Unexpected button id %d.\n", button); hr = IWshShell_Popup(sh, text, &timeout, &title, &optional, &button); - ok(hr == S_OK, "Unexpected retval %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(button == -1, "Unexpected button id %d.\n", button); SysFreeString(text); @@ -673,8 +670,9 @@ START_TEST(wshom) hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - if (FAILED(hr)) { - win_skip("Could not create WshShell object: %08x\n", hr); + if (FAILED(hr)) + { + win_skip("Could not create WshShell object: %#lx.\n", hr); return; } IUnknown_Release(unk); -- 2.34.1

1 0

[PATCH] xaudio2_7/tests: Build without -DWINE_NO_LONG_TYPES.
by Alistair Leslie-Hughes 11 Feb '22

11 Feb '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_7/tests/Makefile.in | 1 - dlls/xaudio2_7/tests/xaudio2.c | 182 +++++++++++++++---------------- 2 files changed, 91 insertions(+), 92 deletions(-) diff --git a/dlls/xaudio2_7/tests/Makefile.in b/dlls/xaudio2_7/tests/Makefile.in index e44130a1d7a..ba56d94a1f3 100644 --- a/dlls/xaudio2_7/tests/Makefile.in +++ b/dlls/xaudio2_7/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xaudio2_7.dll IMPORTS = ole32 diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 9821553166e..9d50944b8d3 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -192,18 +192,18 @@ static void test_simple_streaming(IXAudio2 *xa) * XA2.7 does all mixing from a single thread, so call sequence can be * tested. */ XA2CALL(RegisterForCallbacks, &ecb); - ok(hr == S_OK, "RegisterForCallbacks failed: %08x\n", hr); + ok(hr == S_OK, "RegisterForCallbacks failed: %08lx\n", hr); if(xaudio27) hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); else hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); if(!xaudio27){ chmask = 0xdeadbeef; IXAudio2MasteringVoice_GetChannelMask(master, &chmask); - ok(chmask == (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT), "Got unexpected channel mask: 0x%x\n", chmask); + ok(chmask == (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT), "Got unexpected channel mask: 0x%lx\n", chmask); } /* create first source voice */ @@ -216,7 +216,7 @@ static void test_simple_streaming(IXAudio2 *xa) fmt.cbSize = 0; XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &vcb1, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); if(xaudio27){ XAUDIO27_VOICE_DETAILS details; @@ -239,14 +239,14 @@ static void test_simple_streaming(IXAudio2 *xa) fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); /* create second source voice */ XA2CALL(CreateSourceVoice, &src2, &fmt, 0, 1.f, &vcb2, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); if(xaudio27){ XAUDIO27_VOICE_DETAILS details; @@ -269,13 +269,13 @@ static void test_simple_streaming(IXAudio2 *xa) fill_buf((float*)buf2.pAudioData, &fmt, 220, 22050); hr = IXAudio2SourceVoice_SubmitSourceBuffer(src2, &buf2, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); hr = IXAudio2SourceVoice_Start(src2, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + ok(hr == S_OK, "StartEngine failed: %08lx\n", hr); /* hook up volume meter */ if(xaudio27){ @@ -283,20 +283,20 @@ static void test_simple_streaming(IXAudio2 *xa) hr = CoCreateInstance(&CLSID_AudioVolumeMeter27, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&vumeter); - ok(hr == S_OK, "CoCreateInstance(AudioVolumeMeter) failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance(AudioVolumeMeter) failed: %08lx\n", hr); hr = IUnknown_QueryInterface(vumeter, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); }else{ IXAPO *xapo; hr = pCreateAudioVolumeMeter(&vumeter); - ok(hr == S_OK, "CreateAudioVolumeMeter failed: %08x\n", hr); + ok(hr == S_OK, "CreateAudioVolumeMeter failed: %08lx\n", hr); hr = IUnknown_QueryInterface(vumeter, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); } @@ -309,7 +309,7 @@ static void test_simple_streaming(IXAudio2 *xa) chain.pEffectDescriptors = &effect; hr = IXAudio2MasteringVoice_SetEffectChain(master, &chain); - ok(hr == S_OK, "SetEffectchain failed: %08x\n", hr); + ok(hr == S_OK, "SetEffectchain failed: %08lx\n", hr); IUnknown_Release(vumeter); @@ -488,7 +488,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); else hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); /* test OnBufferStart/End callbacks */ fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; @@ -500,7 +500,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) fmt.cbSize = 0; XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &vcb_buf, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); memset(&buf, 0, sizeof(buf)); buf.AudioBytes = 4410 * fmt.nBlockAlign; @@ -514,22 +514,22 @@ static void test_buffer_callbacks(IXAudio2 *xa) buf.pContext = &testdata[i]; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); } hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + ok(hr == S_OK, "StartEngine failed: %08lx\n", hr); if(xaudio27){ hr = IXAudio27SourceVoice_SetSourceSampleRate((IXAudio27SourceVoice*)src, 48000); - ok(hr == S_OK, "SetSourceSampleRate failed: %08x\n", hr); + ok(hr == S_OK, "SetSourceSampleRate failed: %08lx\n", hr); }else{ hr = IXAudio2SourceVoice_SetSourceSampleRate(src, 48000); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetSourceSampleRate should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetSourceSampleRate should have failed: %08lx\n", hr); } while(1){ @@ -552,15 +552,15 @@ static void test_buffer_callbacks(IXAudio2 *xa) /* test OnStreamEnd callback */ XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); buf.Flags = XAUDIO2_END_OF_STREAM; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); timeout = 0; while(nstreamends == 0 && timeout < 1000){ @@ -596,7 +596,7 @@ static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) nloopends = 0; hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); while(1){ if(xaudio27) @@ -615,7 +615,7 @@ static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) } hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); return state.SamplesPlayed; } @@ -635,7 +635,7 @@ static void test_looping(IXAudio2 *xa) hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); else hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; @@ -647,7 +647,7 @@ static void test_looping(IXAudio2 *xa) fmt.cbSize = 0; XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); memset(&buf, 0, sizeof(buf)); @@ -656,7 +656,7 @@ static void test_looping(IXAudio2 *xa) fill_buf((float*)buf.pAudioData, &fmt, 440, 44100); XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + ok(hr == S_OK, "StartEngine failed: %08lx\n", hr); /* play from middle to end */ buf.PlayBegin = 22050; @@ -666,7 +666,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 0; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 22050, "Got wrong samples played: %u\n", played - running_total); @@ -681,7 +681,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 0; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 4410, "Got wrong samples played: %u\n", played - running_total); @@ -696,7 +696,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 1; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 44100 + 4410, "Got wrong samples played: %u\n", played - running_total); @@ -711,7 +711,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 1; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 22050 + 44100, "Got wrong samples played: %u\n", played - running_total); @@ -726,7 +726,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 1; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 4410 + (22050 + 4410), "Got wrong samples played: %u\n", played - running_total); @@ -743,14 +743,14 @@ static void test_looping(IXAudio2 *xa) hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); if(xaudio27){ - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 4410 + (22050 + 4410 * 2), "Got wrong samples played: %u\n", played - running_total); running_total = played; ok(nloopends == 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); }else - ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08lx\n", hr); /* invalid: LoopEnd must be within play range * xaudio27: plays only play range */ @@ -762,14 +762,14 @@ static void test_looping(IXAudio2 *xa) hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); if(xaudio27){ - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, -1); ok(played - running_total == 22050, "Got wrong samples played: %u\n", played - running_total); running_total = played; ok(nloopends == 0, "Got wrong OnLoopEnd calls: %u\n", nloopends); }else - ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08lx\n", hr); /* invalid: LoopBegin must be before PlayEnd * xaudio27: crashes */ @@ -781,7 +781,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 1; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08lx\n", hr); } /* infinite looping buffer */ @@ -792,7 +792,7 @@ static void test_looping(IXAudio2 *xa) buf.LoopCount = 255; hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); played = play_to_completion(src, running_total + 88200); ok(played - running_total == 22050 + 44100 * 2, "Got wrong samples played: %u\n", played - running_total); @@ -819,10 +819,10 @@ static void test_submix(IXAudio2 *xa) hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); else hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); XA2CALL(CreateSubmixVoice, &sub, 2, 44100, 0, 0, NULL, NULL); - ok(hr == S_OK, "CreateSubmixVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); if(xaudio27){ XAUDIO27_VOICE_DETAILS details; @@ -858,7 +858,7 @@ static void test_flush(IXAudio2 *xa) hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); else hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; fmt.nChannels = 2; @@ -869,7 +869,7 @@ static void test_flush(IXAudio2 *xa) fmt.cbSize = 0; XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); memset(&buf, 0, sizeof(buf)); buf.AudioBytes = 22050 * fmt.nBlockAlign; @@ -877,13 +877,13 @@ static void test_flush(IXAudio2 *xa) fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + ok(hr == S_OK, "StartEngine failed: %08lx\n", hr); while(1){ if(xaudio27) @@ -896,18 +896,18 @@ static void test_flush(IXAudio2 *xa) } hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IXAudio2SourceVoice_FlushSourceBuffers(src); - ok(hr == S_OK, "FlushSourceBuffers failed: %08x\n", hr); + ok(hr == S_OK, "FlushSourceBuffers failed: %08lx\n", hr); hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); Sleep(100); hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08lx\n", hr); if(xaudio27){ IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); @@ -926,14 +926,14 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) UINT32 count, i; hr = IXAudio27_GetDeviceCount(xa, &count); - ok(hr == S_OK, "GetDeviceCount failed: %08x\n", hr); + ok(hr == S_OK, "GetDeviceCount failed: %08lx\n", hr); if(count == 0) return 0; for(i = 0; i < count; ++i){ hr = IXAudio27_GetDeviceDetails(xa, i, &dd); - ok(hr == S_OK, "GetDeviceDetails failed: %08x\n", hr); + ok(hr == S_OK, "GetDeviceDetails failed: %08lx\n", hr); if(i == 0) ok(dd.Role == GlobalDefaultDevice, "Got wrong role for index 0: 0x%x\n", dd.Role); @@ -1008,46 +1008,46 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ hr = pCreateFX(const_clsids[i], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08lx\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %u\n", rc); + ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %lu\n", rc); } hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08lx\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(fx_unk); } hr = pCreateFX(avm_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08lx\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "AudioVolumeMeter via CreateFX should have been released, got refcount: %u\n", rc); + ok(rc == 0, "AudioVolumeMeter via CreateFX should have been released, got refcount: %lu\n", rc); } hr = pCreateFX(ar_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08lx\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "AudioReverb via CreateFX should have been released, got refcount: %u\n", rc); + ok(rc == 0, "AudioReverb via CreateFX should have been released, got refcount: %lu\n", rc); } FreeLibrary(xapofxdll); @@ -1093,65 +1093,65 @@ static void test_xapo_creation_modern(const char *module) for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08lx\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %u\n", rc); + ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %lu\n", rc); } hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08lx\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(fx_unk); } /* test legacy CLSID */ hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08lx\n", module, hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %u\n", rc); + ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %lu\n", rc); } pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); ok(pCAVM != NULL, "%s did not have CreateAudioVolumeMeter?\n", module); hr = pCAVM(&fx_unk); - ok(hr == S_OK, "CreateAudioVolumeMeter failed: %08x\n", hr); + ok(hr == S_OK, "CreateAudioVolumeMeter failed: %08lx\n", hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via CreateAudioVolumeMeter should have been released, got refcount: %u\n", rc); + ok(rc == 0, "XAPO via CreateAudioVolumeMeter should have been released, got refcount: %lu\n", rc); } pCAR = (void*)GetProcAddress(xaudio2dll, "CreateAudioReverb"); ok(pCAR != NULL, "%s did not have CreateAudioReverb?\n", module); hr = pCAR(&fx_unk); - ok(hr == S_OK, "CreateAudioReverb failed: %08x\n", hr); + ok(hr == S_OK, "CreateAudioReverb failed: %08lx\n", hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via CreateAudioReverb should have been released, got refcount: %u\n", rc); + ok(rc == 0, "XAPO via CreateAudioReverb should have been released, got refcount: %lu\n", rc); } FreeLibrary(xaudio2dll); @@ -1180,7 +1180,7 @@ static void test_setchannelvolumes(IXAudio2 *xa) hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); else hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; fmt_2ch.nChannels = 2; @@ -1199,32 +1199,32 @@ static void test_setchannelvolumes(IXAudio2 *xa) fmt_8ch.cbSize = 0; XA2CALL(CreateSourceVoice, &src_2ch, &fmt_2ch, 0, 1.f, NULL, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); XA2CALL(CreateSourceVoice, &src_8ch, &fmt_8ch, 0, 1.f, NULL, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + ok(hr == S_OK, "CreateSourceVoice failed: %08lx\n", hr); hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolumes failed: %08lx\n", hr); hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 8, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolumes failed: %08lx\n", hr); if(xaudio27){ /* XAudio 2.7 doesn't check the number of channels */ hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolumes failed: %08lx\n", hr); }else{ /* the number of channels must be the same as the number of channels on the source voice */ hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08lx\n", hr); hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 8, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08lx\n", hr); /* volumes must not be NULL, XAudio 2.7 doesn't check this */ hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, NULL, XAUDIO2_COMMIT_NOW); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08lx\n", hr); } if(xaudio27){ @@ -1281,7 +1281,7 @@ START_TEST(xaudio2) ok(hr != S_OK, "QueryInterface with IID_IXAudio28 on IXAudio27 object returned success. Expected to fail\n"); hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); has_devices = test_DeviceDetails(xa27); if(has_devices){ @@ -1295,7 +1295,7 @@ START_TEST(xaudio2) skip("No audio devices available\n"); rc = IXAudio27_Release(xa27); - ok(rc == 0, "IXAudio2.7 object should have been released, got refcount %u\n", rc); + ok(rc == 0, "IXAudio2.7 object should have been released, got refcount %lu\n", rc); }else win_skip("XAudio 2.7 not available\n"); @@ -1304,10 +1304,10 @@ START_TEST(xaudio2) xaudio27 = FALSE; hr = pXAudio2Create(&xa, 0, XAUDIO2_DEFAULT_PROCESSOR); - ok(hr == S_OK, "XAudio2Create failed: %08x\n", hr); + ok(hr == S_OK, "XAudio2Create failed: %08lx\n", hr); hr = IXAudio2_QueryInterface(xa, &IID_IXAudio27, (void**)&xa27); - ok(hr == E_NOINTERFACE, "XA28 object should support IXAudio27, gave: %08x\n", hr); + ok(hr == E_NOINTERFACE, "XA28 object should support IXAudio27, gave: %08lx\n", hr); has_devices = check_has_devices(xa); if(has_devices){ @@ -1321,7 +1321,7 @@ START_TEST(xaudio2) skip("No audio devices available\n"); rc = IXAudio2_Release(xa); - ok(rc == 0, "IXAudio2 object should have been released, got refcount %u\n", rc); + ok(rc == 0, "IXAudio2 object should have been released, got refcount %lu\n", rc); }else win_skip("XAudio 2.8 not available\n"); -- 2.34.1

1 0

[PATCH] wow64: Build without -DWINE_NO_LONG_TYPES.
by Alistair Leslie-Hughes 11 Feb '22

11 Feb '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wow64/Makefile.in | 1 - dlls/wow64/process.c | 6 +++--- dlls/wow64/registry.c | 2 +- dlls/wow64/security.c | 4 ++-- dlls/wow64/sync.c | 2 +- dlls/wow64/syscall.c | 10 +++++----- dlls/wow64/system.c | 2 +- dlls/wow64/virtual.c | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index 6b161b5cc3e..eebf9e8e53a 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wow64.dll IMPORTLIB = wow64 IMPORTS = ntdll winecrt0 diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 52f6b952031..82ca4181116 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -365,7 +365,7 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 ctx.EFlags &= ~(0x100|0x400|0x40000); NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); - TRACE( "exception %08x dispatcher %08x stack %08x eip %08x\n", + TRACE( "exception %08lx dispatcher %08lx stack %08lx eip %08lx\n", rec->ExceptionCode, ctx.Eip, ctx.Esp, stack->context.Eip ); } break; @@ -392,7 +392,7 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 else ctx.Cpsr &= ~0x20; NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); - TRACE( "exception %08x dispatcher %08x stack %08x pc %08x\n", + TRACE( "exception %08lx dispatcher %08lx stack %08lx pc %08lx\n", rec->ExceptionCode, ctx.Pc, ctx.Sp, stack->context.Sp ); } break; @@ -516,7 +516,7 @@ NTSTATUS WINAPI wow64_NtCreateThread( UINT *args ) void *initial_teb = get_ptr( &args ); BOOLEAN suspended = get_ulong( &args ); - FIXME( "%p %x %p %p %p %p %p %u: stub\n", handle_ptr, access, attr32, process, + FIXME( "%p %lx %p %p %p %p %p %u: stub\n", handle_ptr, access, attr32, process, id32, context, initial_teb, suspended ); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/wow64/registry.c b/dlls/wow64/registry.c index e89c65c4c5e..dfb75d72bc7 100644 --- a/dlls/wow64/registry.c +++ b/dlls/wow64/registry.c @@ -349,7 +349,7 @@ NTSTATUS WINAPI wow64_NtQueryMultipleValueKey( UINT *args ) ULONG len = get_ulong( &args ); ULONG *retlen = get_ptr( &args ); - FIXME( "%p %p %u %p %u %p: stub\n", handle, info, count, ptr, len, retlen ); + FIXME( "%p %p %lu %p %lu %p: stub\n", handle, info, count, ptr, len, retlen ); return STATUS_SUCCESS; } diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 1c8f82d9a3a..680f5a6ec56 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -110,7 +110,7 @@ NTSTATUS WINAPI wow64_NtAdjustGroupsToken( UINT *args ) TOKEN_GROUPS32 *prev = get_ptr( &args ); ULONG *retlen = get_ptr( &args ); - FIXME( "%p %d %p %u %p %p\n", handle, reset, groups, len, prev, retlen ); + FIXME( "%p %d %p %lu %p %p\n", handle, reset, groups, len, prev, retlen ); return STATUS_NOT_IMPLEMENTED; } @@ -146,7 +146,7 @@ NTSTATUS WINAPI wow64_NtCreateLowBoxToken( UINT *args ) ULONG handle_count = get_ulong( &args ); ULONG *handles32 = get_ptr( &args ); - FIXME( "%p %p %x %p %p %u %p %u %p: stub\n", + FIXME( "%p %p %lx %p %p %lu %p %lu %p: stub\n", handle_ptr, token, access, attr32, sid, count, capabilities32, handle_count, handles32 ); *handle_ptr = 0; diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index b8f3fabe06c..d4122ddf3f3 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -141,7 +141,7 @@ NTSTATUS WINAPI wow64_NtAcceptConnectPort( UINT *args ) LPC_SECTION_WRITE *write = get_ptr( &args ); LPC_SECTION_READ *read = get_ptr( &args ); - FIXME( "%p %u %p %u %p %p: stub\n", handle_ptr, id, msg, accept, write, read ); + FIXME( "%p %lu %p %u %p %p: stub\n", handle_ptr, id, msg, accept, write, read ); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 42e852f4d28..7cab0894738 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -455,9 +455,9 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ thunks[start_pos + table_pos] = (syscall_thunk)orig_table->ServiceTable[wrap_pos++]; max_pos = max( table_pos, max_pos ); } - else ERR( "invalid syscall id %04x for %s\n", id, name ); + else ERR( "invalid syscall id %04lx for %s\n", id, name ); } - else ERR( "wrong syscall table id %04x for %s\n", id, name ); + else ERR( "wrong syscall table id %04lx for %s\n", id, name ); } else if (res > 0) { @@ -465,7 +465,7 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ wrap_pos++; exp_pos--; /* try again */ } - else FIXME( "missing wrapper for syscall %04x %s\n", id, name ); + else FIXME( "missing wrapper for syscall %04lx %s\n", id, name ); } for ( ; wrap_pos < orig_table->ServiceLimit; wrap_pos++) @@ -492,7 +492,7 @@ static HMODULE load_64bit_module( const WCHAR *name ) RtlInitUnicodeString( &str, path ); if ((status = LdrLoadDll( NULL, 0, &str, &module ))) { - ERR( "failed to load dll %x\n", status ); + ERR( "failed to load dll %lx\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } return module; @@ -535,7 +535,7 @@ static HMODULE load_32bit_module( const WCHAR *name ) if (!status) return module; failed: - ERR( "failed to load dll %x\n", status ); + ERR( "failed to load dll %lx\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); return NULL; } diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 092319cba84..0727bc25bbe 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -686,7 +686,7 @@ NTSTATUS WINAPI wow64_NtRaiseHardError( UINT *args ) HARDERROR_RESPONSE_OPTION option = get_ulong( &args ); HARDERROR_RESPONSE *response = get_ptr( &args ); - FIXME( "%08x %u %x %p %u %p: stub\n", status, count, params_mask, params, option, response ); + FIXME( "%08lx %lu %lx %p %u %p: stub\n", status, count, params_mask, params, option, response ); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index f4cd50d0ea2..fc470c07923 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -77,7 +77,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) SIZE_T size; NTSTATUS status; - if (count) FIXME( "%d extended parameters %p\n", count, params ); + if (count) FIXME( "%ld extended parameters %p\n", count, params ); status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), type, protect, params, count ); if (!status) @@ -430,7 +430,7 @@ NTSTATUS WINAPI wow64_NtSetLdtEntries( UINT *args ) ULONG entry2_low = get_ulong( &args ); ULONG entry2_high = get_ulong( &args ); - FIXME( "%04x %08x %08x %04x %08x %08x: stub\n", + FIXME( "%04lx %08lx %08lx %04lx %08lx %08lx: stub\n", sel1, entry1_low, entry1_high, sel2, entry2_low, entry2_high ); return STATUS_NOT_IMPLEMENTED; } -- 2.34.1

1 0

[PATCH v2 1/5] shlwapi/tests: Remove workarounds from url.c for no longer supported Windows versions.
by Zebediah Figura 11 Feb '22

11 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 66 ++++++++++++---------------------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 703bdcd0a55..65fc2cfedd1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -295,7 +295,6 @@ typedef struct _TEST_URL_ESCAPEW { DWORD flags; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ - const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { @@ -311,12 +310,10 @@ static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { {'M','a','%','D','F',0}}, /* 0x2070E */ {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd841,0xdf0e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, /* 0x27A3E */ {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd85e,0xde3e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, @@ -414,12 +411,7 @@ static const struct { {"c:\\foo/b a%r", "file:///c:/foo/b%20a%25r", S_OK}, {"c:\\foo\\foo bar", "file:///c:/foo/foo%20bar", S_OK}, {"file:///c:/foo/bar", "file:///c:/foo/bar", S_FALSE}, -#if 0 - /* The following test fails on native shlwapi as distributed with Win95/98. - * Wine matches the behaviour of later versions. - */ {"xx:c:\\foo\\bar", "xx:c:\\foo\\bar", S_FALSE} -#endif }; /* ################ */ @@ -614,8 +606,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const dwSize = 1; res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); - ok(dwSize == strlen(szExpected)+1 || - (*szExpected == '?' && dwSize == strlen(szExpected)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(dwSize == strlen(szExpected) + 1, "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; @@ -638,9 +630,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const FreeWideString(wszConvertedPart); FreeWideString(wszUrl); - /* Note that v6.0 and later don't return '?' with the query */ - ok(strcmp(szPart,szExpected)==0 || - (*szExpected=='?' && !strcmp(szPart,szExpected+1)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(!strcmp(szPart,szExpected), "Expected %s, but got %s\n", szExpected, szPart); } @@ -707,7 +698,7 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); - test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "query=x&return=y"); test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); @@ -855,10 +846,8 @@ static void test_UrlEscapeA(void) size = 1; empty_string[0] = 127; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); - ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ - "got %x, expected %x\n", ret, E_NOTIMPL); - ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ - "got %d, expected %d\n", size, 1); + ok(ret == E_NOTIMPL, "Got unexpected hr %#x.\n", ret); + ok(size == 1, "Got unexpected size %u.\n", size); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); for (i = 0; i < ARRAY_SIZE(TEST_ESCAPE); i++) { @@ -962,12 +951,10 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); - ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), - "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", - wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), - wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!wcscmp(ret_url, TEST_ESCAPEW[i].expecturl) + || broken(!wcscmp(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected %s, but got %s for %s.\n", debugstr_w(TEST_ESCAPEW[i].expecturl), + debugstr_w(ret_url), debugstr_w(TEST_ESCAPEW[i].url)); } } @@ -1484,36 +1471,27 @@ static void test_HashData(void) /* Test hashing with identically sized input/output buffers. */ res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected, sizeof(expected)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected, sizeof(expected)), "data didn't match\n"); /* Test hashing with larger output buffer. */ res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected2, sizeof(expected2)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected2, sizeof(expected2)), "data didn't match\n"); /* Test hashing with smaller input buffer. */ res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected3, sizeof(expected3)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected3, sizeof(expected3)), "data didn't match\n"); /* Test passing NULL pointers for input/output parameters. */ res = HashData(NULL, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(input, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(NULL, 0, output, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); /* Test passing valid pointers with sizes of zero. */ for (i = 0; i < ARRAY_SIZE(input); i++) @@ -1527,16 +1505,10 @@ static void test_HashData(void) /* The buffers should be unchanged. */ for (i = 0; i < ARRAY_SIZE(input); i++) - { ok(input[i] == 0x00, "Expected the input buffer to be unchanged\n"); - if(input[i] != 0x00) break; - } for (i = 0; i < ARRAY_SIZE(output); i++) - { ok(output[i] == 0xFF, "Expected the output buffer to be unchanged\n"); - if(output[i] != 0xFF) break; - } /* Input/output parameters are not validated. */ res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); -- 2.34.1

1 4

[PATCH v2 1/5] ws2_32/tests: Use winetest_push_context() in test_WSAStringToAddress().
by Zebediah Figura 11 Feb '22

11 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/protocol.c | 86 ++++++++++++++---------------------- 1 file changed, 33 insertions(+), 53 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1ff335f7fe2..d902d399c00 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1403,12 +1403,11 @@ static void test_WSAStringToAddress(void) { "", { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, WSAEINVAL }, }; + int len, ret, expected_len; WCHAR inputW[64]; - INT len, ret, expected_len, expected_ret; - short expected_family; SOCKADDR_IN sockaddr; SOCKADDR_IN6 sockaddr6; - int i, j; + unsigned int i, j; len = 0; WSASetLastError( 0 ); @@ -1420,12 +1419,16 @@ static void test_WSAStringToAddress(void) for (i = 0; i < 2; i++) { + winetest_push_context( i ? "unicode" : "ascii" ); + for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++) { len = sizeof(sockaddr) + 10; expected_len = ipv4_tests[j].error ? len : sizeof(sockaddr); memset( &sockaddr, 0xab, sizeof(sockaddr) ); + winetest_push_context( "addr %s", debugstr_a(ipv4_tests[j].input) ); + WSASetLastError( 0 ); if (i == 0) { @@ -1436,26 +1439,16 @@ static void test_WSAStringToAddress(void) MultiByteToWideChar( CP_ACP, 0, ipv4_tests[j].input, -1, inputW, ARRAY_SIZE(inputW) ); ret = WSAStringToAddressW( inputW, AF_INET, NULL, (SOCKADDR *)&sockaddr, &len ); } - expected_ret = ipv4_tests[j].error ? SOCKET_ERROR : 0; - expected_family = ipv4_tests[j].error ? 0 : AF_INET; - ok( ret == expected_ret, - "WSAStringToAddress(%s) returned %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), ret, expected_ret ); - ok( WSAGetLastError() == ipv4_tests[j].error, - "WSAStringToAddress(%s) gave error %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), WSAGetLastError(), ipv4_tests[j].error ); - ok( sockaddr.sin_family == expected_family, - "WSAStringToAddress(%s) gave family %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_family, expected_family ); + ok( ret == (ipv4_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv4_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( sockaddr.sin_family == (ipv4_tests[j].error ? 0 : AF_INET), + "got family %#x\n", sockaddr.sin_family ); ok( sockaddr.sin_addr.s_addr == htonl( ipv4_tests[j].address ), - "WSAStringToAddress(%s) gave address %08x, expected %08x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_addr.s_addr, htonl( ipv4_tests[j].address) ); - ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), - "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, htons( ipv4_tests[j].port ) ); - ok( len == expected_len, - "WSAStringToAddress(%s) gave length %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), len, expected_len ); + "got addr %08x\n", sockaddr.sin_addr.s_addr ); + ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), "got port %u\n", sockaddr.sin_port ); + ok( len == expected_len, "got len %d\n", len ); + + winetest_pop_context(); } for (j = 0; j < ARRAY_SIZE(ipv6_tests); j++) @@ -1479,41 +1472,28 @@ static void test_WSAStringToAddress(void) win_skip("IPv6 not supported\n"); break; } - expected_ret = ipv6_tests[j].error ? SOCKET_ERROR : 0; - expected_family = ipv6_tests[j].error ? 0 : AF_INET6; - ok( ret == expected_ret, - "WSAStringToAddress(%s) returned %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), ret, expected_ret ); - ok( WSAGetLastError() == ipv6_tests[j].error, - "WSAStringToAddress(%s) gave error %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), WSAGetLastError(), ipv6_tests[j].error ); - ok( sockaddr6.sin6_family == expected_family, - "WSAStringToAddress(%s) gave family %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr6.sin6_family, expected_family ); - ok( memcmp(&sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr)) == 0, - "WSAStringToAddress(%s) gave address %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", - wine_dbgstr_a( ipv6_tests[j].input ), + + winetest_push_context( "addr %s", debugstr_a(ipv6_tests[j].input) ); + + ok( ret == (ipv6_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv6_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( sockaddr6.sin6_family == (ipv6_tests[j].error ? 0 : AF_INET6), + "got family %#x\n", sockaddr6.sin6_family ); + ok( !memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) ), + "got addr %x:%x:%x:%x:%x:%x:%x:%x\n", sockaddr6.sin6_addr.s6_words[0], sockaddr6.sin6_addr.s6_words[1], sockaddr6.sin6_addr.s6_words[2], sockaddr6.sin6_addr.s6_words[3], sockaddr6.sin6_addr.s6_words[4], sockaddr6.sin6_addr.s6_words[5], - sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7], - ipv6_tests[j].address[0], ipv6_tests[j].address[1], - ipv6_tests[j].address[2], ipv6_tests[j].address[3], - ipv6_tests[j].address[4], ipv6_tests[j].address[5], - ipv6_tests[j].address[6], ipv6_tests[j].address[7] ); - ok( sockaddr6.sin6_scope_id == 0, - "WSAStringToAddress(%s) gave scope %d, expected 0\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_scope_id ); - ok( sockaddr6.sin6_port == ipv6_tests[j].port, - "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_port, ipv6_tests[j].port ); - ok( sockaddr6.sin6_flowinfo == 0, - "WSAStringToAddress(%s) gave flowinfo %d, expected 0\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_flowinfo ); - ok( len == expected_len, - "WSAStringToAddress(%s) gave length %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), len, expected_len ); + sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7] ); + ok( !sockaddr6.sin6_scope_id, "got scope id %u\n", sockaddr6.sin6_scope_id ); + ok( sockaddr6.sin6_port == ipv6_tests[j].port, "got port %u\n", sockaddr6.sin6_port ); + ok( !sockaddr6.sin6_flowinfo, "got flowinfo %u\n", sockaddr6.sin6_flowinfo ); + ok( len == expected_len, "got len %d\n", len ); + + winetest_pop_context(); } + + winetest_pop_context(); } } -- 2.34.1

2 5

[PATCH 1/5] ws2_32/tests: Use winetest_push_context() in test_WSAStringToAddress().
by Zebediah Figura 11 Feb '22

11 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/protocol.c | 88 ++++++++++++++---------------------- 1 file changed, 33 insertions(+), 55 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1ff335f7fe2..81b2067d704 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1404,11 +1404,10 @@ static void test_WSAStringToAddress(void) }; WCHAR inputW[64]; - INT len, ret, expected_len, expected_ret; - short expected_family; SOCKADDR_IN sockaddr; SOCKADDR_IN6 sockaddr6; - int i, j; + unsigned int i, j; + int len, ret; len = 0; WSASetLastError( 0 ); @@ -1420,12 +1419,15 @@ static void test_WSAStringToAddress(void) for (i = 0; i < 2; i++) { + winetest_push_context( i ? "unicode" : "ascii" ); + for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++) { len = sizeof(sockaddr) + 10; - expected_len = ipv4_tests[j].error ? len : sizeof(sockaddr); memset( &sockaddr, 0xab, sizeof(sockaddr) ); + winetest_push_context( "addr %s", debugstr_a(ipv4_tests[j].input) ); + WSASetLastError( 0 ); if (i == 0) { @@ -1436,32 +1438,21 @@ static void test_WSAStringToAddress(void) MultiByteToWideChar( CP_ACP, 0, ipv4_tests[j].input, -1, inputW, ARRAY_SIZE(inputW) ); ret = WSAStringToAddressW( inputW, AF_INET, NULL, (SOCKADDR *)&sockaddr, &len ); } - expected_ret = ipv4_tests[j].error ? SOCKET_ERROR : 0; - expected_family = ipv4_tests[j].error ? 0 : AF_INET; - ok( ret == expected_ret, - "WSAStringToAddress(%s) returned %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), ret, expected_ret ); - ok( WSAGetLastError() == ipv4_tests[j].error, - "WSAStringToAddress(%s) gave error %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), WSAGetLastError(), ipv4_tests[j].error ); - ok( sockaddr.sin_family == expected_family, - "WSAStringToAddress(%s) gave family %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_family, expected_family ); + ok( ret == (ipv4_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv4_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( sockaddr.sin_family == (ipv4_tests[j].error ? 0 : AF_INET), + "got family %#x\n", sockaddr.sin_family ); ok( sockaddr.sin_addr.s_addr == htonl( ipv4_tests[j].address ), - "WSAStringToAddress(%s) gave address %08x, expected %08x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_addr.s_addr, htonl( ipv4_tests[j].address) ); - ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), - "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, htons( ipv4_tests[j].port ) ); - ok( len == expected_len, - "WSAStringToAddress(%s) gave length %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), len, expected_len ); + "got addr %08x\n", sockaddr.sin_addr.s_addr ); + ok( sockaddr.sin_port == htons( ipv4_tests[j].port ), "got port %u\n", sockaddr.sin_port ); + ok( len == (ipv4_tests[j].error ? len : sizeof(sockaddr)), "got len %d\n", len ); + + winetest_pop_context(); } for (j = 0; j < ARRAY_SIZE(ipv6_tests); j++) { len = sizeof(sockaddr6) + 10; - expected_len = ipv6_tests[j].error ? len : sizeof(sockaddr6); memset( &sockaddr6, 0xab, sizeof(sockaddr6) ); WSASetLastError( 0 ); @@ -1479,41 +1470,28 @@ static void test_WSAStringToAddress(void) win_skip("IPv6 not supported\n"); break; } - expected_ret = ipv6_tests[j].error ? SOCKET_ERROR : 0; - expected_family = ipv6_tests[j].error ? 0 : AF_INET6; - ok( ret == expected_ret, - "WSAStringToAddress(%s) returned %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), ret, expected_ret ); - ok( WSAGetLastError() == ipv6_tests[j].error, - "WSAStringToAddress(%s) gave error %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), WSAGetLastError(), ipv6_tests[j].error ); - ok( sockaddr6.sin6_family == expected_family, - "WSAStringToAddress(%s) gave family %d, expected %d\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr6.sin6_family, expected_family ); - ok( memcmp(&sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr)) == 0, - "WSAStringToAddress(%s) gave address %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", - wine_dbgstr_a( ipv6_tests[j].input ), + + winetest_push_context( "addr %s", debugstr_a(ipv6_tests[j].input) ); + + ok( ret == (ipv6_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv6_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( sockaddr6.sin6_family == (ipv6_tests[j].error ? 0 : AF_INET6), + "got family %#x\n", sockaddr6.sin6_family ); + ok( !memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) ), + "got addr %x:%x:%x:%x:%x:%x:%x:%x\n", sockaddr6.sin6_addr.s6_words[0], sockaddr6.sin6_addr.s6_words[1], sockaddr6.sin6_addr.s6_words[2], sockaddr6.sin6_addr.s6_words[3], sockaddr6.sin6_addr.s6_words[4], sockaddr6.sin6_addr.s6_words[5], - sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7], - ipv6_tests[j].address[0], ipv6_tests[j].address[1], - ipv6_tests[j].address[2], ipv6_tests[j].address[3], - ipv6_tests[j].address[4], ipv6_tests[j].address[5], - ipv6_tests[j].address[6], ipv6_tests[j].address[7] ); - ok( sockaddr6.sin6_scope_id == 0, - "WSAStringToAddress(%s) gave scope %d, expected 0\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_scope_id ); - ok( sockaddr6.sin6_port == ipv6_tests[j].port, - "WSAStringToAddress(%s) gave port %04x, expected %04x\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_port, ipv6_tests[j].port ); - ok( sockaddr6.sin6_flowinfo == 0, - "WSAStringToAddress(%s) gave flowinfo %d, expected 0\n", - wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_flowinfo ); - ok( len == expected_len, - "WSAStringToAddress(%s) gave length %d, expected %d\n", - wine_dbgstr_a( ipv6_tests[j].input ), len, expected_len ); + sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7] ); + ok( !sockaddr6.sin6_scope_id, "got scope id %u\n", sockaddr6.sin6_scope_id ); + ok( sockaddr6.sin6_port == ipv6_tests[j].port, "got port %u\n", sockaddr6.sin6_port ); + ok( !sockaddr6.sin6_flowinfo, "got flowinfo %u\n", sockaddr6.sin6_flowinfo ); + ok( len == (ipv6_tests[j].error ? len : sizeof(sockaddr)), "got len %d\n", len ); + + winetest_pop_context(); } + + winetest_pop_context(); } } -- 2.34.1

2 8

[PATCH v7 1/5] api-ms-win-core-privateprofile-l1-1-0: Add dll.
by Mohamad Al-Jaf 11 Feb '22

11 Feb '22

Needed for native mfc42u.dll. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v7: Rebase. --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-privateprofile-l1-1-0.spec | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec diff --git a/configure.ac b/configure.ac index e51e114c45e..f018256bd22 100644 --- a/configure.ac +++ b/configure.ac @@ -2416,6 +2416,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-normalization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-path-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in new file mode 100644 index 00000000000..c8b8ef84aef --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-privateprofile-l1-1-0.dll diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec new file mode 100644 index 00000000000..c8153c3a296 --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA +@ stdcall GetPrivateProfileIntW(wstr wstr long wstr) kernel32.GetPrivateProfileIntW +@ stdcall GetPrivateProfileSectionW(wstr ptr long wstr) kernel32.GetPrivateProfileSectionW +@ stdcall GetPrivateProfileStringA(str str str ptr long str) kernel32.GetPrivateProfileStringA +@ stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) kernel32.GetPrivateProfileStringW +@ stdcall GetProfileIntA(str str long) kernel32.GetProfileIntA +@ stdcall GetProfileIntW(wstr wstr long) kernel32.GetProfileIntW +@ stdcall GetProfileSectionA(str ptr long) kernel32.GetProfileSectionA +@ stdcall GetProfileSectionW(wstr ptr long) kernel32.GetProfileSectionW +@ stdcall GetProfileStringA(str str str ptr long) kernel32.GetProfileStringA +@ stdcall GetProfileStringW(wstr wstr wstr ptr long) kernel32.GetProfileStringW +@ stdcall WritePrivateProfileSectionA(str str str) kernel32.WritePrivateProfileSectionA +@ stdcall WritePrivateProfileStringA(str str str str) kernel32.WritePrivateProfileStringA +@ stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW -- 2.35.1

1 4

[PATCH] dmstyle/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 10 Feb '22

10 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/Makefile.in | 1 - dlls/dmstyle/tests/dmstyle.c | 152 ++++++++++++++++----------------- 2 files changed, 76 insertions(+), 77 deletions(-) diff --git a/dlls/dmstyle/tests/Makefile.in b/dlls/dmstyle/tests/Makefile.in index a98f5dd6c27..ec8b0636014 100644 --- a/dlls/dmstyle/tests/Makefile.in +++ b/dlls/dmstyle/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmstyle.dll IMPORTS = ole32 diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 69c33ad73cf..4b16cdad1a1 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -55,13 +55,13 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dms8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicStyle8 create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dms8, "dms8 = %p\n", dms8); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dms8); - ok(hr == E_NOINTERFACE, "DirectMusicStyle8 create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicStyle8 create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicStyle8 interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, @@ -70,26 +70,26 @@ static void test_COM(void) win_skip("Old version without IDirectMusicStyle8\n"); return; } - ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicStyle8 create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicStyle8_AddRef(dms8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicStyle8_QueryInterface(dms8, &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 == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicStyle8_QueryInterface(dms8, &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 == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicStyle8_Release(dms8)); @@ -107,36 +107,36 @@ static void test_COM_section(void) hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmo); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSection create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmo, "dmo = %p\n", dmo); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmo); todo_wine ok(hr == E_NOINTERFACE, - "DirectMusicSection create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectMusicSection create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicObject interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); - todo_wine ok(hr == S_OK, "DirectMusicSection create failed: %08x, expected S_OK\n", hr); + todo_wine ok(hr == S_OK, "DirectMusicSection create failed: %#lx, expected S_OK\n", hr); if (hr != S_OK) { skip("DirectMusicSection not implemented\n"); return; } 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); while (IDirectMusicObject_Release(dmo)); @@ -174,32 +174,32 @@ static void test_COM_track(void) continue; } ok(hr == CLASS_E_NOAGGREGATION, - "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + "%s create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); ok(!dmt8, "dmt8 = %p\n", dmt8); /* Invalid RIID */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt8); - ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + ok(hr == E_NOINTERFACE, "%s create failed: %#lx, expected E_NOINTERFACE\n", class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); refcount = IDirectMusicTrack8_AddRef(dmt8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack8_QueryInterface(dmt8, &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 = IDirectMusicTrack8_QueryInterface(dmt8, &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); while (IDirectMusicTrack8_Release(dmt8)); @@ -216,23 +216,23 @@ static void test_dmstyle(void) hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicStyle, (void**)&dms); - ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicStyle create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicStyle_QueryInterface(dms, &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_DirectMusicStyle), "Expected class CLSID_DirectMusicStyle 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 (IDirectMusicStyle_Release(dms)); } @@ -244,7 +244,7 @@ static void expect_getparam(IDirectMusicTrack8 *track, REFGUID type, const char char buf[64] = { 0 }; hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); - ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "GetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void expect_setparam(IDirectMusicTrack8 *track, REFGUID type, const char *name, @@ -253,7 +253,7 @@ static void expect_setparam(IDirectMusicTrack8 *track, REFGUID type, const char HRESULT hr; hr = IDirectMusicTrack8_SetParam(track, type, 0, track); - ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "SetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void test_track(void) @@ -322,36 +322,36 @@ static void test_track(void) trace("Testing %s\n", class[i].name); hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack8_Init(dmt8, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); if (class[i].clsid != &CLSID_DirectMusicChordTrack && class[i].clsid != &CLSID_DirectMusicCommandTrack) { /* Crashes on native */ hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); if (class[i].clsid == &CLSID_DirectMusicMuteTrack) - ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); else - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); } hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); if (class[i].has_params & (1 << j)) - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[j].name, hr); else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); if (class[i].clsid == &CLSID_DirectMusicChordTrack) { expect_setparam(dmt8, param_types[j].type, param_types[j].name, @@ -410,53 +410,53 @@ static void test_track(void) if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); } else todo_wine { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); } todo_wine { hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); if (class[i].has_join) { hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); } else { hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); } /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &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, &classid); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&classid, class[i].clsid), "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); 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); if (class[i].has_save) - ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_POINTER, "IPersistStream_Save failed: %#lx\n", hr); else - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack8_Release(dmt8)); } @@ -570,12 +570,12 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicStyle create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", @@ -585,8 +585,8 @@ static void test_parsedescriptor(void) 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 == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", @@ -596,25 +596,25 @@ static void test_parsedescriptor(void) /* NULL pointers */ 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); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); IStream_Release(stream); /* All desc chunks, DMUS_OBJ_CATEGORY not 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); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); @@ -629,9 +629,9 @@ 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(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), - "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -641,8 +641,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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -650,9 +650,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); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH] dmscript/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 10 Feb '22

10 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/tests/Makefile.in | 1 - dlls/dmscript/tests/dmscript.c | 109 ++++++++++++++++---------------- 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/dlls/dmscript/tests/Makefile.in b/dlls/dmscript/tests/Makefile.in index 5cc5553e2ca..a4b246d0931 100644 --- a/dlls/dmscript/tests/Makefile.in +++ b/dlls/dmscript/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmscript.dll IMPORTS = ole32 diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 30b64d5788d..f3ae2c940d2 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -94,37 +94,37 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicScript create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicScript create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dms); - ok(hr == E_NOINTERFACE, "DirectMusicScript create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicScript create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicScript interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicScript, (void**)&dms); - ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScript create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicScript_AddRef(dms); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicScript_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicScript_QueryInterface(dms, &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 == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicScript_QueryInterface(dms, &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 == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicScript_Release(dms)); @@ -143,32 +143,31 @@ static void test_COM_scripttrack(void) hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicScriptTrack create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt); - ok(hr == E_NOINTERFACE, "DirectMusicScriptTrack create failed: %08x, expected E_NOINTERFACE\n", - hr); + ok(hr == E_NOINTERFACE, "DirectMusicScriptTrack create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicScriptTrack interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmt, &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 = IDirectMusicTrack_QueryInterface(dmt, &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); while (IDirectMusicTrack_Release(dmt)); @@ -184,19 +183,19 @@ static void test_dmscript(void) hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicScript, (void**)&dms); - ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScript create failed: %#lx, expected S_OK\n", hr); /* Unimplemented IPersistStream methods */ hr = IDirectMusicScript_QueryInterface(dms, &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 == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %#lx\n", hr); 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 (IDirectMusicScript_Release(dms)); } @@ -249,67 +248,67 @@ static void test_scripttrack(void) hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt); - ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ todo_wine { hr = IDirectMusicTrack8_Init(dmt, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt, NULL, NULL, NULL, 0, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_EndPlay(dmt, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %#lx\n", hr); } hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); - ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt, unsupported[i].type, 0, NULL, buf); ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt, unsupported[i].type, 0, buf); ok(hr == DMUS_E_SET_UNSUPPORTED, - "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + "SetParam(%s) failed: %#lx, expected DMUS_E_SET_UNSUPPORTED\n", unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_Clone(dmt, 0, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_Compose(dmt, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt, NULL, 0, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt, &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, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got %#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_DirectMusicScriptTrack), "Expected class CLSID_DirectMusicScriptTrack 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 (IDirectMusicTrack8_Release(dmt)); } @@ -370,41 +369,41 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScript create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); todo_wine ok(desc.dwValidData == (DMUS_OBJ_CLASS | 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.guidClass, &CLSID_DirectMusicScript), "Got class guid %s, expected CLSID_DirectMusicScript\n", wine_dbgstr_guid(&desc.guidClass)); ok(!desc.vVersion.dwVersionMS && !desc.vVersion.dwVersionLS, - "Got DMUS_VERSION %u.%u, expected 0.0\n", desc.vVersion.dwVersionMS, + "Got DMUS_VERSION %lu.%lu, expected 0.0\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); /* 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 */ 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_SCRIPT_INVALID_FILE, - "ParseDescriptor failed: %08x, expected DMUS_E_SCRIPT_INVALID_FILE\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_SCRIPT_INVALID_FILE\n", hr); IStream_Release(stream); IDirectMusicObject_Release(dmo); -- 2.34.1

1 0

[PATCH] dmloader/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 10 Feb '22

10 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/tests/Makefile.in | 1 - dlls/dmloader/tests/loader.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmloader/tests/Makefile.in b/dlls/dmloader/tests/Makefile.in index 8eef83551d4..d8be1bce3e4 100644 --- a/dlls/dmloader/tests/Makefile.in +++ b/dlls/dmloader/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmloader.dll IMPORTS = ole32 diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 418a4ebb7a5..01f9fb435fd 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -266,12 +266,12 @@ static void test_COM(void) &IID_IDirectMusicLoader8, (void**)&dml8); ok(hr == S_OK, "DirectMusicLoader create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicLoader8_AddRef(dml8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicLoader8_QueryInterface(dml8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicLoader8_Release(dml8)); @@ -303,24 +303,24 @@ static void test_COM_container(void) &IID_IDirectMusicContainer, (void**)&dmc); ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicContainer_AddRef(dmc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); 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); while (IDirectMusicContainer_Release(dmc)); @@ -355,13 +355,13 @@ static void test_container(void) hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS, - "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData); + "Fresh object has more valid data (%#lx) than DMUS_OBJ_CLASS\n", desc.dwValidData); /* DMUS_OBJ_CLASS is immutable */ desc.dwValidData = DMUS_OBJ_CLASS; desc.dwSize = 1; /* size is ignored */ hr = IDirectMusicObject_SetDescriptor(dmo, &desc); ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); - ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData); + ok(!desc.dwValidData, "dwValidData wasn't cleared: %#lx\n", desc.dwValidData); desc.dwValidData = DMUS_OBJ_CLASS; desc.guidClass = CLSID_DirectMusicSegment; hr = IDirectMusicObject_SetDescriptor(dmo, &desc); @@ -509,7 +509,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), "Got class guid %s, expected CLSID_DirectMusicContainer\n", wine_dbgstr_guid(&desc.guidClass)); @@ -522,7 +522,7 @@ static void test_parsedescriptor(void) desc.dwSize = 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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), "Got class guid %s, expected CLSID_DirectMusicContainer\n", @@ -555,7 +555,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), "Got class guid %s, expected CLSID_DirectMusicContainer\n", wine_dbgstr_guid(&desc.guidClass)); @@ -572,7 +572,7 @@ static void test_parsedescriptor(void) desc.dwSize = 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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -583,7 +583,7 @@ static void test_parsedescriptor(void) desc.dwSize = 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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -594,7 +594,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH 1/2] server: Always place compiler barrier before atomic memory stores.
by Jinoh Kang 10 Feb '22

10 Feb '22

GCC, clang, and other compilers do not actually provide acquire/release semantics on volatile memory accesses. This is also true on MSVC with the /volatile:iso (use strict ISO C semantics for volatile accesses) flag. Consider the following test program: void func(int *foo, volatile int *bar) { *foo = 1; *bar = 2; /* NOTE: *not* immune to reordering! */ *foo = 3; } After store reordering and dead code removal, the function above compiles into the following x86-64 assembly on GCC 11.2 (gcc -O2): movl $2, (%rsi) movl $3, (%rdi) ret Note that the first write to "*foo" has been ellided; the compiler decided that it is safe to reorder writes to "*foo" around writes to the volatile variable "*bar", so it simply merged the first "*foo" write into the second one. Fix this by explicitly specifying a compiler memory barrier before the atomic store. As a workaround for GCC bug #81316, we do this even for other architectures where we explicitly use the atomic memory access builtin. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- server/fd.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/fd.c b/server/fd.c index 1b4b98b0e76..5865db89c33 100644 --- a/server/fd.c +++ b/server/fd.c @@ -381,10 +381,15 @@ static const int user_shared_data_timeout = 16; static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) { - /* on x86 there should be total store order guarantees, so volatile is - * enough to ensure the stores aren't reordered by the compiler, and then - * they will always be seen in-order from other CPUs. On other archs, we - * need atomic intrinsics to guarantee that. */ + /* on x86 there should be total store order guarantees, so a compiler + * barrier is enough to ensure the stores aren't reordered by the compiler; + * then, they will always be seen in-order from other CPUs. On other archs, + * we need atomic intrinsics to guarantee that. + * + * even when using atomic intrinsics, we explicitly place a memory barrier + * to work around GCC bug #81316 (affects all GCC versions prior to 7.x). + */ + __asm__ __volatile__("" ::: "memory"); #if defined(__i386__) || defined(__x86_64__) *ptr = value; #else @@ -394,6 +399,10 @@ static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) static void atomic_store_long(volatile LONG *ptr, LONG value) { + /* even when using atomic intrinsics, we explicitly place a memory barrier + * to work around GCC bug #81316 (affects all GCC versions prior to 7.x). + */ + __asm__ __volatile__("" ::: "memory"); #if defined(__i386__) || defined(__x86_64__) *ptr = value; #else -- 2.34.1

4 9

[PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs
by Dean Greer 10 Feb '22

10 Feb '22

>From 10392f7f4f469f266016542b1d3c0b7d39d59bbc Mon Sep 17 00:00:00 2001 From: Dean M Greer <gcenx83(a)gmail.com> Date: Sun, 23 Jan 2022 13:58:38 -0500 Subject: [PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs Fixes a regression introduced by https://source.winehq.org/git/wine.git/commit/e58b1a2b395b56859157e7dd8d08c… Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- dlls/winemac.drv/cocoa_app.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e5caad00a870..52c91c0621f1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -56,6 +56,7 @@ #define NSWindowStyleMaskResizable NSResizableWindowMask #define NSWindowStyleMaskTitled NSTitledWindowMask #define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#define NSWindowStyleMaskNonactivatingPanel NSNonactivatingPanelMask #endif #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) --

4 5

[tools 1/3] testbot/LibvirtTool: Do not require '-off' to be at the end of the snapshot name.
by Francois Gouget 10 Feb '22

10 Feb '22

One could certainly reorder the elements of the snapshot name so '-off' is the last part but it's not always natural. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For now this is just for the TestBot administrator convenience but a later patch will make the snapshot name parsing more modular and the flags (including -off) will be position independent. So ShutDown() will be ready when then. --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 681223f11c..f14d54cd3b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -284,7 +284,7 @@ sub ShutDown() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); - if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off\b/ or !$Domain->IsPoweredOn()) { return 1; -- 2.30.2

1 2

[PATCH 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura 10 Feb '22

10 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

2 4

[PATCH 8/8] msvcp60: Remove basic_istream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 944 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 144 +++--- 2 files changed, 369 insertions(+), 719 deletions(-)

1 0

[PATCH 7/8] msvcp60: Remove basic_iostream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 92 +++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 12 ++--- 2 files changed, 37 insertions(+), 67 deletions(-)

1 0

[PATCH 6/8] msvcp60: Remove basic_ofstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 28 ++++----- 2 files changed, 53 insertions(+), 96 deletions(-)

1 0

[PATCH 5/8] msvcp60: Remove basic_ifstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 28 ++++----- 2 files changed, 53 insertions(+), 96 deletions(-)

1 0

[PATCH 4/8] msvcp60: Remove basic_fstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 134 +++++++++++++------------------------- dlls/msvcp60/msvcp60.spec | 32 ++++----- 2 files changed, 61 insertions(+), 105 deletions(-)

1 0

[PATCH 3/8] msvcp60: Remove basic_ostringstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++---- 2 files changed, 44 insertions(+), 97 deletions(-)

1 0

[PATCH 2/8] msvcp60: Remove basic_istringstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++---- 2 files changed, 44 insertions(+), 97 deletions(-)

1 0

[PATCH 1/8] msvcp60: Remove basic_stringstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- basic_stringstream<wchar> is not exported in msvcp60. There are already tons of differences between msvcp60 ios.c and msvcp90 so there's no reason to keep the files as similar as possible. dlls/msvcp60/ios.c | 142 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++--- 2 files changed, 52 insertions(+), 110 deletions(-)

1 0

[PATCH v2 1/5] shlwapi/tests: Remove workarounds from url.c for no longer supported Windows versions.
by Zebediah Figura 10 Feb '22

10 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 66 ++++++++++++---------------------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 703bdcd0a55..65fc2cfedd1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -295,7 +295,6 @@ typedef struct _TEST_URL_ESCAPEW { DWORD flags; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ - const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { @@ -311,12 +310,10 @@ static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { {'M','a','%','D','F',0}}, /* 0x2070E */ {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd841,0xdf0e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, /* 0x27A3E */ {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd85e,0xde3e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, @@ -414,12 +411,7 @@ static const struct { {"c:\\foo/b a%r", "file:///c:/foo/b%20a%25r", S_OK}, {"c:\\foo\\foo bar", "file:///c:/foo/foo%20bar", S_OK}, {"file:///c:/foo/bar", "file:///c:/foo/bar", S_FALSE}, -#if 0 - /* The following test fails on native shlwapi as distributed with Win95/98. - * Wine matches the behaviour of later versions. - */ {"xx:c:\\foo\\bar", "xx:c:\\foo\\bar", S_FALSE} -#endif }; /* ################ */ @@ -614,8 +606,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const dwSize = 1; res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); - ok(dwSize == strlen(szExpected)+1 || - (*szExpected == '?' && dwSize == strlen(szExpected)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(dwSize == strlen(szExpected) + 1, "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; @@ -638,9 +630,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const FreeWideString(wszConvertedPart); FreeWideString(wszUrl); - /* Note that v6.0 and later don't return '?' with the query */ - ok(strcmp(szPart,szExpected)==0 || - (*szExpected=='?' && !strcmp(szPart,szExpected+1)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(!strcmp(szPart,szExpected), "Expected %s, but got %s\n", szExpected, szPart); } @@ -707,7 +698,7 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); - test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "query=x&return=y"); test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); @@ -855,10 +846,8 @@ static void test_UrlEscapeA(void) size = 1; empty_string[0] = 127; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); - ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ - "got %x, expected %x\n", ret, E_NOTIMPL); - ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ - "got %d, expected %d\n", size, 1); + ok(ret == E_NOTIMPL, "Got unexpected hr %#x.\n", ret); + ok(size == 1, "Got unexpected size %u.\n", size); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); for (i = 0; i < ARRAY_SIZE(TEST_ESCAPE); i++) { @@ -962,12 +951,10 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); - ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), - "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", - wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), - wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!wcscmp(ret_url, TEST_ESCAPEW[i].expecturl) + || broken(!wcscmp(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected %s, but got %s for %s.\n", debugstr_w(TEST_ESCAPEW[i].expecturl), + debugstr_w(ret_url), debugstr_w(TEST_ESCAPEW[i].url)); } } @@ -1484,36 +1471,27 @@ static void test_HashData(void) /* Test hashing with identically sized input/output buffers. */ res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected, sizeof(expected)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected, sizeof(expected)), "data didn't match\n"); /* Test hashing with larger output buffer. */ res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected2, sizeof(expected2)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected2, sizeof(expected2)), "data didn't match\n"); /* Test hashing with smaller input buffer. */ res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected3, sizeof(expected3)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected3, sizeof(expected3)), "data didn't match\n"); /* Test passing NULL pointers for input/output parameters. */ res = HashData(NULL, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(input, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(NULL, 0, output, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); /* Test passing valid pointers with sizes of zero. */ for (i = 0; i < ARRAY_SIZE(input); i++) @@ -1527,16 +1505,10 @@ static void test_HashData(void) /* The buffers should be unchanged. */ for (i = 0; i < ARRAY_SIZE(input); i++) - { ok(input[i] == 0x00, "Expected the input buffer to be unchanged\n"); - if(input[i] != 0x00) break; - } for (i = 0; i < ARRAY_SIZE(output); i++) - { ok(output[i] == 0xFF, "Expected the output buffer to be unchanged\n"); - if(output[i] != 0xFF) break; - } /* Input/output parameters are not validated. */ res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); -- 2.34.1

2 6

[PATCH 1/2] ntdll: Guard against syscall stack overrun.
by Paul Gofman 10 Feb '22

10 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- So when the overrun happens we get a syscall error instead of smashing user stack. dlls/ntdll/unix/signal_arm.c | 4 ++++ dlls/ntdll/unix/signal_arm64.c | 4 ++++ dlls/ntdll/unix/signal_i386.c | 4 ++++ dlls/ntdll/unix/signal_x86_64.c | 4 ++++ dlls/ntdll/unix/unix_private.h | 10 +++++++++- dlls/ntdll/unix/virtual.c | 5 +++++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..02267e1c285 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -780,6 +780,10 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) (DWORD)IP_sig(context), (DWORD)SP_sig(context), (DWORD)LR_sig(context), (DWORD)PC_sig(context), (DWORD)CPSR_sig(context) ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 94f280e218a..7056adca171 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -834,6 +834,10 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) (DWORD64)REGn_sig(28, context), (DWORD64)FP_sig(context), (DWORD64)LR_sig(context), (DWORD64)SP_sig(context) ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..4bc4bd321ac 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1716,6 +1716,10 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, context->Ebp, context->Esp, context->SegCs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68855dccacf..7c39fe5f9bc 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2525,6 +2525,10 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, TRACE_(seh)( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", context->R12, context->R13, context->R14, context->R15 ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE_(seh)( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a79edabc37c..07c7bebba4d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -85,7 +85,8 @@ static const SIZE_T teb_size = 0x3800; /* TEB64 + TEB32 + debug info */ static const SIZE_T signal_stack_mask = 0xffff; static const SIZE_T signal_stack_size = 0x10000 - 0x3800; static const SIZE_T kernel_stack_size = 0x20000; -static const SIZE_T min_kernel_stack = 0x2000; +static const SIZE_T kernel_stack_guard_size = 0x1000; +static const SIZE_T min_kernel_stack = 0x3000; static const LONG teb_offset = 0x2000; #define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) @@ -318,6 +319,13 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +static inline BOOL is_inside_syscall_stack_guard( const char *stack_ptr ) +{ + const char *kernel_stack = ntdll_get_thread_data()->kernel_stack; + + return (stack_ptr >= kernel_stack && stack_ptr < kernel_stack + kernel_stack_guard_size); +} + static inline void mutex_lock( pthread_mutex_t *mutex ) { if (!process_exiting) pthread_mutex_lock( mutex ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..621e7be996d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3100,6 +3100,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI SIZE_T commit_size, SIZE_T extra_size ) { struct file_view *view; + char *kernel_stack; NTSTATUS status; sigset_t sigset; SIZE_T size; @@ -3143,6 +3144,10 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI delete_view( view ); goto done; } + /* setup kernel stack no access guard page */ + kernel_stack = (char *)view->base + view->size; + set_page_vprot( kernel_stack, kernel_stack_guard_size, VPROT_COMMITTED ); + mprotect_range( kernel_stack, kernel_stack_guard_size, 0, 0 ); } /* note: limit is lower than base since the stack grows down */ -- 2.34.1

1 1

[PATCH 3/3] server: Store all 64 bits of window id.
by Jacek Caban 10 Feb '22

10 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We already store it as UINT_PTR in WND struct and have a test for that, but it's not the case on server side (so inter-process queries do not work right). This patch reuses extra_value field of the request struct. Changing id type would make the request too large and we don't set extra bytes and window id in the same time anyway. dlls/user32/win.c | 2 +- server/protocol.def | 3 +-- server/window.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 2/3] user32: Destroy window server objects from destroy_thread_windows.
by Jacek Caban 10 Feb '22

10 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This ensures that handle validity is consistent between user32 and server. Without this patch, during the time between destroy_thread_windows() and server noticing that the thread is actually destroyed, the state is inconsistent. dlls/user32/win.c | 9 +++++++++ server/window.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH v5 3/3] user32: DefWindowProc(WM_NCCALCSIZE) should return 0.
by Dmitry Timoshkov 10 Feb '22

10 Feb '22

v3: As suggested by Alexandre changed NC_HandleNCCalcSize to not return a value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 3 ++- dlls/user32/nonclient.c | 9 ++------- dlls/user32/tests/win.c | 6 ------ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ce14d13171f..52584748768 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -168,7 +168,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; +extern void NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index abb73e73ca8..a8978c2d847 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -260,7 +260,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + break; case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 639cca707fb..f944ed568a4 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -346,19 +346,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style * * Handle a WM_NCCALCSIZE message. Called from DefWindowProc(). */ -LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) +void NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) { RECT tmpRect = { 0, 0, 0, 0 }; - LRESULT result = 0; LONG cls_style = GetClassLongW(hwnd, GCL_STYLE); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG exStyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); if (winRect == NULL) - return 0; - - if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; - if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; + return; if (!(style & WS_MINIMIZE)) { @@ -413,7 +409,6 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) winRect->right = winRect->left; winRect->bottom = winRect->top; } - return result; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8c1e8079201..17511d6d142 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1475,7 +1475,6 @@ static void test_nonclient_area(HWND hwnd) rc = rc_window; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); -todo_wine_if(ret != 0) ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -1494,7 +1493,6 @@ todo_wine_if(ret != 0) rc = rc_window; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); -todo_wine_if(ret != 0) ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -12966,25 +12964,21 @@ static void test_WM_NCCALCSIZE(void) params.lppos = &winpos; ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); params.rgrc[0] = window_rect; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); GetWindowRect(hwnd, &window_rect); ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); GetWindowRect(hwnd, &window_rect); ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); -- 2.34.1

2 1

[PATCH 1/3] user32: Use a single lock in destroy_thread_windows.
by Jacek Caban 10 Feb '22

10 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)

1 0

[PATCH v5 2/3] user32/tests: Add more tests for WM_NCCALCSIZE.
by Dmitry Timoshkov 10 Feb '22

10 Feb '22

v4: Rebased to current git. v5: Fixed compiler warnings. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 164 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c01f43d65e9..8c1e8079201 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1003,6 +1003,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR } case WM_WINDOWPOSCHANGED: { + LRESULT ret; RECT rc1, rc2; WINDOWPOS *winpos = (WINDOWPOS *)lparam; ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); @@ -1023,7 +1024,8 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR wine_dbgstr_rect(&rc2)); GetClientRect(hwnd, &rc2); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -1076,6 +1078,13 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; case WM_MOUSEACTIVATE: return MA_ACTIVATE; + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1106,6 +1115,13 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR return 0; } break; + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1131,6 +1147,13 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR ok(!got_getminmaxinfo, "tool: WM_GETMINMAXINFO should NOT have been received before WM_NCCREATE\n"); break; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1395,6 +1418,14 @@ static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM DeleteObject(region); return 0; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp); + return ret; + } + default: return DefWindowProcA(hwnd, msg, wp, lp); } @@ -1443,7 +1474,9 @@ static void test_nonclient_area(HWND hwnd) rc = rc_window; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); +todo_wine_if(ret != 0) + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), "client rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d client=%s, calc=%s\n", @@ -1460,7 +1493,9 @@ static void test_nonclient_area(HWND hwnd) FixedAdjustWindowRectEx(&rc_window, style, menu, exstyle); rc = rc_window; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); +todo_wine_if(ret != 0) + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), "synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n", @@ -2353,6 +2388,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L case WM_WINDOWPOSCHANGED: { + LRESULT ret; WINDOWPOS *winpos = (WINDOWPOS *)lparam; RECT rc1, rc2; @@ -2364,7 +2400,8 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); GetWindowRect(hwnd, &rc1); GetClientRect(hwnd, &rc2); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match, window=%s client=%s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -2390,7 +2427,15 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L return 1; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } + return DefWindowProcA(hwnd, msg, wparam, lparam); } @@ -2446,6 +2491,13 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA return 1; } + case WM_NCCALCSIZE: + { + LRESULT ret = DefFrameProcA(hwnd, mdi_client, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } + case WM_CLOSE: PostQuitMessage(0); break; @@ -4657,11 +4709,13 @@ static void test_validatergn(HWND hwnd) static void nccalchelper(HWND hwnd, INT x, INT y, RECT *prc) { + LRESULT ret; RECT rc; MoveWindow( hwnd, 0, 0, x, y, 0); GetWindowRect( hwnd, prc); rc = *prc; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc); + ok(!ret, "got %08lx\n", ret); if (winetest_debug > 1) trace("window rect is %s, nccalc rect is %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(prc)); } @@ -6553,11 +6607,14 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM } case WM_NCCALCSIZE: { + LRESULT ret; RECT rect, *r = (RECT *)lp; GetWindowRect( hwnd, &rect ); ok( EqualRect( &rect, r ), "passed rect %s doesn't match window rect %s\n", wine_dbgstr_rect( r ), wine_dbgstr_rect( &rect )); - return DefWindowProcA(hwnd, msg, wp, lp); + ret = DefWindowProcA(hwnd, msg, wp, lp); + ok(!ret, "got %08lx\n", ret); + return ret; } default: return DefWindowProcA(hwnd, msg, wp, lp); @@ -7467,7 +7524,8 @@ static void test_ShowWindow(void) /* test NC area */ GetWindowRect(hwnd, &rc); SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); @@ -7755,7 +7813,8 @@ static void test_ShowWindow_owned(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -7887,7 +7946,8 @@ static void test_ShowWindow_child(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -8015,7 +8075,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -9049,6 +9110,12 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR ok(minmax->ptMaxSize.y >= mi.rcMonitor.bottom, "%d >= %d\n", minmax->ptMaxSize.y, mi.rcMonitor.bottom); break; } + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp); + return ret; + } } return DefWindowProcA(hwnd, msg, wp, lp); } @@ -9308,6 +9375,13 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM break; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -12848,6 +12922,75 @@ static void test_ncdestroy(void) DestroyWindow(hwnd); } +static void test_WM_NCCALCSIZE(void) +{ + WNDCLASSA cls; + HWND hwnd; + NCCALCSIZE_PARAMS params; + WINDOWPOS winpos; + RECT client_rect, window_rect; + LRESULT ret; + + cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "dummy_window_class"; + ret = RegisterClassA(&cls); + ok(ret, "RegisterClass error %u\n", GetLastError()); + + hwnd = CreateWindowExA(0, "dummy_window_class", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError()); + + GetWindowRect(hwnd, &window_rect); + params.rgrc[0] = window_rect; + params.rgrc[1] = window_rect; + GetClientRect(hwnd, &client_rect); + MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2); + params.rgrc[2] = client_rect; + + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = window_rect.right - window_rect.left; + winpos.cy = window_rect.bottom - window_rect.top; + winpos.flags = SWP_NOMOVE; + params.lppos = &winpos; + + ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + params.rgrc[0] = window_rect; + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + GetWindowRect(hwnd, &window_rect); + ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + GetWindowRect(hwnd, &window_rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -13029,6 +13172,7 @@ START_TEST(win) test_SC_SIZE(); test_cancel_mode(); test_DragDetect(); + test_WM_NCCALCSIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.34.1

2 1

[PATCH] mfreadwrite: Introduce an internal source reader refcount.
by Rémi Bernon 10 Feb '22

10 Feb '22

To decide when to shutdown the media source. Otherwise the references hold by the callbacks from BeginGetEvent and others are keeping the source reader alive and the IMFMediaSource_Shutdown is never called. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 41 +++++++++++++++++++++++++-------- dlls/mfreadwrite/tests/mfplat.c | 8 +++++-- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index be77e1c5b1d..18509e067b3 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -153,6 +153,7 @@ struct source_reader IMFAsyncCallback source_events_callback; IMFAsyncCallback stream_events_callback; IMFAsyncCallback async_commands_callback; + LONG internal_refcount; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -203,6 +204,9 @@ static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVi return CONTAINING_RECORD(iface, struct media_stream, notify_cb); } +static ULONG WINAPI src_reader_internal_addref(struct source_reader *reader); +static ULONG WINAPI src_reader_internal_release(struct source_reader *reader); + static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -325,13 +329,13 @@ static HRESULT WINAPI source_reader_callback_QueryInterface(IMFAsyncCallback *if static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return src_reader_internal_addref(reader); } static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return src_reader_internal_release(reader); } static HRESULT WINAPI source_reader_callback_GetParameters(IMFAsyncCallback *iface, @@ -611,13 +615,13 @@ static const IMFAsyncCallbackVtbl source_events_callback_vtbl = static ULONG WINAPI source_reader_stream_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return src_reader_internal_addref(reader); } static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return src_reader_internal_release(reader); } static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, struct media_stream *stream) @@ -888,13 +892,13 @@ static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = static ULONG WINAPI source_reader_async_commands_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return src_reader_internal_addref(reader); } static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return src_reader_internal_release(reader); } static struct stream_response * media_stream_detach_response(struct source_reader *reader, struct stream_response *response) @@ -1337,16 +1341,34 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedDecrement(&reader->refcount); - unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { - if (reader->async_callback) - IMFSourceReaderCallback_Release(reader->async_callback); if (reader->flags & SOURCE_READER_SHUTDOWN_ON_RELEASE) IMFMediaSource_Shutdown(reader->source); + src_reader_internal_release(reader); + } + + return refcount; +} + +static ULONG WINAPI src_reader_internal_addref(struct source_reader *reader) +{ + ULONG refcount = InterlockedIncrement(&reader->internal_refcount); + return refcount; +} + +static ULONG WINAPI src_reader_internal_release(struct source_reader *reader) +{ + ULONG refcount = InterlockedDecrement(&reader->internal_refcount); + unsigned int i; + + if (!refcount) + { + if (reader->async_callback) + IMFSourceReaderCallback_Release(reader->async_callback); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); if (reader->attributes) @@ -2267,6 +2289,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->async_commands_callback.lpVtbl = &async_commands_callback_vtbl; + object->internal_refcount = 1; object->refcount = 1; list_init(&object->responses); if (shutdown_on_release) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 7e724344168..0791f51fa37 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -862,7 +862,8 @@ skip_read_sample: hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_ALL_STREAMS); ok(hr == S_OK, "Failed to flush all streams, hr %#x.\n", hr); - IMFSourceReader_Release(reader); + refcount = IMFSourceReader_Release(reader); + ok(refcount == 0, "Release returned %u.\n", refcount); /* Async mode. */ callback = create_async_callback(); @@ -883,7 +884,10 @@ todo_wine { } IMFAttributes_Release(attributes); if (hr == S_OK) - IMFSourceReader_Release(reader); + { + refcount = IMFSourceReader_Release(reader); + ok(refcount == 0, "Release returned %u.\n", refcount); + } IMFByteStream_Release(stream); } -- 2.34.1

3 5

[PATCH 1/3] wined3d: Initialize map_ptr to NULL in wined3d_context_vk_create_slab_bo().
by Zebediah Figura 10 Feb '22

10 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..f3ec5c03c85 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -456,6 +456,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; + bo->b.map_ptr = NULL; bo->b.buffer_offset = idx * object_size; bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; bo->size = size; -- 2.34.1

2 5

[PATCH v5 1/3] user32/tests: Add more missing ShowWindow() return value checks.
by Dmitry Timoshkov 10 Feb '22

10 Feb '22

Also change 'BOOL ret' to 'LRESULT ret' to avoid introducing new variable for DefWindowProc() return value checks in the next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3ace25056de..c01f43d65e9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7695,7 +7695,7 @@ static void test_ShowWindow_owned(HWND hwndMain) { MONITORINFO mon_info = {sizeof(mon_info)}; RECT rect, orig, expect, nc; - BOOL ret; + LPARAM ret; HWND hwnd, hwnd2; LONG style; @@ -7722,7 +7722,7 @@ static void test_ShowWindow_owned(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_SHOW); - ok(!ret, "wrong ret %d\n", ret); + ok(!ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7733,7 +7733,7 @@ static void test_ShowWindow_owned(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7763,7 +7763,7 @@ static void test_ShowWindow_owned(HWND hwndMain) * on top of each other) */ OffsetRect(&expect, GetSystemMetrics(SM_CXMINIMIZED), 0); ret = ShowWindow(hwnd2, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd2, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7774,8 +7774,8 @@ static void test_ShowWindow_owned(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7785,8 +7785,8 @@ static void test_ShowWindow_owned(HWND hwndMain) ok(EqualRect(&orig, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_MAXIMIZE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7806,8 +7806,8 @@ static void test_ShowWindow_owned(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7824,7 +7824,7 @@ static void test_ShowWindow_owned(HWND hwndMain) static void test_ShowWindow_child(HWND hwndMain) { RECT rect, orig, expect, nc; - BOOL ret; + LPARAM ret; HWND hwnd, hwnd2; LONG style; POINT pt = {0}; @@ -7854,7 +7854,7 @@ static void test_ShowWindow_child(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_SHOW); - ok(!ret, "wrong ret %d\n", ret); + ok(!ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7865,7 +7865,7 @@ static void test_ShowWindow_child(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7895,7 +7895,7 @@ static void test_ShowWindow_child(HWND hwndMain) * fit more than one per row */ OffsetRect(&expect, 0, -GetSystemMetrics(SM_CYMINIMIZED)); ret = ShowWindow(hwnd2, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd2, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7905,8 +7905,8 @@ static void test_ShowWindow_child(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7916,8 +7916,8 @@ static void test_ShowWindow_child(HWND hwndMain) ok(EqualRect(&orig, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_MAXIMIZE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7939,8 +7939,8 @@ static void test_ShowWindow_child(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7957,7 +7957,7 @@ static void test_ShowWindow_child(HWND hwndMain) static void test_ShowWindow_mdichild(HWND hwndMain) { RECT rect, orig, expect, nc; - BOOL ret; + LPARAM ret; HWND mdiclient, hwnd, hwnd2; LONG style; POINT pt = {0}; @@ -7993,7 +7993,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8023,7 +8023,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain) * fit more than one per row */ OffsetRect(&expect, 0, -GetSystemMetrics(SM_CYMINIMIZED)); ret = ShowWindow(hwnd2, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd2, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8033,8 +8033,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8044,8 +8044,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(EqualRect(&orig, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_MAXIMIZE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8067,8 +8067,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); -- 2.34.1

1 0

[PATCH v4 1/2] user32/tests: Add more tests for WM_NCCALCSIZE.
by Dmitry Timoshkov 10 Feb '22

10 Feb '22

v4: Rebased to current git. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 164 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3ace25056de..2d9487bb953 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1003,6 +1003,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR } case WM_WINDOWPOSCHANGED: { + LRESULT ret; RECT rc1, rc2; WINDOWPOS *winpos = (WINDOWPOS *)lparam; ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); @@ -1023,7 +1024,8 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR wine_dbgstr_rect(&rc2)); GetClientRect(hwnd, &rc2); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -1076,6 +1078,13 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; case WM_MOUSEACTIVATE: return MA_ACTIVATE; + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1106,6 +1115,13 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR return 0; } break; + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1131,6 +1147,13 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR ok(!got_getminmaxinfo, "tool: WM_GETMINMAXINFO should NOT have been received before WM_NCCREATE\n"); break; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1395,6 +1418,14 @@ static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM DeleteObject(region); return 0; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp); + return ret; + } + default: return DefWindowProcA(hwnd, msg, wp, lp); } @@ -1443,7 +1474,9 @@ static void test_nonclient_area(HWND hwnd) rc = rc_window; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); +todo_wine_if(ret != 0) + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), "client rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d client=%s, calc=%s\n", @@ -1460,7 +1493,9 @@ static void test_nonclient_area(HWND hwnd) FixedAdjustWindowRectEx(&rc_window, style, menu, exstyle); rc = rc_window; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); +todo_wine_if(ret != 0) + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), "synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n", @@ -2353,6 +2388,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L case WM_WINDOWPOSCHANGED: { + LRESULT ret; WINDOWPOS *winpos = (WINDOWPOS *)lparam; RECT rc1, rc2; @@ -2364,7 +2400,8 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); GetWindowRect(hwnd, &rc1); GetClientRect(hwnd, &rc2); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match, window=%s client=%s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -2390,7 +2427,15 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L return 1; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } + return DefWindowProcA(hwnd, msg, wparam, lparam); } @@ -2446,6 +2491,13 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA return 1; } + case WM_NCCALCSIZE: + { + LRESULT ret = DefFrameProcA(hwnd, mdi_client, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } + case WM_CLOSE: PostQuitMessage(0); break; @@ -4657,11 +4709,13 @@ static void test_validatergn(HWND hwnd) static void nccalchelper(HWND hwnd, INT x, INT y, RECT *prc) { + LRESULT ret; RECT rc; MoveWindow( hwnd, 0, 0, x, y, 0); GetWindowRect( hwnd, prc); rc = *prc; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc); + ok(!ret, "got %08lx\n", ret); if (winetest_debug > 1) trace("window rect is %s, nccalc rect is %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(prc)); } @@ -6553,11 +6607,14 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM } case WM_NCCALCSIZE: { + LRESULT ret; RECT rect, *r = (RECT *)lp; GetWindowRect( hwnd, &rect ); ok( EqualRect( &rect, r ), "passed rect %s doesn't match window rect %s\n", wine_dbgstr_rect( r ), wine_dbgstr_rect( &rect )); - return DefWindowProcA(hwnd, msg, wp, lp); + ret = DefWindowProcA(hwnd, msg, wp, lp); + ok(!ret, "got %08lx\n", ret); + return ret; } default: return DefWindowProcA(hwnd, msg, wp, lp); @@ -7467,7 +7524,8 @@ static void test_ShowWindow(void) /* test NC area */ GetWindowRect(hwnd, &rc); SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); @@ -7755,7 +7813,8 @@ static void test_ShowWindow_owned(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -7887,7 +7946,8 @@ static void test_ShowWindow_child(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -8015,7 +8075,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -9049,6 +9110,12 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR ok(minmax->ptMaxSize.y >= mi.rcMonitor.bottom, "%d >= %d\n", minmax->ptMaxSize.y, mi.rcMonitor.bottom); break; } + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp); + return ret; + } } return DefWindowProcA(hwnd, msg, wp, lp); } @@ -9308,6 +9375,13 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM break; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -12848,6 +12922,75 @@ static void test_ncdestroy(void) DestroyWindow(hwnd); } +static void test_WM_NCCALCSIZE(void) +{ + WNDCLASSA cls; + HWND hwnd; + NCCALCSIZE_PARAMS params; + WINDOWPOS winpos; + RECT client_rect, window_rect; + LRESULT ret; + + cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "dummy_window_class"; + ret = RegisterClassA(&cls); + ok(ret, "RegisterClass error %u\n", GetLastError()); + + hwnd = CreateWindowExA(0, "dummy_window_class", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError()); + + GetWindowRect(hwnd, &window_rect); + params.rgrc[0] = window_rect; + params.rgrc[1] = window_rect; + GetClientRect(hwnd, &client_rect); + MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2); + params.rgrc[2] = client_rect; + + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = window_rect.right - window_rect.left; + winpos.cy = window_rect.bottom - window_rect.top; + winpos.flags = SWP_NOMOVE; + params.lppos = &winpos; + + ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + params.rgrc[0] = window_rect; + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + GetWindowRect(hwnd, &window_rect); + ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + GetWindowRect(hwnd, &window_rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -13029,6 +13172,7 @@ START_TEST(win) test_SC_SIZE(); test_cancel_mode(); test_DragDetect(); + test_WM_NCCALCSIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.34.1

3 4

[PATCH v2 1/3] mf/tests: Add some WMA encoder ProcessOutput tests.
by Rémi Bernon 10 Feb '22

10 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> --- v2: Use a separate binary file with the raw WMA buffers. They are fixed size anyway so we can just read them sequentially. The WMA encoder test compare its output with the last recorded WMA buffers and outputs a new wmadata.bin file in a temporary directory. dlls/mf/tests/Makefile.in | 2 + dlls/mf/tests/mf.c | 86 ++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/resource.rc | 24 +++++++++++ dlls/mf/tests/wmadata.bin | Bin 0 -> 49071 bytes 4 files changed, 112 insertions(+) create mode 100644 dlls/mf/tests/resource.rc create mode 100644 dlls/mf/tests/wmadata.bin diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index da9882fb7db..53592a8758d 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = mf mfplat mfuuid ole32 user32 propsys C_SRCS = \ mf.c + +RC_SRCS = resource.rc diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 990b759ff39..c1209ba95b0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5492,6 +5492,32 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) return sample; } +#define check_sample(a, b, c, d) check_sample_(__LINE__, a, b, c, d) +static void check_sample_(int line, IMFSample *sample, const void *expect_buf, ULONG expect_len, HANDLE output_file) +{ + 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"); + } + if (output_file) WriteFile(output_file, buffer, length, &length, NULL); + 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; @@ -5552,10 +5578,17 @@ 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; + const BYTE *wma_encoded_data; + WCHAR output_path[MAX_PATH]; + ULONG wma_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; + HANDLE output_file; IMFSample *sample; + HRSRC resource; GUID class_id; + DWORD status; ULONG i, ret; HRESULT hr; @@ -5612,6 +5645,59 @@ 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; + + /* check wmadata.bin against current encoder output */ + resource = FindResourceW(NULL, L"wmadata.bin", (const WCHAR *)RT_RCDATA); + ok(resource != 0, "FindResourceW failed, error %u\n", GetLastError()); + wma_encoded_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + wma_encoded_data_len = SizeofResource(GetModuleHandleW(NULL), resource); + ok(wma_encoded_data_len % wma_block_size == 0, "got wma encoded length %u\n", wma_encoded_data_len); + + /* and generate a new one as well in a temporary directory */ + GetTempPathW(ARRAY_SIZE(output_path), output_path); + lstrcatW(output_path, L"wmadata.bin"); + output_file = CreateFileW(output_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(output_file != INVALID_HANDLE_VALUE, "CreateFileW failed, error %u\n", GetLastError()); + + 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); + ok(wma_encoded_data_len > i * wma_block_size, "got %u blocks\n", i); + check_sample(sample, wma_encoded_data + i * wma_block_size, wma_block_size, output_file); + winetest_pop_context(); + i++; + } + + trace("created %s\n", debugstr_w(output_path)); + CloseHandle(output_file); + + 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, NULL); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc new file mode 100644 index 00000000000..931139c741a --- /dev/null +++ b/dlls/mf/tests/resource.rc @@ -0,0 +1,24 @@ +/* + * Resources for mf test suite. + * + * Copyright 2022 Rémi Bernon 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 + */ + +#include "windef.h" + +/* @makedep: wmadata.bin */ +wmadata.bin RCDATA wmadata.bin diff --git a/dlls/mf/tests/wmadata.bin b/dlls/mf/tests/wmadata.bin new file mode 100644 index 0000000000000000000000000000000000000000..6c70c14ce3208f5c711effe156ac484c706686cd GIT binary patch literal 49071 zcmeI%v1tQA5CzZ!Co(v2sMN-RN>FHQ2Zt+A0S?rGRe*vkK_#dJm7ofYN{~8G=;V@t zY2d@#Y&QD5fzQG|4#V$leA<6a-|s)KZ=Zi3&-<6f;1D1{fIybOau^hN*2<(MK!89e zuu|t8i#q}Y2&4(D)p^>=<Rw6WKqoM&^Nz(G0RjZl1U7S>`wC6loV)}G5GVp$uk+$z zAV7dXsK8F0hi*=60t5&Yfk~Yg4+8-L1VRN4>O6FFViO=hpa>l2I`<V?SPTRR5J(d^ zd7Y=NOkM&62y_Bxb>6YKBS3&an!rV!r>#t00t5(j0#|k3vA82ZfIynSeXes~p=q0w zmjD3*MPT7|UOWs02oMMrSgP~T&52Eb0D&T~Qs>3PK!5;&P=U2N58a&D1PBl)0^?lg zzCsI&fdBylX#yLs^R$)8OMn1@PGGCfI~I2Y2oOjU*s1fhmB~wh0D(?mQs*6uI|2j< zqzN46I`<WtwmEqT5Fk(lj$Y@*!$5!lflz^yIuG5P*aQd=C<147UOWs02oMMrxTy2c w&52Eb0D&TKo$K6JXkjrBAV45Z;O=#vwlaAM5FpSAJgD=I#T@|x1kwcl0V8@&#Q*>R literal 0 HcmV?d00001 -- 2.34.1

3 6

[PATCH v4 2/2] user32: DefWindowProc(WM_NCCALCSIZE) should return 0.
by Dmitry Timoshkov 10 Feb '22

10 Feb '22

v3: As suggested by Alexandre changed NC_HandleNCCalcSize to not return a value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 3 ++- dlls/user32/nonclient.c | 9 ++------- dlls/user32/tests/win.c | 6 ------ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ce14d13171f..52584748768 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -168,7 +168,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; +extern void NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index abb73e73ca8..a8978c2d847 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -260,7 +260,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + break; case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 639cca707fb..f944ed568a4 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -346,19 +346,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style * * Handle a WM_NCCALCSIZE message. Called from DefWindowProc(). */ -LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) +void NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) { RECT tmpRect = { 0, 0, 0, 0 }; - LRESULT result = 0; LONG cls_style = GetClassLongW(hwnd, GCL_STYLE); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG exStyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); if (winRect == NULL) - return 0; - - if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; - if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; + return; if (!(style & WS_MINIMIZE)) { @@ -413,7 +409,6 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) winRect->right = winRect->left; winRect->bottom = winRect->top; } - return result; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2d9487bb953..eafac91db9a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1475,7 +1475,6 @@ static void test_nonclient_area(HWND hwnd) rc = rc_window; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); -todo_wine_if(ret != 0) ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -1494,7 +1493,6 @@ todo_wine_if(ret != 0) rc = rc_window; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); -todo_wine_if(ret != 0) ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -12966,25 +12964,21 @@ static void test_WM_NCCALCSIZE(void) params.lppos = &winpos; ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); params.rgrc[0] = window_rect; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); GetWindowRect(hwnd, &window_rect); ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); GetWindowRect(hwnd, &window_rect); ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); -- 2.34.1

2 1

[PATCH 1/7] mfplat: Remove duplicated includes.
by Nikolay Sivov 10 Feb '22

10 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 2 -- dlls/mfplat/main.c | 1 - dlls/mfplat/mediatype.c | 2 -- dlls/mfplat/queue.c | 6 ------ dlls/mfplat/sample.c | 1 - 5 files changed, 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..e9990f85853 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -26,8 +26,6 @@ #include "d3d9.h" #include "evr.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(mfplat); #define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment))) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e79f59d41dd..7e2527fc024 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -36,7 +36,6 @@ #include "d3d11.h" #include "uuids.h" -#include "wine/debug.h" #include "wine/list.h" #include "mfplat_private.h" diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 41dbda572d5..41758390289 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -25,8 +25,6 @@ #include "ks.h" #include "ksmedia.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(mfplat); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC1, MAKEFOURCC('I','M','C','1')); diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 8279929b46e..42bceb5811d 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define COBJMACROS -#define NONAMELESSUNION - -#include "wine/debug.h" -#include "wine/list.h" #include "mfplat_private.h" #include "rtworkq.h" diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 04c68c87199..099db498f2d 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -25,7 +25,6 @@ #include "initguid.h" #include "dxva2api.h" -#include "wine/debug.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -- 2.34.1

1 6

[PATCH 1/2] opcservices: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 10 Feb '22

10 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/Makefile.in | 1 - dlls/opcservices/compress.c | 3 ++- dlls/opcservices/factory.c | 31 +++++++++++------------ dlls/opcservices/package.c | 48 ++++++++++++++++++------------------ dlls/opcservices/uri.c | 20 +++++++-------- 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 99145d4cc7e..0867b1bd882 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = opcservices.dll IMPORTS = $(ZLIB_PE_LIBS) uuid ole32 advapi32 urlmon xmllite oleaut32 EXTRAINCL = $(ZLIB_PE_CFLAGS) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index e3a1a9db71a..cb4fabcc477 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -152,7 +152,8 @@ static void compress_write(struct zip_archive *archive, void *data, ULONG size) archive->position += written; if (FAILED(archive->write_result)) - WARN("Failed to write output %p, size %u, written %u, hr %#x.\n", data, size, written, archive->write_result); + WARN("Failed to write output %p, size %lu, written %lu, hr %#lx.\n", + data, size, written, archive->write_result); } void compress_finalize_archive(struct zip_archive *archive) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index eb0455828f3..4c465f653f8 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -70,7 +70,7 @@ static ULONG WINAPI opc_filestream_AddRef(IStream *iface) struct opc_filestream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -80,7 +80,7 @@ static ULONG WINAPI opc_filestream_Release(IStream *iface) struct opc_filestream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -96,7 +96,7 @@ static HRESULT WINAPI opc_filestream_Read(IStream *iface, void *buff, ULONG size struct opc_filestream *stream = impl_from_IStream(iface); DWORD read = 0; - TRACE("iface %p, buff %p, size %u, num_read %p.\n", iface, buff, size, num_read); + TRACE("%p, %p, %lu, %p.\n", iface, buff, size, num_read); if (!num_read) num_read = &read; @@ -104,7 +104,7 @@ static HRESULT WINAPI opc_filestream_Read(IStream *iface, void *buff, ULONG size *num_read = 0; if (!ReadFile(stream->hfile, buff, size, num_read, NULL)) { - WARN("Failed to read file, error %d.\n", GetLastError()); + WARN("Failed to read file, error %ld.\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } @@ -116,7 +116,7 @@ static HRESULT WINAPI opc_filestream_Write(IStream *iface, const void *data, ULO struct opc_filestream *stream = impl_from_IStream(iface); DWORD written = 0; - TRACE("iface %p, data %p, size %u, num_written %p.\n", iface, data, size, num_written); + TRACE("%p, %p, %lu, %p.\n", iface, data, size, num_written); if (!num_written) num_written = &written; @@ -124,7 +124,7 @@ static HRESULT WINAPI opc_filestream_Write(IStream *iface, const void *data, ULO *num_written = 0; if (!WriteFile(stream->hfile, data, size, num_written, NULL)) { - WARN("Failed to write to file, error %d.\n", GetLastError()); + WARN("Failed to write to file, error %ld.\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } @@ -135,7 +135,7 @@ static HRESULT WINAPI opc_filestream_Seek(IStream *iface, LARGE_INTEGER move, DW { struct opc_filestream *stream = impl_from_IStream(iface); - TRACE("iface %p, move %s, origin %d, newpos %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos); + TRACE("%p, %s, %ld, %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos); if (!SetFilePointerEx(stream->hfile, move, (LARGE_INTEGER *)newpos, origin)) return HRESULT_FROM_WIN32(GetLastError()); @@ -161,7 +161,7 @@ static HRESULT WINAPI opc_filestream_CopyTo(IStream *iface, IStream *dest, ULARG static HRESULT WINAPI opc_filestream_Commit(IStream *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("%p, %#lx stub!\n", iface, flags); return E_NOTIMPL; } @@ -176,7 +176,7 @@ static HRESULT WINAPI opc_filestream_Revert(IStream *iface) static HRESULT WINAPI opc_filestream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) { - FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("%p, %s, %s, %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(size.QuadPart), lock_type); return E_NOTIMPL; @@ -185,7 +185,7 @@ static HRESULT WINAPI opc_filestream_LockRegion(IStream *iface, ULARGE_INTEGER o static HRESULT WINAPI opc_filestream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) { - FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("%p, %s, %s, %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(size.QuadPart), lock_type); return E_NOTIMPL; @@ -196,7 +196,7 @@ static HRESULT WINAPI opc_filestream_Stat(IStream *iface, STATSTG *statstg, DWOR struct opc_filestream *stream = impl_from_IStream(iface); BY_HANDLE_FILE_INFORMATION fi; - TRACE("iface %p, statstg %p, flag %d.\n", iface, statstg, flag); + TRACE("%p, %p, %#lx.\n", iface, statstg, flag); if (!statstg) return E_POINTER; @@ -332,13 +332,13 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, if (FAILED(hr = CreateUri(uri, Uri_CREATE_ALLOW_RELATIVE, 0, &part_uri))) { - WARN("Failed to create uri, hr %#x.\n", hr); + WARN("Failed to create uri, hr %#lx.\n", hr); return hr; } if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &root_uri))) { - WARN("Failed to create root uri, hr %#x.\n", hr); + WARN("Failed to create root uri, hr %#lx.\n", hr); IUri_Release(part_uri); return hr; } @@ -348,7 +348,7 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IUri_Release(part_uri); if (FAILED(hr)) { - WARN("Failed to combine URIs, hr %#x.\n", hr); + WARN("Failed to combine URIs, hr %#lx.\n", hr); return hr; } @@ -360,8 +360,7 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename, OPC_STREAM_IO_MODE io_mode, SECURITY_ATTRIBUTES *sa, DWORD flags, IStream **stream) { - TRACE("iface %p, filename %s, io_mode %d, sa %p, flags %#x, stream %p.\n", iface, debugstr_w(filename), - io_mode, sa, flags, stream); + TRACE("%p, %s, %d, %p, %#lx, %p.\n", iface, debugstr_w(filename), io_mode, sa, flags, stream); return opc_filestream_create(filename, io_mode, sa, flags, stream); } diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index df1a71e17e8..64d34d4b853 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -199,7 +199,7 @@ static ULONG WINAPI opc_part_enum_AddRef(IOpcPartEnumerator *iface) struct opc_part_enum *part_enum = impl_from_IOpcPartEnumerator(iface); ULONG refcount = InterlockedIncrement(&part_enum->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -209,7 +209,7 @@ static ULONG WINAPI opc_part_enum_Release(IOpcPartEnumerator *iface) struct opc_part_enum *part_enum = impl_from_IOpcPartEnumerator(iface); ULONG refcount = InterlockedDecrement(&part_enum->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -360,7 +360,7 @@ static ULONG WINAPI opc_rel_enum_AddRef(IOpcRelationshipEnumerator *iface) struct opc_rel_enum *rel_enum = impl_from_IOpcRelationshipEnumerator(iface); ULONG refcount = InterlockedIncrement(&rel_enum->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -370,7 +370,7 @@ static ULONG WINAPI opc_rel_enum_Release(IOpcRelationshipEnumerator *iface) struct opc_rel_enum *rel_enum = impl_from_IOpcRelationshipEnumerator(iface); ULONG refcount = InterlockedDecrement(&rel_enum->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -520,7 +520,7 @@ static ULONG WINAPI opc_content_stream_AddRef(IStream *iface) struct opc_content_stream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -530,7 +530,7 @@ static ULONG WINAPI opc_content_stream_Release(IStream *iface) struct opc_content_stream *stream = impl_from_IStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -546,7 +546,7 @@ static HRESULT WINAPI opc_content_stream_Read(IStream *iface, void *buff, ULONG struct opc_content_stream *stream = impl_from_IStream(iface); DWORD read = 0; - TRACE("iface %p, buff %p, size %u, num_read %p.\n", iface, buff, size, num_read); + TRACE("%p, %p, %lu, %p.\n", iface, buff, size, num_read); if (!num_read) num_read = &read; @@ -569,7 +569,7 @@ static HRESULT WINAPI opc_content_stream_Write(IStream *iface, const void *data, struct opc_content_stream *stream = impl_from_IStream(iface); DWORD written = 0; - TRACE("iface %p, data %p, size %u, num_written %p.\n", iface, data, size, num_written); + TRACE("%p, %p, %lu, %p.\n", iface, data, size, num_written); if (!num_written) num_written = &written; @@ -597,7 +597,7 @@ static HRESULT WINAPI opc_content_stream_Seek(IStream *iface, LARGE_INTEGER move struct opc_content_stream *stream = impl_from_IStream(iface); ULARGE_INTEGER pos; - TRACE("iface %p, move %s, origin %d, newpos %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos); + TRACE("%p, %s, %ld, %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos); switch (origin) { @@ -611,7 +611,7 @@ static HRESULT WINAPI opc_content_stream_Seek(IStream *iface, LARGE_INTEGER move pos.QuadPart = stream->content->size.QuadPart + move.QuadPart; break; default: - WARN("Unknown origin mode %d.\n", origin); + WARN("Unknown origin mode %ld.\n", origin); return E_INVALIDARG; } @@ -641,7 +641,7 @@ static HRESULT WINAPI opc_content_stream_CopyTo(IStream *iface, IStream *dest, U static HRESULT WINAPI opc_content_stream_Commit(IStream *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + FIXME("iface %p, flags %#lx stub!\n", iface, flags); return E_NOTIMPL; } @@ -656,7 +656,7 @@ static HRESULT WINAPI opc_content_stream_Revert(IStream *iface) static HRESULT WINAPI opc_content_stream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) { - FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("iface %p, offset %s, size %s, lock_type %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(size.QuadPart), lock_type); return E_NOTIMPL; @@ -665,7 +665,7 @@ static HRESULT WINAPI opc_content_stream_LockRegion(IStream *iface, ULARGE_INTEG static HRESULT WINAPI opc_content_stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) { - FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("iface %p, offset %s, size %s, lock_type %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(size.QuadPart), lock_type); return E_NOTIMPL; @@ -673,7 +673,7 @@ static HRESULT WINAPI opc_content_stream_UnlockRegion(IStream *iface, ULARGE_INT static HRESULT WINAPI opc_content_stream_Stat(IStream *iface, STATSTG *statstg, DWORD flag) { - FIXME("iface %p, statstg %p, flag %d stub!\n", iface, statstg, flag); + FIXME("iface %p, statstg %p, flag %ld stub!\n", iface, statstg, flag); return E_NOTIMPL; } @@ -761,7 +761,7 @@ static ULONG WINAPI opc_part_AddRef(IOpcPart *iface) struct opc_part *part = impl_from_IOpcPart(iface); ULONG refcount = InterlockedIncrement(&part->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -771,7 +771,7 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) struct opc_part *part = impl_from_IOpcPart(iface); ULONG refcount = InterlockedDecrement(&part->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -933,7 +933,7 @@ static ULONG WINAPI opc_part_set_AddRef(IOpcPartSet *iface) struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); ULONG refcount = InterlockedIncrement(&part_set->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -943,7 +943,7 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); ULONG refcount = InterlockedDecrement(&part_set->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1070,7 +1070,7 @@ static ULONG WINAPI opc_relationship_AddRef(IOpcRelationship *iface) struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); ULONG refcount = InterlockedIncrement(&relationship->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1080,7 +1080,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); ULONG refcount = InterlockedDecrement(&relationship->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1253,7 +1253,7 @@ static ULONG WINAPI opc_relationship_set_AddRef(IOpcRelationshipSet *iface) struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); ULONG refcount = InterlockedIncrement(&relationship_set->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1263,7 +1263,7 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); ULONG refcount = InterlockedDecrement(&relationship_set->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1432,7 +1432,7 @@ static ULONG WINAPI opc_package_AddRef(IOpcPackage *iface) struct opc_package *package = impl_from_IOpcPackage(iface); ULONG refcount = InterlockedIncrement(&package->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1442,7 +1442,7 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) struct opc_package *package = impl_from_IOpcPackage(iface); ULONG refcount = InterlockedDecrement(&package->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 5cba14aa78b..0a7e2ef3660 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -60,7 +60,7 @@ static ULONG WINAPI opc_uri_AddRef(IOpcPartUri *iface) struct opc_uri *uri = impl_from_IOpcPartUri(iface); ULONG refcount = InterlockedIncrement(&uri->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -70,7 +70,7 @@ static ULONG WINAPI opc_uri_Release(IOpcPartUri *iface) struct opc_uri *uri = impl_from_IOpcPartUri(iface); ULONG refcount = InterlockedDecrement(&uri->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -90,7 +90,7 @@ static HRESULT WINAPI opc_uri_GetPropertyBSTR(IOpcPartUri *iface, Uri_PROPERTY p { struct opc_uri *uri = impl_from_IOpcPartUri(iface); - TRACE("iface %p, property %d, value %p, flags %#x.\n", iface, property, value, flags); + TRACE("iface %p, property %d, value %p, flags %#lx.\n", iface, property, value, flags); return IUri_GetPropertyBSTR(uri->uri, property, value, flags); } @@ -100,7 +100,7 @@ static HRESULT WINAPI opc_uri_GetPropertyLength(IOpcPartUri *iface, Uri_PROPERTY { struct opc_uri *uri = impl_from_IOpcPartUri(iface); - TRACE("iface %p, property %d, length %p, flags %#x.\n", iface, property, length, flags); + TRACE("iface %p, property %d, length %p, flags %#lx.\n", iface, property, length, flags); return IUri_GetPropertyLength(uri->uri, property, length, flags); } @@ -110,7 +110,7 @@ static HRESULT WINAPI opc_uri_GetPropertyDWORD(IOpcPartUri *iface, Uri_PROPERTY { struct opc_uri *uri = impl_from_IOpcPartUri(iface); - TRACE("iface %p, property %d, value %p, flags %#x.\n", iface, property, value, flags); + TRACE("iface %p, property %d, value %p, flags %#lx.\n", iface, property, value, flags); return IUri_GetPropertyDWORD(uri->uri, property, value, flags); } @@ -504,7 +504,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) lstrcatW(ret, relsextW); if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) - WARN("Failed to create rels uri, hr %#x.\n", hr); + WARN("Failed to create rels uri, hr %#lx.\n", hr); heap_free(ret); SysFreeString(path); @@ -544,7 +544,7 @@ static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out) if (FAILED(hr = opc_part_uri_init(obj, NULL, uri->source_uri->is_part_uri, uri->source_uri->uri))) { - WARN("Failed to init part uri, hr %#x.\n", hr); + WARN("Failed to init part uri, hr %#lx.\n", hr); heap_free(obj); return hr; } @@ -566,7 +566,7 @@ HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri * if (FAILED(hr = opc_part_uri_init(obj, source_uri, TRUE, uri))) { - WARN("Failed to init part uri, hr %#x.\n", hr); + WARN("Failed to init part uri, hr %#lx.\n", hr); heap_free(obj); return hr; } @@ -589,7 +589,7 @@ HRESULT opc_root_uri_create(IOpcUri **out) if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) { - WARN("Failed to create rels uri, hr %#x.\n", hr); + WARN("Failed to create rels uri, hr %#lx.\n", hr); heap_free(obj); return hr; } @@ -598,7 +598,7 @@ HRESULT opc_root_uri_create(IOpcUri **out) IUri_Release(uri); if (FAILED(hr)) { - WARN("Failed to init uri, hr %#x.\n", hr); + WARN("Failed to init uri, hr %#lx.\n", hr); heap_free(uri); return hr; } -- 2.34.1

1 1

[PATCH] include: Update another HRESULT definition.
by Nikolay Sivov 10 Feb '22

10 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dplayx/dplayx_main.c | 2 +- dlls/ole32/itemmoniker.c | 4 ++-- include/winerror.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c index c8c2778501a..7b8fbcc48c1 100644 --- a/dlls/dplayx/dplayx_main.c +++ b/dlls/dplayx/dplayx_main.c @@ -107,7 +107,7 @@ HRESULT WINAPI DllCanUnloadNow(void) * as well? */ - TRACE( ": returning 0x%08x\n", hr ); + TRACE( ": returning %#lx\n", hr ); return hr; } diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 112a8db4b16..5c69266fc9c 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -451,7 +451,7 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, if (SUCCEEDED(hr)) { if (FAILED(hr = set_container_lock(container, pbc))) - WARN("Failed to lock container, hr %#x.\n", hr); + WARN("Failed to lock container, hr %#lx.\n", hr); hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, riid, ppvResult); @@ -482,7 +482,7 @@ static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *p if (SUCCEEDED(hr)) { if (FAILED(hr = set_container_lock(container, pbc))) - WARN("Failed to lock container, hr %#x.\n", hr); + WARN("Failed to lock container, hr %#lx.\n", hr); hr = IOleItemContainer_GetObjectStorage(container, moniker->itemName, pbc, riid, ppvResult); IOleItemContainer_Release(container); diff --git a/include/winerror.h b/include/winerror.h index f412989a6a4..b63b74a5b18 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -89,11 +89,11 @@ #define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED -# ifdef _MSC_VER -typedef long HRESULT; -# else -typedef int HRESULT; -# endif +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +typedef long HRESULT; +#else +typedef int HRESULT; +#endif #endif static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) { -- 2.34.1

1 0

[PATCH 1/5] shlwapi/tests: Remove workarounds from url.c for no longer supported Windows versions.
by Zebediah Figura 10 Feb '22

10 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 64 +++++++++++----------------------------- 1 file changed, 17 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 703bdcd0a55..04611b801c1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -295,7 +295,6 @@ typedef struct _TEST_URL_ESCAPEW { DWORD flags; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ - const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { @@ -311,12 +310,10 @@ static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { {'M','a','%','D','F',0}}, /* 0x2070E */ {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd841,0xdf0e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, /* 0x27A3E */ {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd85e,0xde3e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, @@ -414,12 +411,7 @@ static const struct { {"c:\\foo/b a%r", "file:///c:/foo/b%20a%25r", S_OK}, {"c:\\foo\\foo bar", "file:///c:/foo/foo%20bar", S_OK}, {"file:///c:/foo/bar", "file:///c:/foo/bar", S_FALSE}, -#if 0 - /* The following test fails on native shlwapi as distributed with Win95/98. - * Wine matches the behaviour of later versions. - */ {"xx:c:\\foo\\bar", "xx:c:\\foo\\bar", S_FALSE} -#endif }; /* ################ */ @@ -614,8 +606,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const dwSize = 1; res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); - ok(dwSize == strlen(szExpected)+1 || - (*szExpected == '?' && dwSize == strlen(szExpected)), + ok(dwSize == strlen(szExpected) + 1, "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; @@ -638,9 +629,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const FreeWideString(wszConvertedPart); FreeWideString(wszUrl); - /* Note that v6.0 and later don't return '?' with the query */ - ok(strcmp(szPart,szExpected)==0 || - (*szExpected=='?' && !strcmp(szPart,szExpected+1)), + ok(!strcmp(szPart,szExpected), "Expected %s, but got %s\n", szExpected, szPart); } @@ -707,7 +696,7 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); - test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "query=x&return=y"); test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); @@ -855,10 +844,8 @@ static void test_UrlEscapeA(void) size = 1; empty_string[0] = 127; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); - ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ - "got %x, expected %x\n", ret, E_NOTIMPL); - ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ - "got %d, expected %d\n", size, 1); + ok(ret == E_NOTIMPL, "Got unexpected hr %#x.\n", ret); + ok(size == 1, "Got unexpected size %u.\n", size); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); for (i = 0; i < ARRAY_SIZE(TEST_ESCAPE); i++) { @@ -962,12 +949,10 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); - ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), - "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", - wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), - wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!wcscmp(ret_url, TEST_ESCAPEW[i].expecturl) + || broken(!wcscmp(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected %s, but got %s for %s.\n", debugstr_w(TEST_ESCAPEW[i].expecturl), + debugstr_w(ret_url), debugstr_w(TEST_ESCAPEW[i].url)); } } @@ -1484,36 +1469,27 @@ static void test_HashData(void) /* Test hashing with identically sized input/output buffers. */ res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected, sizeof(expected)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected, sizeof(expected)), "data didn't match\n"); /* Test hashing with larger output buffer. */ res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected2, sizeof(expected2)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected2, sizeof(expected2)), "data didn't match\n"); /* Test hashing with smaller input buffer. */ res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected3, sizeof(expected3)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected3, sizeof(expected3)), "data didn't match\n"); /* Test passing NULL pointers for input/output parameters. */ res = HashData(NULL, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(input, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(NULL, 0, output, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); /* Test passing valid pointers with sizes of zero. */ for (i = 0; i < ARRAY_SIZE(input); i++) @@ -1527,16 +1503,10 @@ static void test_HashData(void) /* The buffers should be unchanged. */ for (i = 0; i < ARRAY_SIZE(input); i++) - { ok(input[i] == 0x00, "Expected the input buffer to be unchanged\n"); - if(input[i] != 0x00) break; - } for (i = 0; i < ARRAY_SIZE(output); i++) - { ok(output[i] == 0xFF, "Expected the output buffer to be unchanged\n"); - if(output[i] != 0xFF) break; - } /* Input/output parameters are not validated. */ res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); -- 2.34.1

2 9

[PATCH 7/7] comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

On XP, when a pushlike checkbox or radio button is checked and hovered, PBS_HOT is used. In later versions of Windows, PBS_PRESSED is used. This patch changes pushlike checkboxes and radio buttons to use the new behavior because it seems more intuitive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52436 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2ce12252460..ee7c2c288b1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -396,7 +396,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_cb_states[3][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED }, + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED }, { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL } }; static const int rb_states[2][DRAW_STATE_COUNT] = @@ -407,7 +407,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_rb_states[2][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED } + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED } }; static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); -- 2.32.0

1 0

[PATCH 6/7] comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Fix foobar2000 having an extra edge around tree view non-client size box. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d00bba8e625..23e87bdce04 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5498,18 +5498,25 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) /* Draw themed border */ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM lParam) { - HTHEME theme = GetWindowTheme (infoPtr->hwnd); + int cxEdge, cyEdge; + LONG ex_style; + HTHEME theme; HDC dc; RECT r; HRGN cliprgn; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + if (!(ex_style & WS_EX_CLIENTEDGE)) + return DefWindowProcW(infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); + + theme = GetWindowTheme(infoPtr->hwnd); if (!theme) return DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); GetWindowRect(infoPtr->hwnd, &r); + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1) -- 2.32.0

1 0

[PATCH 5/7] uxtheme: Use COLOR_BTNFACE to fill scroll bar background.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 4 ++-- dlls/user32/tests/scroll.c | 1 - dlls/uxtheme/scrollbar.c | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 069d1200c82..2fe6ad68426 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -888,8 +888,8 @@ static void test_themed_background(void) {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, - {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq, TRUE}, - {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq, TRUE}, + {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, + {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq}, }; uxtheme = LoadLibraryA("uxtheme.dll"); diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 154d3c8d434..57bf759879c 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -802,7 +802,6 @@ static void test_visual(void) hdc = GetDC(hwnd); color = GetPixel(hdc, 5, 5); - todo_wine_if(bThemeActive) ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ReleaseDC(hwnd, hdc); diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 0e42de7d77f..e96e5e89b69 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -62,8 +62,9 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else state = SZB_RIGHTALIGN; - if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) - DrawThemeParentBackground(hwnd, dc, NULL); + /* Tests show that COLOR_BTNFACE is used instead of DrawThemeParentBackground() for drawing + * background */ + FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL); } else { int uppertrackstate, lowertrackstate, thumbstate; -- 2.32.0

1 0

[PATCH 4/7] user32: Use COLOR_BTNFACE to fill scroll bar background.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Fix foobar2000 wrong scroll bar size box color when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/nonclient.c | 2 +- dlls/user32/scroll.c | 4 ++-- dlls/user32/tests/scroll.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 639cca707fb..a9768defa3c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1073,7 +1073,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) else r.left = r.right - GetSystemMetrics(SM_CXVSCROLL) + 1; r.top = r.bottom - GetSystemMetrics(SM_CYHSCROLL) + 1; - FillRect( hdc, &r, GetSysColorBrush(COLOR_SCROLLBAR) ); + FillRect( hdc, &r, GetSysColorBrush( COLOR_BTNFACE ) ); } ReleaseDC( hwnd, hdc ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a3f0becbbd6..c5bfb0b2203 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -585,7 +585,7 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES { RECT rc = *rect; - FillRect( hdc, &rc, GetSysColorBrush( COLOR_SCROLLBAR ) ); + FillRect( hdc, &rc, GetSysColorBrush( COLOR_BTNFACE ) ); rc.left = max( rc.left, rc.right - GetSystemMetrics( SM_CXVSCROLL ) - 1 ); rc.top = max( rc.top, rc.bottom - GetSystemMetrics( SM_CYHSCROLL ) - 1 ); DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); @@ -594,7 +594,7 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES if (style & SBS_SIZEBOX) { - FillRect( hdc, rect, GetSysColorBrush( COLOR_SCROLLBAR ) ); + FillRect( hdc, rect, GetSysColorBrush( COLOR_BTNFACE ) ); return; } } diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index c378669991b..154d3c8d434 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -802,7 +802,7 @@ static void test_visual(void) hdc = GetDC(hwnd); color = GetPixel(hdc, 5, 5); - todo_wine_if(styles[i] == SBS_SIZEBOX || bThemeActive) + todo_wine_if(bThemeActive) ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ReleaseDC(hwnd, hdc); -- 2.32.0

1 0

[PATCH 3/7] user32/tests: Test scroll bars use COLOR_BTNFACE instead of COLOR_SCROLLBAR to fill background.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/scroll.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 7181a028748..c378669991b 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -774,6 +774,46 @@ static void test_subclass(void) DestroyWindow(hwnd); } +static void test_visual(void) +{ + static const int color_indices[] = {COLOR_SCROLLBAR, COLOR_BTNFACE}; + static const DWORD styles[] = {SBS_SIZEBOX, SBS_SIZEGRIP}; + COLORREF old_colors[2], colors[2], color; + HWND hwnd; + BOOL ret; + HDC hdc; + int i; + + old_colors[0] = GetSysColor(color_indices[0]); + old_colors[1] = GetSysColor(color_indices[1]); + colors[0] = RGB(0x11, 0x22, 0x33); + colors[1] = RGB(0xaa, 0xbb, 0xcc); + ret = SetSysColors(ARRAY_SIZE(color_indices), color_indices, colors); + ok(ret, "SetSysColors failed, error %u.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + winetest_push_context("style %#x", styles[i]); + + hwnd = CreateWindowA("ScrollBar", "", WS_POPUP | WS_VISIBLE | styles[i], 0, 0, 20, 20, 0, 0, + 0, 0); + ok(hwnd != NULL, "CreateWindowA failed, error %u.\n", GetLastError()); + RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + + hdc = GetDC(hwnd); + color = GetPixel(hdc, 5, 5); + todo_wine_if(styles[i] == SBS_SIZEBOX || bThemeActive) + ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + winetest_pop_context(); + } + + ret = SetSysColors(ARRAY_SIZE(color_indices), color_indices, old_colors); + ok(ret, "SetSysColors failed, error %u.\n", GetLastError()); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -810,6 +850,8 @@ START_TEST ( scroll ) FreeLibrary(hUxtheme); } + test_visual(); + scrollbar_test_default( 0); scrollbar_test_default( WS_HSCROLL); scrollbar_test_default( WS_VSCROLL); -- 2.32.0

1 0

[PATCH 2/7] comctl32/tab: Always draw parent background when themed.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tab.c | 5 +++++ dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 8e34f8b97b3..1275381489a 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2315,9 +2315,14 @@ static void TAB_DrawBorder(const TAB_INFO *infoPtr, HDC hdc) TRACE("border=(%s)\n", wine_dbgstr_rect(&rect)); if (theme) + { + DrawThemeParentBackground(infoPtr->hwnd, hdc, &rect); DrawThemeBackground (theme, hdc, TABP_PANE, 0, &rect, NULL); + } else + { DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT); + } } /****************************************************************************** diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5daca6aff93..069d1200c82 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -881,7 +881,7 @@ static void test_themed_background(void) {WC_STATICA, SS_ETCHEDHORZ, wm_ctlcolorstatic_seq, TRUE}, {STATUSCLASSNAMEA, 0, empty_seq}, {"SysLink", 0, wm_ctlcolorstatic_seq}, - {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, + {WC_TABCONTROLA, 0, drawthemeparentbackground_seq}, {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, {TOOLTIPS_CLASSA, 0, empty_seq}, {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, -- 2.32.0

1 0

[PATCH 1/7] comctl32/tests: Fix occasional test failures on TestBot w7u_2qxl.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index dc9648c1bf0..5daca6aff93 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -531,7 +531,8 @@ static const struct message wm_themechanged_paint_erase_seq[] = { {WM_THEMECHANGED, sent | wparam | lparam}, {WM_PAINT, sent | wparam | lparam}, - {WM_ERASEBKGND, sent | defwinproc}, + /* TestBot w7u_2qxl VM occasionally doesn't send WM_ERASEBKGND, hence the 'optional' */ + {WM_ERASEBKGND, sent | defwinproc | optional}, {0}, }; -- 2.32.0

1 0

Wine Issue while running Windows exe
by Chandan Sharma 10 Feb '22

10 Feb '22

Dear Sir/Madam, We have quite few queries regarding Wine installation on Ubuntu 18.04. These are following . 1. I have successfully installed wine7.0 on Ubuntu 18.04 64bit. 2.winecfg command is not working .it does not launch any prompt. 3. Even I am not able to run any windows exe like notepad.exe which is installed by default when we installed Wine. 4.My concern is how can we run simple WPF .net core windows application in ubuntu using wine. Please provide any support. Regards , Chandan Sharma

1 0

[PATCH 1/4] ntdll: Use exit_frame as the initial syscall_frame prev_frame value.
by Rémi Bernon 10 Feb '22

10 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Something like that seems to let pthread_exit unwinding work and call its cleanup handlers. Unwinding also seems to work fine when adding .cfi metadata to point to the right PE frames, although I didn't look exactly how it handles that. Maybe it only works in the context of builtin libraries. As we don't want pthread to do anything with the PE code I'm keeping track of unix address only here instead, which I'm assuming makes sure it only unwinds syscall frames. Somehow libunwind only cares about %rip .cfi directives, although I've also added .cfi for %rsp here (resp. %eip, %esp on i386), I'm not completely sure why or which option is best. dlls/ntdll/unix/signal_i386.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..0e3b1daf51a 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1613,8 +1613,9 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)x86_thread_data()->syscall_frame; + void *exit_frame = x86_thread_data()->exit_frame; - if (!frame->frame.prev_frame) return STATUS_NO_CALLBACK_ACTIVE; + if (frame->frame.prev_frame == exit_frame) return STATUS_NO_CALLBACK_ACTIVE; *frame->ret_ptr = ret_ptr; *frame->ret_len = ret_len; @@ -2399,7 +2400,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B *(--stack) = 0xdeadbabe; frame->esp = (DWORD)stack; frame->eip = (DWORD)pLdrInitializeThunk; - frame->prev_frame = NULL; + frame->prev_frame = thread_data->exit_frame; frame->syscall_flags = syscall_flags; frame->syscall_table = KeServiceDescriptorTable; frame->restore_flags |= LOWORD(CONTEXT_INTEGER); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68855dccacf..da89b958665 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2364,8 +2364,9 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)amd64_thread_data()->syscall_frame; + void *exit_frame = amd64_thread_data()->exit_frame; - if (!frame->frame.prev_frame) return STATUS_NO_CALLBACK_ACTIVE; + if (frame->frame.prev_frame == exit_frame) return STATUS_NO_CALLBACK_ACTIVE; *frame->ret_ptr = ret_ptr; *frame->ret_len = ret_len; @@ -3072,7 +3073,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->rsp = (ULONG64)ctx - 8; frame->rip = (ULONG64)pLdrInitializeThunk; frame->rcx = (ULONG64)ctx; - frame->prev_frame = NULL; + frame->prev_frame = thread_data->exit_frame; frame->restore_flags |= CONTEXT_INTEGER; frame->syscall_flags = syscall_flags; frame->syscall_table = KeServiceDescriptorTable; -- 2.34.1

3 12

[PATCH] kernelbase: Implement SetCurrentConsoleFontEx.
by Jacek Caban 10 Feb '22

10 Feb '22

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 7 ------ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 40 ++++++++++++++++----------------- dlls/kernelbase/console.c | 36 +++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 1 + programs/conhost/conhost.c | 25 ++++++++++++++++++--- programs/conhost/conhost.h | 14 +++++++----- programs/conhost/window.c | 28 ++++++++++++++--------- 9 files changed, 108 insertions(+), 46 deletions(-)

2 1

[PATCH 5/5] msvcp90: Remove STREAMSIZE_BITS definition.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/ios.c | 94 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.h | 4 -- 2 files changed, 47 insertions(+), 51 deletions(-)

2 1

[PATCH 4/5] msvcp: Remove typos in mangled names.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 10 +++++----- dlls/msvcp90/ios.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)

2 1

[tools] testbot/VMs: Set the default VM type to win64.
by Francois Gouget 10 Feb '22

10 Feb '22

This is only relevant when creating a new VM and the most commonly created VM type is 64-bit Windows VMs (for the various locales). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 9ecd4292f9..60a52b86c5 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -171,6 +171,7 @@ sub InitializeNew($$) my ($self, $Collection) = @_; $self->Status("off"); + $self->Type("win64"); $self->IdleSnapshot("base-live"); $self->SUPER::InitializeNew($Collection); -- 2.30.2

1 0

[PATCH] dmcompos/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 09 Feb '22

09 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/tests/Makefile.in | 1 - dlls/dmcompos/tests/dmcompos.c | 205 ++++++++++++++++---------------- 2 files changed, 101 insertions(+), 105 deletions(-) diff --git a/dlls/dmcompos/tests/Makefile.in b/dlls/dmcompos/tests/Makefile.in index 4253494b8ec..b794d4d48e0 100644 --- a/dlls/dmcompos/tests/Makefile.in +++ b/dlls/dmcompos/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmcompos.dll IMPORTS = ole32 diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index d4dbd2206c4..2e0047c19c6 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -53,26 +53,25 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmc); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicComposer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicComposer create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmc, "dmc = %p\n", dmc); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmc); - ok(hr == E_NOINTERFACE, - "DirectMusicComposer create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicComposer create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicComposer interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicComposer, (void**)&dmc); - ok(hr == S_OK, "DirectMusicComposer create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicComposer create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicComposer_AddRef(dmc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicComposer_QueryInterface(dmc, &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 == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicComposer_Release(dmc)); @@ -91,38 +90,37 @@ static void test_COM_chordmap(void) hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmcm); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicChordMap create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmcm, "dmcm = %p\n", dmcm); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmcm); - ok(hr == E_NOINTERFACE, - "DirectMusicChordMap create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicChordMap create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicChordMap interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicChordMap, (void**)&dmcm); - ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicChordMap create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicChordMap_AddRef(dmcm); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicChordMap_QueryInterface(dmcm, &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 == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicChordMap_QueryInterface(dmcm, &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 == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicChordMap_Release(dmcm)); @@ -139,30 +137,30 @@ static void test_COM_template(void) hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&ps); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicTemplate create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!ps, "ps = %p\n", ps); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&ps); todo_wine ok(hr == E_NOINTERFACE, - "DirectMusicTemplate create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectMusicTemplate create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicTemplate interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistStream, (void**)&ps); - todo_wine ok(hr == S_OK, "DirectMusicTemplate create failed: %08x, expected S_OK\n", hr); + todo_wine ok(hr == S_OK, "DirectMusicTemplate create failed: %#lx, expected S_OK\n", hr); if (hr != S_OK) { skip("DirectMusicTemplate not implemented\n"); return; } refcount = IPersistStream_AddRef(ps); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IPersistStream_QueryInterface(ps, &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 == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); while (IPersistStream_Release(ps)); @@ -196,14 +194,13 @@ static void test_COM_track(void) continue; } ok(hr == CLASS_E_NOAGGREGATION, - "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + "%s create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); ok(!dmt8, "dmt8 = %p\n", dmt8); /* Invalid RIID */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt8); - ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", - class[i].name, hr); + ok(hr == E_NOINTERFACE, "%s create failed: %#lx, expected E_NOINTERFACE\n", class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, @@ -212,20 +209,20 @@ static void test_COM_track(void) skip("%s not created with CoCreateInstance()\n", class[i].name); continue; } - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); refcount = IDirectMusicTrack8_AddRef(dmt8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack8_QueryInterface(dmt8, &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 = IDirectMusicTrack8_QueryInterface(dmt8, &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); while (IDirectMusicTrack8_Release(dmt8)); @@ -242,23 +239,23 @@ static void test_chordmap(void) hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicChordMap, (void**)&dmcm); - ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicChordMap create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicChordMap_QueryInterface(dmcm, &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_DirectMusicChordMap), "Expected class CLSID_DirectMusicChordMap got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE || broken(hr == S_OK), "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK), "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 (IDirectMusicChordMap_Release(dmcm)); } @@ -310,85 +307,85 @@ static void test_chordmaptrack(void) hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack8_Init(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); - ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); - ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); todo_wine ok(hr == DMUS_E_NOT_FOUND, - "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + "GetParam(GUID_IDirectMusicChordMap) failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicChordMap, (void **)&chordmap); - ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicChordMap create failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); - ok(hr == S_OK, "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam(GUID_IDirectMusicChordMap) failed: %#lx, expected S_OK\n", hr); IDirectMusicChordMap_Release(chordmap); for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); ok(hr == DMUS_E_SET_UNSUPPORTED, - "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + "SetParam(%s) failed: %#lx, expected DMUS_E_SET_UNSUPPORTED\n", unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); todo_wine { hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &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_DirectMusicChordMapTrack), "Expected class CLSID_DirectMusicChordMapTrack 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 (IDirectMusicTrack8_Release(dmt8)); } @@ -403,62 +400,62 @@ static void test_signposttrack(void) hr = CoCreateInstance(&CLSID_DirectMusicSignPostTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack8_Init(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %#lx\n", hr); if (0) { /* Crashes on Windows */ hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); todo_wine { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); todo_wine { hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); } /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &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_DirectMusicSignPostTrack), "Expected class CLSID_DirectMusicSignPostTrack got %s\n", wine_dbgstr_guid(&class)); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_POINTER, "IPersistStream_Save failed: %#lx\n", hr); /* 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); while (IDirectMusicTrack8_Release(dmt8)); } @@ -570,12 +567,12 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicChordMap create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), "Got class guid %s, expected CLSID_DirectMusicChordMap\n", @@ -585,8 +582,8 @@ static void test_parsedescriptor(void) 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 == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), "Got class guid %s, expected CLSID_DirectMusicChordMap\n", @@ -596,25 +593,25 @@ static void test_parsedescriptor(void) /* NULL pointers */ 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); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); IStream_Release(stream); /* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_CLASS 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_CLASS), - "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), "Got class guid %s, expected CLSID_DirectMusicChordMap\n", wine_dbgstr_guid(&desc.guidClass)); @@ -627,8 +624,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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -637,8 +634,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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -646,9 +643,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_CLASS), - "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); IDirectMusicObject_Release(dmo); -- 2.34.1

1 0

[PATCH v2] dmstyle: enable compilation with long types
by Michael Stefaniuc 09 Feb '22

09 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Use the '#' flag for hex dlls/dmstyle/Makefile.in | 1 - dlls/dmstyle/auditiontrack.c | 24 +++++++-------- dlls/dmstyle/chordtrack.c | 52 +++++++++++++++---------------- dlls/dmstyle/commandtrack.c | 30 +++++++++--------- dlls/dmstyle/dmobject.c | 20 ++++++------ dlls/dmstyle/dmutils.c | 6 ++-- dlls/dmstyle/motiftrack.c | 24 +++++++-------- dlls/dmstyle/mutetrack.c | 24 +++++++-------- dlls/dmstyle/style.c | 60 ++++++++++++++++++------------------ dlls/dmstyle/styletrack.c | 38 +++++++++++------------ 10 files changed, 139 insertions(+), 140 deletions(-) diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in index 8067d5e4675..a95a524d473 100644 --- a/dlls/dmstyle/Makefile.in +++ b/dlls/dmstyle/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmstyle.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index ececce9728f..29ad868f773 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI audition_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface) IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI audition_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI audition_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -143,7 +143,7 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -208,7 +208,7 @@ static HRESULT WINAPI audition_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -217,7 +217,7 @@ static HRESULT WINAPI audition_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -227,7 +227,7 @@ static HRESULT WINAPI audition_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU DWORD dwFlags) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -236,7 +236,7 @@ static HRESULT WINAPI audition_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -246,7 +246,7 @@ static HRESULT WINAPI audition_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI audition_track_Join(IDirectMusicTrack8 *iface, IDirectMusi MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, + TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 90db0a202a0..98c9169d2ee 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -68,7 +68,7 @@ static ULONG WINAPI chord_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -78,7 +78,7 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface) IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(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); @@ -100,7 +100,7 @@ static HRESULT WINAPI chord_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -116,7 +116,7 @@ static HRESULT WINAPI chord_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -125,7 +125,7 @@ static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -146,7 +146,7 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -194,7 +194,7 @@ static HRESULT WINAPI chord_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -203,7 +203,7 @@ static HRESULT WINAPI chord_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -213,7 +213,7 @@ static HRESULT WINAPI chord_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -222,7 +222,7 @@ static HRESULT WINAPI chord_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -232,7 +232,7 @@ static HRESULT WINAPI chord_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -241,7 +241,7 @@ static HRESULT WINAPI chord_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr IDirectMusicTrack **ppResultTrack) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -284,12 +284,12 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_ do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_CHORDTRACKHEADER_CHUNK: { TRACE_(dmfile)(": Chord track header chunk\n"); IStream_Read (pStm, &This->dwScale, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - dwScale: %d\n", This->dwScale); + TRACE_(dmfile)(" - dwScale: %ld\n", This->dwScale); break; } case DMUS_FOURCC_CHORDTRACKBODY_CHUNK: { @@ -302,28 +302,28 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_ TRACE_(dmfile)(": Chord track body chunk\n"); IStream_Read (pStm, &sz, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - sizeof(DMUS_IO_CHORD): %d\n", sz); + TRACE_(dmfile)(" - sizeof(DMUS_IO_CHORD): %ld\n", sz); if (sz != sizeof(DMUS_IO_CHORD)) return E_FAIL; IStream_Read (pStm, &body, sizeof(DMUS_IO_CHORD), NULL); TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(body.wszName)); - TRACE_(dmfile)(" - mtTime: %u\n", body.mtTime); + TRACE_(dmfile)(" - mtTime: %lu\n", body.mtTime); TRACE_(dmfile)(" - wMeasure: %u\n", body.wMeasure); TRACE_(dmfile)(" - bBeat: %u\n", body.bBeat); TRACE_(dmfile)(" - bFlags: 0x%02x\n", body.bFlags); IStream_Read (pStm, &num, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - # DMUS_IO_SUBCHORDS: %d\n", num); + TRACE_(dmfile)(" - # DMUS_IO_SUBCHORDS: %ld\n", num); IStream_Read (pStm, &sz, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - sizeof(DMUS_IO_SUBCHORDS): %d\n", sz); + TRACE_(dmfile)(" - sizeof(DMUS_IO_SUBCHORDS): %ld\n", sz); if (sz != sizeof(DMUS_IO_SUBCHORD)) return E_FAIL; for (it = 0; it < num; ++it) { IStream_Read (pStm, &subchords, sizeof(DMUS_IO_SUBCHORD), NULL); - TRACE_(dmfile)("DMUS_IO_SUBCHORD #%d\n", it+1); - TRACE_(dmfile)(" - dwChordPattern: %u\n", subchords.dwChordPattern); - TRACE_(dmfile)(" - dwScalePattern: %u\n", subchords.dwScalePattern); - TRACE_(dmfile)(" - dwInversionPoints: %u\n", subchords.dwInversionPoints); - TRACE_(dmfile)(" - dwLevels: %u\n", subchords.dwLevels); + TRACE_(dmfile)("DMUS_IO_SUBCHORD #%ld\n", it+1); + TRACE_(dmfile)(" - dwChordPattern: %lu\n", subchords.dwChordPattern); + TRACE_(dmfile)(" - dwScalePattern: %lu\n", subchords.dwScalePattern); + TRACE_(dmfile)(" - dwInversionPoints: %lu\n", subchords.dwInversionPoints); + TRACE_(dmfile)(" - dwLevels: %lu\n", subchords.dwLevels); TRACE_(dmfile)(" - bChordRoot: %u\n", subchords.bChordRoot); TRACE_(dmfile)(" - bScaleRoot: %u\n", subchords.bScaleRoot); } @@ -336,7 +336,7 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_ 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]); return S_OK; @@ -357,11 +357,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_CHORDTRACK_LIST: { TRACE_(dmfile)(": Chord track list\n"); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index d8b57b8c1f0..417b7847403 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -67,7 +67,7 @@ static ULONG WINAPI command_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -77,7 +77,7 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface) IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(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); @@ -99,7 +99,7 @@ static HRESULT WINAPI command_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -115,7 +115,7 @@ static HRESULT WINAPI command_track_Play(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -124,7 +124,7 @@ static HRESULT WINAPI command_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -148,7 +148,7 @@ static HRESULT WINAPI command_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -204,7 +204,7 @@ static HRESULT WINAPI command_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -213,7 +213,7 @@ static HRESULT WINAPI command_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -223,7 +223,7 @@ static HRESULT WINAPI command_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI void *pStateData, DWORD dwFlags) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -232,7 +232,7 @@ static HRESULT WINAPI command_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -242,7 +242,7 @@ static HRESULT WINAPI command_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -251,7 +251,7 @@ static HRESULT WINAPI command_track_Join(IDirectMusicTrack8 *iface, IDirectMusic IDirectMusicTrack **ppResultTrack) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -290,14 +290,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL); IStream_Read (pStm, &chunkSize, sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize); switch (chunkID) { case DMUS_FOURCC_COMMANDTRACK_CHUNK: { DWORD count; TRACE_(dmfile)(": command track chunk\n"); IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL); if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) { - TRACE_(dmfile)(": declared size of struct (=%d) != actual size; indicates older direct music version\n", dwSizeOfStruct); + TRACE_(dmfile)(": declared size of struct (=%ld) != actual size; indicates older direct music version\n", dwSizeOfStruct); } chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */ nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */ @@ -329,7 +329,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS LIST_FOR_EACH (listEntry, &This->Commands) { tmpEntry = LIST_ENTRY (listEntry, DMUS_PRIVATE_COMMAND, entry); TRACE(" - Command[%i]:\n", r); - TRACE(" - mtTime = %i\n", tmpEntry->pCommand.mtTime); + TRACE(" - mtTime = %li\n", tmpEntry->pCommand.mtTime); TRACE(" - wMeasure = %d\n", tmpEntry->pCommand.wMeasure); TRACE(" - bBeat = %i\n", tmpEntry->pCommand.bBeat); TRACE(" - bCommand = %i\n", tmpEntry->pCommand.bCommand); diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c index e6a1ce906a7..84b08e0d772 100644 --- a/dlls/dmstyle/dmobject.c +++ b/dlls/dmstyle/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/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index d12d64f76dc..58a1c40622a 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -167,7 +167,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -179,7 +179,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - dwValidData: %lu\n", ref.dwValidData); break; } default: { @@ -190,7 +190,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } } } - TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 2452d1a94d0..0fa1a48bcc4 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI motif_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface) IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI motif_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI motif_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -139,7 +139,7 @@ static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -198,7 +198,7 @@ static HRESULT WINAPI motif_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI motif_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -217,7 +217,7 @@ static HRESULT WINAPI motif_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -226,7 +226,7 @@ static HRESULT WINAPI motif_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -236,7 +236,7 @@ static HRESULT WINAPI motif_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -244,7 +244,7 @@ static HRESULT WINAPI motif_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, + TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index deba4966a9e..08fed5d5f2a 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI mute_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface) IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI mute_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI mute_track_Play(IDirectMusicTrack8 *iface, void *pStateDat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -139,7 +139,7 @@ static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -189,7 +189,7 @@ static HRESULT WINAPI mute_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -198,7 +198,7 @@ static HRESULT WINAPI mute_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -208,7 +208,7 @@ static HRESULT WINAPI mute_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r DWORD dwFlags) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -217,7 +217,7 @@ static HRESULT WINAPI mute_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -227,7 +227,7 @@ static HRESULT WINAPI mute_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -235,7 +235,7 @@ static HRESULT WINAPI mute_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, + TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index f8a62604a99..87b7eed0902 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -95,7 +95,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -105,7 +105,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct style_band *band, *band2; @@ -173,7 +173,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); + FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -199,7 +199,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface const struct list *cursor; unsigned int i = 0; - TRACE("(%p, %u, %p)\n", This, index, name); + TRACE("(%p, %lu, %p)\n", This, index, name); if (!name) return E_POINTER; @@ -244,7 +244,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *if WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); + FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -268,7 +268,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusic DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %d, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax); + FIXME("(%p, %ld, %ld, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax); return S_OK; } @@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *ifa DWORD dwPatternType, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, dwIndex, dwPatternType, pwszName); + FIXME("(%p, %ld, %ld, %p): stub\n", This, dwIndex, dwPatternType, pwszName); return S_OK; } @@ -402,7 +402,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_PARTREF_CHUNK: { TRACE_(dmfile)(": PartRef chunk\n"); @@ -428,7 +428,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); if (!pNewItem) { ERR(": pNewItem not yet allocated, chunk order bad?\n"); @@ -447,7 +447,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, } } } - 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]); break; } @@ -467,7 +467,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, 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]); return S_OK; @@ -495,7 +495,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_PART_CHUNK: { TRACE_(dmfile)(": Part chunk (skipping for now)\n" ); @@ -507,8 +507,8 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) TRACE_(dmfile)(": Note chunk (skipping for now)\n"); IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); - TRACE_(dmfile)(" - dwSize: %u\n", dwSize); - TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); + TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -523,8 +523,8 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) TRACE_(dmfile)(": Curve chunk (skipping for now)\n"); IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); - TRACE_(dmfile)(" - dwSize: %u\n", dwSize); - TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); + TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -564,7 +564,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &desc); if (FAILED(hr)) return hr; @@ -579,7 +579,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) } } } - 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]); break; } @@ -599,7 +599,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) 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]); return S_OK; @@ -626,7 +626,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_PATTERN_CHUNK: { TRACE_(dmfile)(": Pattern chunk\n"); @@ -649,7 +649,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU case DMUS_FOURCC_RHYTHM_CHUNK: { TRACE_(dmfile)(": Rhythm chunk\n"); IStream_Read (pStm, &pNewMotif->dwRhythm, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - dwRhythm: %u\n", pNewMotif->dwRhythm); + TRACE_(dmfile)(" - dwRhythm: %lu\n", pNewMotif->dwRhythm); /** TODO understand why some Chunks have size > 4 */ liMove.QuadPart = Chunk.dwSize - sizeof(DWORD); IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); @@ -719,7 +719,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &pNewMotif->desc); if (FAILED(hr)) return hr; @@ -734,7 +734,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU } } } - 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]); break; } @@ -760,7 +760,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU 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]); return S_OK; @@ -787,7 +787,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -864,7 +864,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -879,7 +879,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK } } } - 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; } @@ -912,7 +912,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -928,11 +928,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS FIXME("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_FORM: { TRACE_(dmfile)(": Style form\n"); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index f80073e42bf..a1e31bcd3b4 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -69,7 +69,7 @@ static ULONG WINAPI style_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct list *cursor, *cursor2; @@ -112,7 +112,7 @@ static HRESULT WINAPI style_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -128,7 +128,7 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -138,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); struct list *item = NULL; - TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -168,7 +168,7 @@ static HRESULT WINAPI style_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -231,7 +231,7 @@ static HRESULT WINAPI style_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -240,7 +240,7 @@ static HRESULT WINAPI style_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -250,7 +250,7 @@ static HRESULT WINAPI style_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -259,7 +259,7 @@ static HRESULT WINAPI style_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -269,7 +269,7 @@ static HRESULT WINAPI style_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -278,7 +278,7 @@ static HRESULT WINAPI style_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr IDirectMusicTrack **ppResultTrack) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -325,7 +325,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_TIME_STAMP_CHUNK: { TRACE_(dmfile)(": Time Stamp chunk\n"); @@ -335,7 +335,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK return E_OUTOFMEMORY; } IStream_Read (pStm, &pNewItem->dwTimeStamp, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - dwTimeStamp: %u\n", pNewItem->dwTimeStamp); + TRACE_(dmfile)(" - dwTimeStamp: %lu\n", pNewItem->dwTimeStamp); list_add_tail (&This->Items, &pNewItem->entry); break; } @@ -381,7 +381,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK 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]); return S_OK; @@ -406,7 +406,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_ do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -436,7 +436,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_ 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]); return S_OK; @@ -457,11 +457,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_TRACK_LIST: { TRACE_(dmfile)(": Chord track list\n"); -- 2.34.1

1 0

[PATCH v2] dmscript: enable compilation with long types
by Michael Stefaniuc 09 Feb '22

09 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Use the '#' flag for hex dlls/dmscript/Makefile.in | 1 - dlls/dmscript/dmobject.c | 20 ++++++++++---------- dlls/dmscript/script.c | 22 +++++++++++----------- dlls/dmscript/scripttrack.c | 24 ++++++++++++------------ 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in index 9544d88dacc..55107e116c9 100644 --- a/dlls/dmscript/Makefile.in +++ b/dlls/dmscript/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmscript.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmscript/dmobject.c b/dlls/dmscript/dmobject.c index e6a1ce906a7..84b08e0d772 100644 --- a/dlls/dmscript/dmobject.c +++ b/dlls/dmscript/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/dmscript/script.c b/dlls/dmscript/script.c index 80c5273a710..5bc6a8b3067 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -76,7 +76,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(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->pHeader); @@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScrip WCHAR *pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - FIXME("(%p, %s, %i, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo); + FIXME("(%p, %s, %li, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo); return S_OK; } @@ -171,7 +171,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *ifa WCHAR *pwszName) { IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); + FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -179,7 +179,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *if WCHAR *pwszName) { IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); + FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -259,7 +259,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS FIXME("(%p, %p): Loading not implemented yet\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -272,7 +272,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_SCRIPT_CHUNK: { TRACE_(dmfile)(": script header chunk\n"); @@ -284,7 +284,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": script version chunk\n"); This->pVersion = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); IStream_Read (pStm, This->pVersion, Chunk.dwSize, NULL); - TRACE_(dmfile)("version: 0x%08x.0x%08x\n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS); + TRACE_(dmfile)("version: 0x%08lx.0x%08lx\n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS); break; } case DMUS_FOURCC_SCRIPTLANGUAGE_CHUNK: { @@ -385,7 +385,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes (though strings seem to be valid unicode) */ @@ -431,7 +431,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS 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; } @@ -451,7 +451,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); break; } diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 1bdf3e13c5e..6e430de3f39 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -72,7 +72,7 @@ static ULONG WINAPI script_track_AddRef(IDirectMusicTrack8 *iface) DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(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 script_track_Release(IDirectMusicTrack8 *iface) DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(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); @@ -104,7 +104,7 @@ static HRESULT WINAPI script_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -120,7 +120,7 @@ static HRESULT WINAPI script_track_Play(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -129,7 +129,7 @@ static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID t { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -139,7 +139,7 @@ static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID t { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -175,7 +175,7 @@ static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME m MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -184,7 +184,7 @@ static HRESULT WINAPI script_track_PlayEx(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -194,7 +194,7 @@ static HRESULT WINAPI script_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -203,7 +203,7 @@ static HRESULT WINAPI script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -213,7 +213,7 @@ static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown * { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, group, res_track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, group, res_track); return E_NOTIMPL; } @@ -223,7 +223,7 @@ static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicT { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, track2, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, track2, join, context, group, res_track); return E_NOTIMPL; -- 2.34.1

1 0

[PATCH v2] dmloader: enable compilation with long types
by Michael Stefaniuc 09 Feb '22

09 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Use the '#' flag for hex dlls/dmloader/Makefile.in | 1 - dlls/dmloader/container.c | 30 ++++++++++++++--------------- dlls/dmloader/debug.c | 4 ++-- dlls/dmloader/dmloader_main.c | 2 +- dlls/dmloader/dmobject.c | 20 +++++++++---------- dlls/dmloader/loader.c | 10 +++++----- dlls/dmloader/loaderstream.c | 36 +++++++++++++++++------------------ 7 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in index 880f2bfc02a..4aa80c6dfb3 100644 --- a/dlls/dmloader/Makefile.in +++ b/dlls/dmloader/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmloader.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 005f0d7e9ed..111c0db4760 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -121,7 +121,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_AddRef(IDirectMusicContainer *ifac IDirectMusicContainerImpl *This = impl_from_IDirectMusicContainer(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -131,7 +131,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_Release(IDirectMusicContainer *ifa IDirectMusicContainerImpl *This = impl_from_IDirectMusicContainer(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { if (This->pStream) @@ -151,12 +151,12 @@ static HRESULT WINAPI IDirectMusicContainerImpl_EnumObject(IDirectMusicContainer LPWINE_CONTAINER_ENTRY pContainedObject; DWORD dwCount = 0; - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias); if (!pDesc) return E_POINTER; if (pDesc->dwSize != sizeof(DMUS_OBJECTDESC)) { - ERR(": invalid pDesc->dwSize %d\n", pDesc->dwSize); + ERR(": invalid pDesc->dwSize %ld\n", pDesc->dwSize); return E_INVALIDARG; } @@ -278,7 +278,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS /* start with load */ IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -293,7 +293,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_CONTAINER_CHUNK: { IStream_Read (pStm, &This->Header, Chunk.dwSize, NULL); @@ -343,7 +343,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes (though strings seem to be valid unicode) */ @@ -369,7 +369,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %#lx < ListSize[0] = %#lx\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); break; } @@ -378,7 +378,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -394,7 +394,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_CONTAINED_ALIAS_CHUNK: { TRACE_(dmfile)(": alias chunk\n"); @@ -428,7 +428,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[2] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_REF_CHUNK: { DMUS_IO_REFERENCE tmpReferenceHeader; /* temporary structure */ @@ -486,7 +486,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": ListCount[2] = 0x%08X < ListSize[2] = 0x%08X\n", ListCount[2], ListSize[2]); + TRACE_(dmfile)(": ListCount[2] = %#lx < ListSize[2] = %#lx\n", ListCount[2], ListSize[2]); } while (ListCount[2] < ListSize[2]); break; } @@ -531,7 +531,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": ListCount[1] = 0x%08X < ListSize[1] = 0x%08X\n", ListCount[1], ListSize[1]); + TRACE_(dmfile)(": ListCount[1] = %#lx < ListSize[1] = %#lx\n", ListCount[1], ListSize[1]); } while (ListCount[1] < ListSize[1]); /* SetObject: this will fill descriptor with additional info and add alias in loader's cache */ IDirectMusicLoader_SetObject (pLoader, &pNewEntry->Desc); @@ -564,7 +564,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %#lx < ListSize[0] = %#lx\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); break; } @@ -584,7 +584,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": StreamCount[0] = 0x%08X < StreamSize[0] = 0x%08X\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %#lx < StreamSize[0] = %#lx\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); break; } diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 1be92e72af4..ac1d6ac7d72 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -48,7 +48,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); - ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags, + ptr += sprintf(ptr, "\n - dwFlags = %#lx%s", pHeader->dwFlags, pHeader->dwFlags & DMUS_CONTAINER_NOLOADS ? " (DMUS_CONTAINER_NOLOADS)" : ""); return wine_dbg_sprintf("%s", buffer); @@ -63,7 +63,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); - ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags, + ptr += sprintf(ptr, "\n - dwFlags = %#lx%s", pHeader->dwFlags, pHeader->dwFlags & DMUS_CONTAINED_OBJF_KEEP ? " (DMUS_CONTAINED_OBJF_KEEP)" : ""); ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 04e30fc791d..61aa092b5f8 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -128,7 +128,7 @@ static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, create_dmconta */ HRESULT WINAPI DllCanUnloadNow (void) { - TRACE("() ref=%d\n", module_ref); + TRACE("() ref=%ld\n", module_ref); return module_ref ? S_FALSE : S_OK; } diff --git a/dlls/dmloader/dmobject.c b/dlls/dmloader/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmloader/dmobject.c +++ b/dlls/dmloader/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/dmloader/loader.c b/dlls/dmloader/loader.c index 00170f42937..0bb22a406ab 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -138,7 +138,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_AddRef(IDirectMusicLoader8 *iface) IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p)->(): new ref = %lu\n", iface, ref); return ref; } @@ -148,7 +148,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface) IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p)->(): new ref = %lu\n", iface, ref); if (!ref) { unsigned int i; @@ -402,7 +402,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac IStream_Release(pStream); IPersistStream_Release(pPersistStream); IDirectMusicObject_Release(pObject); - WARN(": failed to (completely) load object (%08x)\n", result); + WARN(": failed to (completely) load object (%#lx)\n", result); return result; } /* get descriptor */ @@ -534,7 +534,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(hr)) { IStream_Release(pStream); - ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); + ERR("Object creation of %s failed %#lx\n", debugstr_guid(&pDesc->guidClass),hr); return DMUS_E_LOADER_FAILEDOPEN; } @@ -786,7 +786,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_EnumObject(IDirectMusicLoader8 *ifa IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); DWORD dwCount = 0; struct cache_entry *pObjectEntry; - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); DM_STRUCT_INIT(pDesc); diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 150a53524a7..864c222e118 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -110,7 +110,7 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_QueryInterface (LPSTR static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_AddRef (LPSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface); - TRACE("(%p): AddRef from %d\n", This, This->dwRef); + TRACE("(%p): AddRef from %ld\n", This, This->dwRef); return InterlockedIncrement (&This->dwRef); } @@ -118,7 +118,7 @@ static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_Release (LPSTREAM iface ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface); DWORD dwRef = InterlockedDecrement (&This->dwRef); - TRACE("(%p): ReleaseRef to %d\n", This, dwRef); + TRACE("(%p): ReleaseRef to %ld\n", This, dwRef); if (dwRef == 0) { if (This->hFile) IDirectMusicLoaderFileStream_Detach (iface); @@ -132,12 +132,12 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Read (LPSTREAM iface, ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface); ULONG cbRead; - TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead); + TRACE_(dmfileraw)("(%p, %p, %#lx, %p)\n", This, pv, cb, pcbRead); if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL; if (pcbRead == NULL) pcbRead = &cbRead; if (!ReadFile (This->hFile, pv, cb, pcbRead, NULL) || *pcbRead != cb) return E_FAIL; - TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", *pcbRead, debugstr_an(pv, *pcbRead)); + TRACE_(dmfileraw)(": data (size = %#lx): %s\n", *pcbRead, debugstr_an(pv, *pcbRead)); return S_OK; } @@ -194,12 +194,12 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Write (LPSTREAM iface ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface); ULONG cbWrite; - TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbWritten); + TRACE_(dmfileraw)("(%p, %p, %#lx, %p)\n", This, pv, cb, pcbWritten); if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL; if (pcbWritten == NULL) pcbWritten = &cbWrite; if (!WriteFile (This->hFile, pv, cb, pcbWritten, NULL) || *pcbWritten != cb) return E_FAIL; - TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten)); + TRACE_(dmfileraw)(": data (size = %#lx): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten)); return S_OK; } @@ -358,7 +358,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_QueryInterface (L static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_AddRef (LPSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface); - TRACE("(%p): AddRef from %d\n", This, This->dwRef); + TRACE("(%p): AddRef from %ld\n", This, This->dwRef); return InterlockedIncrement (&This->dwRef); } @@ -366,7 +366,7 @@ static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_Release (LPSTREAM i ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface); DWORD dwRef = InterlockedDecrement (&This->dwRef); - TRACE("(%p): ReleaseRef to %d\n", This, dwRef); + TRACE("(%p): ReleaseRef to %ld\n", This, dwRef); if (dwRef == 0) { IDirectMusicLoaderResourceStream_Detach (iface); HeapFree (GetProcessHeap(), 0, This); @@ -379,7 +379,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if LPBYTE pByte; ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface); - TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead); + TRACE_(dmfileraw)("(%p, %p, %#lx, %p)\n", This, pv, cb, pcbRead); if ((This->llPos + cb) > This->llMemLength) { WARN_(dmfileraw)(": requested size out of range\n"); return E_FAIL; @@ -391,7 +391,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if /* FIXME: error checking would be nice */ if (pcbRead) *pcbRead = cb; - TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", cb, debugstr_an(pv, cb)); + TRACE_(dmfileraw)(": data (size = %#lx): %s\n", cb, debugstr_an(pv, cb)); return S_OK; } @@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_QueryInterface (LP static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_AddRef (LPSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p): AddRef from %d\n", This, This->dwRef); + TRACE("(%p): AddRef from %ld\n", This, This->dwRef); return InterlockedIncrement (&This->dwRef); } @@ -626,7 +626,7 @@ static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_Release (LPSTREAM if ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); DWORD dwRef = InterlockedDecrement (&This->dwRef); - TRACE("(%p): ReleaseRef to %d\n", This, dwRef); + TRACE("(%p): ReleaseRef to %ld\n", This, dwRef); if (dwRef == 0) { IDirectMusicLoaderGenericStream_Detach (iface); HeapFree (GetProcessHeap(), 0, This); @@ -638,7 +638,7 @@ static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_Release (LPSTREAM if static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Read (LPSTREAM iface, void* pv, ULONG cb, ULONG* pcbRead) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead); + TRACE_(dmfileraw)("(%p, %p, %#lx, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead); if (!This->pStream) return E_FAIL; @@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Write (LPSTREAM iface, const void* pv, ULONG cb, ULONG* pcbWritten) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten); + TRACE_(dmfileraw)("(%p, %p, %#lx, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten); if (!This->pStream) return E_FAIL; @@ -704,7 +704,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_CopyTo (LPSTREAM i static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Commit (LPSTREAM iface, DWORD grfCommitFlags) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, 0x%08X): redirecting to low-level stream\n", This, grfCommitFlags); + TRACE("(%p, %#lx): redirecting to low-level stream\n", This, grfCommitFlags); if (!This->pStream) return E_FAIL; @@ -722,7 +722,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Revert (LPSTREAM i static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); + TRACE("(%p, %s, %s, %#lx): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); if (!This->pStream) return E_FAIL; @@ -731,7 +731,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTRE static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); + TRACE("(%p, %s, %s, %#lx): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); if (!This->pStream) return E_FAIL; @@ -740,7 +740,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPST static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Stat (LPSTREAM iface, STATSTG* pstatstg, DWORD grfStatFlag) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, %p, 0x%08X): redirecting to low-level stream\n", This, pstatstg, grfStatFlag); + TRACE("(%p, %p, %#lx): redirecting to low-level stream\n", This, pstatstg, grfStatFlag); if (!This->pStream) return E_FAIL; -- 2.34.1

1 0

[PATCH v2] dmcompos: enable compilation with long types
by Michael Stefaniuc 09 Feb '22

09 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Use the '#' flag for hex dlls/dmcompos/Makefile.in | 1 - dlls/dmcompos/chordmap.c | 14 +++++++------- dlls/dmcompos/chordmaptrack.c | 24 ++++++++++++------------ dlls/dmcompos/composer.c | 8 ++++---- dlls/dmcompos/dmobject.c | 20 ++++++++++---------- dlls/dmcompos/signposttrack.c | 24 ++++++++++++------------ 6 files changed, 45 insertions(+), 46 deletions(-) diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in index 2f511a8568c..d1e9b5e5b45 100644 --- a/dlls/dmcompos/Makefile.in +++ b/dlls/dmcompos/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmcompos.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index c58857e04c4..ef2fa036ccb 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -67,7 +67,7 @@ static ULONG WINAPI IDirectMusicChordMapImpl_AddRef(IDirectMusicChordMap *iface) IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -77,7 +77,7 @@ static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(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); @@ -160,7 +160,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS FIXME("(%p, %p): Loading not implemented yet\n", This, pStm); IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL); IStream_Read (pStm, &chunkSize, sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize); switch (chunkID) { case FOURCC_RIFF: { IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL); @@ -174,7 +174,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL); IStream_Read (pStm, &chunkSize, sizeof(FOURCC), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + chunkSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize); switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); @@ -206,7 +206,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL); IStream_Read (pStm, &chunkSize, sizeof(FOURCC), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunkSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize); switch (chunkID) { /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes (though strings seem to be valid unicode) */ @@ -252,7 +252,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS 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; } @@ -272,7 +272,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS break; } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); break; } diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index cf4f8259868..27e7dd94887 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI chordmap_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI chordmap_track_Release(IDirectMusicTrack8 *iface) IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI chordmap_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -139,7 +139,7 @@ static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -189,7 +189,7 @@ static HRESULT WINAPI chordmap_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -198,7 +198,7 @@ static HRESULT WINAPI chordmap_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -208,7 +208,7 @@ static HRESULT WINAPI chordmap_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU DWORD dwFlags) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -217,7 +217,7 @@ static HRESULT WINAPI chordmap_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -227,7 +227,7 @@ static HRESULT WINAPI chordmap_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -236,7 +236,7 @@ static HRESULT WINAPI chordmap_track_Join(IDirectMusicTrack8 *iface, IDirectMusi IDirectMusicTrack **ppResultTrack) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index 9fbe1689c66..84ca90aaf42 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -55,7 +55,7 @@ static ULONG WINAPI IDirectMusicComposerImpl_AddRef(IDirectMusicComposer *iface) IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -65,7 +65,7 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); @@ -100,7 +100,7 @@ static HRESULT WINAPI IDirectMusicComposerImpl_ComposeTransition(IDirectMusicCom IDirectMusicSegment **ppTransSeg) { IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); - FIXME("(%p, %p, %p, %d, %d, %d, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg); + FIXME("(%p, %p, %p, %ld, %d, %ld, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg); return S_OK; } @@ -110,7 +110,7 @@ static HRESULT WINAPI IDirectMusicComposerImpl_AutoTransition(IDirectMusicCompos IDirectMusicSegmentState **ppToSegState, IDirectMusicSegmentState **ppTransSegState) { IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); - FIXME("(%p, %p, %d, %d, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState); + FIXME("(%p, %p, %d, %ld, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState); return S_OK; } diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c index e6a1ce906a7..84b08e0d772 100644 --- a/dlls/dmcompos/dmobject.c +++ b/dlls/dmcompos/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/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index d07982975c9..8da4ade961a 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI signpost_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI signpost_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI signpost_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI signpost_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI signpost_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI signpost_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -164,7 +164,7 @@ static HRESULT WINAPI signpost_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -173,7 +173,7 @@ static HRESULT WINAPI signpost_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -183,7 +183,7 @@ static HRESULT WINAPI signpost_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -193,7 +193,7 @@ static HRESULT WINAPI signpost_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -202,7 +202,7 @@ static HRESULT WINAPI signpost_track_Compose(IDirectMusicTrack8 *iface, IUnknown DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -211,7 +211,7 @@ static HRESULT WINAPI signpost_track_Join(IDirectMusicTrack8 *iface, IDirectMusi IDirectMusicTrack **ppResultTrack) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } -- 2.34.1

1 0

[PATCH] kernelbase: Implement GetFileInformationByHandleEx(FileFullDirectoryInfo).
by Paul Gofman 09 Feb '22

09 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 60 ++++++++++++++++++++++++++++++++++---- dlls/kernelbase/file.c | 12 ++++++-- include/winbase.h | 15 ++++++++++ 3 files changed, 80 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f8e49491a7d..0d178306648 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4181,11 +4181,13 @@ todo_wine_if (i == 1) static void test_GetFileInformationByHandleEx(void) { int i; - char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024], *strPtr; - BOOL ret; + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024], buffer2[1024], *strPtr; + BOOL first, ret; DWORD ret2, written; + unsigned int count, count2, size; HANDLE directory, file; FILE_ID_BOTH_DIR_INFO *bothDirInfo; + FILE_FULL_DIR_INFO *full_dir_info; FILE_BASIC_INFO *basicInfo; FILE_STANDARD_INFO *standardInfo; FILE_NAME_INFO *nameInfo; @@ -4205,7 +4207,11 @@ static void test_GetFileInformationByHandleEx(void) {0xdeadbeef, NULL, 0, ERROR_INVALID_PARAMETER}, {FileIdBothDirectoryInfo, NULL, 0, ERROR_BAD_LENGTH}, {FileIdBothDirectoryInfo, NULL, sizeof(buffer), ERROR_NOACCESS}, - {FileIdBothDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}}; + {FileIdBothDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}, + {FileFullDirectoryInfo, NULL, 0, ERROR_BAD_LENGTH}, + {FileFullDirectoryInfo, NULL, sizeof(buffer), ERROR_NOACCESS}, + {FileFullDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}, + }; if (!pGetFileInformationByHandleEx) { @@ -4236,6 +4242,7 @@ static void test_GetFileInformationByHandleEx(void) "got %u.\n", checks[i].errorCode, GetLastError()); } + first = TRUE; while (TRUE) { memset(buffer, 0xff, sizeof(buffer)); @@ -4243,8 +4250,51 @@ static void test_GetFileInformationByHandleEx(void) if (!ret && GetLastError() == ERROR_NO_MORE_FILES) break; ok(ret, "GetFileInformationByHandleEx: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); - if (!ret) - break; + + if (first) + { + count = 1; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + while (bothDirInfo->NextEntryOffset) + { + ++count; + size = offsetof(FILE_ID_BOTH_DIR_INFO, FileName[bothDirInfo->FileNameLength / 2]); + size = (size + 7) & ~7; + ok(bothDirInfo->NextEntryOffset == size, + "Got unexpected structure size, NextEntryOffset %u (%u).\n", bothDirInfo->NextEntryOffset, + size); + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + size = offsetof(FILE_FULL_DIR_INFO, FileName[bothDirInfo->FileNameLength / 2]); + ret = pGetFileInformationByHandleEx(directory, FileFullDirectoryRestartInfo, buffer2, sizeof(buffer2)); + ok(ret, "failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + + count2 = 0; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + full_dir_info = (FILE_FULL_DIR_INFO *)buffer2; + while (1) + { + ++count2; + ok(bothDirInfo->FileNameLength == full_dir_info->FileNameLength, + "FileNameLength does not match, count2 %u.\n", count2); + ok(!memcmp(bothDirInfo->FileName, full_dir_info->FileName, full_dir_info->FileNameLength), + "FileName does not match, count %u.\n", count2); + + if (!full_dir_info->NextEntryOffset || !bothDirInfo->NextEntryOffset) + break; + + size = offsetof(FILE_FULL_DIR_INFO, FileName[full_dir_info->FileNameLength / 2]); + size = (size + 7) & ~7; + ok(full_dir_info->NextEntryOffset == size, + "Got unexpected structure size, NextEntryOffset %u (%u).\n", bothDirInfo->NextEntryOffset, + size); + full_dir_info = (FILE_FULL_DIR_INFO *)(((char *)full_dir_info) + full_dir_info->NextEntryOffset); + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + ok(count2 == count, "Got unexpected count2 %u, count %u.\n", count2, count); + first = FALSE; + } + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; while (TRUE) { diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 576e03eb62b..c1d9401f5c2 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2954,13 +2954,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ NTSTATUS status; IO_STATUS_BLOCK io; + TRACE( "%p, %u, %p, %u.\n", handle, class, info, size ); + switch (class) { case FileStreamInfo: case FileCompressionInfo: case FileRemoteProtocolInfo: - case FileFullDirectoryInfo: - case FileFullDirectoryRestartInfo: case FileStorageInfo: case FileAlignmentInfo: case FileIdExtdDirectoryInfo: @@ -2969,6 +2969,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileFullDirectoryRestartInfo: + case FileFullDirectoryInfo: + status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size, + FileFullDirectoryInformation, FALSE, NULL, + (class == FileFullDirectoryRestartInfo) ); + break; + case FileAttributeTagInfo: status = NtQueryInformationFile( handle, &io, info, size, FileAttributeTagInformation ); break; @@ -3002,6 +3009,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ case FileIoPriorityHintInfo: case FileEndOfFileInfo: default: + WARN( "class %u is not supported.\n", class ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..b2d5ca68d42 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -823,6 +823,21 @@ typedef struct _FILE_ID_BOTH_DIR_INFO { WCHAR FileName[1]; } FILE_ID_BOTH_DIR_INFO, *PFILE_ID_BOTH_DIR_INFO; +typedef struct _FILE_FULL_DIR_INFO { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + WCHAR FileName[1]; +} FILE_FULL_DIR_INFO, *PFILE_FULL_DIR_INFO; + typedef struct _FILE_BASIC_INFO { LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime; -- 2.34.1

2 1

[PATCH vkd3d v2 3/3] vkd3d-shader/hlsl: Cover all numeric types in constant folding operations.
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v2: * Converting the code in just one commit, without creating a commit for each operation. * Taking value union member 'b' for HLSL_TYPE_BOOL into account. * Using the same logic for HLSL_TYPE_UINT in for HLSL_TYPE_INT in addition, negation, and multiplication to avoid undefined behaviors. * Renamed 'tgt's parameters as 'dst's. * Operations return bool instead of int. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_constant_ops.c | 314 +++++++++++++++++--------- 2 files changed, 213 insertions(+), 102 deletions(-) diff --git a/Makefile.am b/Makefile.am index c3ba3feb..f9f5a3b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,7 +94,6 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/max.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9e19cef4..46a3c411 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -20,11 +20,196 @@ #include "hlsl.h" +static bool constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src) +{ + uint32_t u; + int32_t i; + double d; + float f; + bool b; + + if (dst->node.data_type->dimx != src->node.data_type->dimx || + dst->node.data_type->dimy != src->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + + for (int k = 0; k < 4; k++) + { + switch (src->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + u = src->value[k].f; + i = src->value[k].f; + f = src->value[k].f; + d = src->value[k].f; + b = src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + u = src->value[k].d; + i = src->value[k].d; + f = src->value[k].d; + d = src->value[k].d; + b = src->value[k].d; + break; + case HLSL_TYPE_INT: + u = src->value[k].i; + i = src->value[k].i; + f = src->value[k].i; + d = src->value[k].i; + b = src->value[k].i; + break; + case HLSL_TYPE_UINT: + u = src->value[k].u; + i = src->value[k].u; + f = src->value[k].u; + d = src->value[k].u; + b = src->value[k].u; + break; + case HLSL_TYPE_BOOL: + u = src->value[k].b; + i = src->value[k].b; + f = src->value[k].b; + d = src->value[k].b; + b = src->value[k].b; + break; + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + switch (dst->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = f; + break; + case HLSL_TYPE_DOUBLE: + dst->value[k].d = d; + break; + case HLSL_TYPE_INT: + dst->value[k].i = i; + break; + case HLSL_TYPE_UINT: + dst->value[k].u = u; + break; + case HLSL_TYPE_BOOL: + dst->value[k].b = b; + break; + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool constant_op1_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + + assert(type == src->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = -src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + dst->value[k].d = -src->value[k].d; + break; + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = -src->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.\n", debug_hlsl_expr_op(HLSL_OP1_NEG), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = src1->value[k].f + src2->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + dst->value[k].d = src1->value[k].d + src2->value[k].d; + break; + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u + src2->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.\n", debug_hlsl_expr_op(HLSL_OP2_ADD), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool constant_op2_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = src1->value[k].f * src2->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + dst->value[k].d = src1->value[k].d * src2->value[k].d; + break; + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u * src2->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.\n", debug_hlsl_expr_op(HLSL_OP2_MUL), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i, dimx; + unsigned int i; + bool success; if (instr->type != HLSL_IR_EXPR) return false; @@ -38,115 +223,42 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); - switch (instr->data_type->base_type) + success = false; + + switch (expr->op) { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_CAST: + success = constant_op1_cast(ctx, res, arg1); break; - } - - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].i = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_NEG: + success = constant_op1_neg(ctx, res, arg1); + break; + case HLSL_OP2_ADD: + success = constant_op2_add(ctx, res, arg1, arg2); + break; + case HLSL_OP2_MUL: + success = constant_op2_mul(ctx, res, arg1, arg2); break; - } - default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; + FIXME("Fold op %#x.\n", expr->op); + success = 0; + break; } - list_add_before(&expr->node.entry, &res->node.entry); - hlsl_replace_node(&expr->node, &res->node); - return true; + if (success) + { + list_add_before(&expr->node.entry, &res->node.entry); + hlsl_replace_node(&expr->node, &res->node); + return true; + } + else + { + vkd3d_free(res); + return false; + } } -- 2.25.1

1 0

[PATCH vkd3d v2 2/3] vkd3d-shader/hlsl: Move fold_constants() to a separate file.
by Francisco Casas 09 Feb '22

09 Feb '22

Also rename it to hlsl_fold_constants(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 133 +--------------------- libs/vkd3d-shader/hlsl_constant_ops.c | 152 ++++++++++++++++++++++++++ 4 files changed, 156 insertions(+), 132 deletions(-) create mode 100644 libs/vkd3d-shader/hlsl_constant_ops.c diff --git a/Makefile.am b/Makefile.am index 7a7bd6a7..c3ba3feb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -207,6 +207,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/hlsl.c \ libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ + libs/vkd3d-shader/hlsl_constant_ops.c \ libs/vkd3d-shader/hlsl_sm1.c \ libs/vkd3d-shader/hlsl_sm4.c \ libs/vkd3d-shader/preproc.h \ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 83d39a17..311e5c12 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -766,6 +766,8 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, const struct hlsl_type *type); +bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); + bool hlsl_sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3DSHADER_PARAM_REGISTER_TYPE *type, unsigned int *reg); bool hlsl_sm1_usage_from_semantic(const struct hlsl_semantic *semantic, D3DDECLUSAGE *usage, uint32_t *usage_idx); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 77ddd979..17a7649f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -702,137 +702,6 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; } -static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) -{ - struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; - struct hlsl_ir_expr *expr; - unsigned int i, dimx; - - if (instr->type != HLSL_IR_EXPR) - return false; - expr = hlsl_ir_expr(instr); - - for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) - { - if (expr->operands[i].node && expr->operands[i].node->type != HLSL_IR_CONSTANT) - return false; - } - arg1 = hlsl_ir_constant(expr->operands[0].node); - if (expr->operands[1].node) - arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; - - if (!(res = hlsl_alloc(ctx, sizeof(*res)))) - return false; - init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); - - switch (instr->data_type->base_type) - { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } - break; - } - - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].i = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } - break; - } - - default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; - } - - list_add_before(&expr->node.entry, &res->node.entry); - hlsl_replace_node(&expr->node, &res->node); - return true; -} - static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_swizzle *swizzle; @@ -1785,7 +1654,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun transform_ir(ctx, lower_narrowing_casts, body, NULL); do { - progress = transform_ir(ctx, fold_constants, body, NULL); + progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); progress |= copy_propagation_execute(ctx, body); } while (progress); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c new file mode 100644 index 00000000..9e19cef4 --- /dev/null +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -0,0 +1,152 @@ +/* + * HLSL constant value operations for constant folding + * + * Copyright 2022 Francisco Casas 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 + */ + +#include "hlsl.h" + +bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; + struct hlsl_ir_expr *expr; + unsigned int i, dimx; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + { + if (expr->operands[i].node && expr->operands[i].node->type != HLSL_IR_CONSTANT) + return false; + } + arg1 = hlsl_ir_constant(expr->operands[0].node); + if (expr->operands[1].node) + arg2 = hlsl_ir_constant(expr->operands[1].node); + dimx = instr->data_type->dimx; + + if (!(res = hlsl_alloc(ctx, sizeof(*res)))) + return false; + init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); + + switch (instr->data_type->base_type) + { + case HLSL_TYPE_FLOAT: + { + switch (expr->op) + { + case HLSL_OP1_CAST: + if (instr->data_type->dimx != arg1->node.data_type->dimx + || instr->data_type->dimy != arg1->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + + switch (arg1->node.data_type->base_type) + { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value[i].f = arg1->value[i].i; + break; + + case HLSL_TYPE_UINT: + for (i = 0; i < dimx; ++i) + res->value[i].f = arg1->value[i].u; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + break; + + default: + FIXME("Fold float op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + case HLSL_TYPE_UINT: + { + switch (expr->op) + { + case HLSL_OP1_CAST: + if (instr->data_type->dimx != arg1->node.data_type->dimx + || instr->data_type->dimy != arg1->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + + switch (arg1->node.data_type->base_type) + { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value[i].i = arg1->value[i].u; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + break; + + case HLSL_OP1_NEG: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value[i].u = -arg1->value[i].u; + break; + + case HLSL_OP2_ADD: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value[i].u = arg1->value[i].u + arg2->value[i].u; + break; + + case HLSL_OP2_MUL: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value[i].u = arg1->value[i].u * arg2->value[i].u; + break; + + default: + FIXME("Fold uint op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + default: + FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); + vkd3d_free(res); + return false; + } + + list_add_before(&expr->node.entry, &res->node.entry); + hlsl_replace_node(&expr->node, &res->node); + return true; +} -- 2.25.1

1 0

[PATCH vkd3d v2 1/3] vkd3d-shader/hlsl: Move replace_node() to hlsl.c.
by Francisco Casas 09 Feb '22

09 Feb '22

Also rename it to hlsl_replace_node(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- This in order to make this function accessible from the new hlsl_constant_ops.c file in the following patches. I also needed to call it from hlsl.y to implement the implicit conversion of overloaded function parameters, which I will probably send in the future. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 14 ++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 25 ++++++------------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 917c7bf7..21351839 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1396,6 +1396,20 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl vkd3d_string_buffer_cleanup(&buffer); } +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_remove(&old->entry); + hlsl_free_instr(old); +} + + void hlsl_free_type(struct hlsl_type *type) { struct hlsl_struct_field *field, *next_field; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5b69186c..83d39a17 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -684,6 +684,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); + void hlsl_free_instr(struct hlsl_ir_node *node); void hlsl_free_instr_list(struct list *list); void hlsl_free_type(struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eac3513c..77ddd979 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -224,19 +224,6 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } -static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) -{ - struct hlsl_src *src, *next; - - LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) - { - hlsl_src_remove(src); - hlsl_src_from_node(src, new); - } - list_remove(&old->entry); - hlsl_free_instr(old); -} - /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -267,7 +254,7 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -437,7 +424,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, list_add_before(&node->entry, &swizzle_node->node.entry); new_node = &swizzle_node->node; } - replace_node(node, new_node); + hlsl_replace_node(node, new_node); return true; } @@ -566,7 +553,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { - replace_node(&expr->node, expr->operands[0].node); + hlsl_replace_node(&expr->node, expr->operands[0].node); return true; } } @@ -708,7 +695,7 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -842,7 +829,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi } list_add_before(&expr->node.entry, &res->node.entry); - replace_node(&expr->node, &res->node); + hlsl_replace_node(&expr->node, &res->node); return true; } @@ -862,7 +849,7 @@ static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *i if (((swizzle->swizzle >> (2 * i)) & 3) != i) return false; - replace_node(instr, swizzle->val.node); + hlsl_replace_node(instr, swizzle->val.node); return true; } -- 2.25.1

1 0

[PATCH 1/5] wined3d: Improve comment in wined3d_query_vk_issue().
by Matteo Bruni 09 Feb '22

09 Feb '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- This patch originally included the same typo fixes as those caught by François some time ago, so now it's just a slight clarification of the comment. I guess it may still be of some value. dlls/wined3d/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 864a3b82f0a..6c1ed1d6b5a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1681,10 +1681,11 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) return false; } - /* A query needs to either begin and end inside a single render pass, - * or begin and end outside of a render pass. Occlusion queries, if issued - * outside of a render pass, are queued up and only begun when a render - * pass is started, to avoid interrupting it when the query ends. */ + /* A query needs to either begin and end inside a single render pass + * or begin and end outside of a render pass. Occlusion queries, if + * issued outside of a render pass, are queued up and only begun when + * a render pass is started, to avoid interrupting the render pass + * when the query ends. */ if (context_vk->vk_render_pass) { wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); -- 2.34.1

4 14

[PATCH] ddraw/tests: Account for random WARP behavior in test_texturemapblend (v2).
by Stefan Dösinger 09 Feb '22

09 Feb '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- I don't want to just disable color keying because some of the tests here make a point that the results are different in ddraw1 (ckey on by default) vs ddraw2 (ckey off by default). The test doesn't bother about SPECULARENABLE, so I am fine with just overriding the broken WARP default. Version 2: Fix whitespace in the comment. I don't think Visual Studio mangled it ("anddiffuse" didn't make sense) so I guess I need to get my butterfly keyboard replaced a second time... I also checked the possibility that fog is used. Doesn't seem like it is the case here. --- dlls/ddraw/tests/ddraw1.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 304671558af..458b3f48fdb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8390,6 +8390,20 @@ static void test_texturemapblend(void) emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + /* SPECULARENABLE shouldn't matter in this test, but WARP begs to + * differ. In the event that color keying is randomly on (see comments + * in test_ck_default for reference), WARP will randomly discard + * fragments based on something, even though texture and diffuse color + * alpha components are non-zero. Setting SPECULARENABLE to FALSE + * prevents this in some cases - presumably WARP multiplies the + * specular color "alpha" channel into the final result and then + * alpha tests the result. Since the specular property normally does + * not have an alpha component the actual specular color we set in + * the vertex data above does not matter. Setting FOGENABLE = FALSE + * does not help either (specular alpha can contain a per-vertex fog + * factor. Doesn't seem to matter here). */ + emit_set_rs(&ptr, D3DRENDERSTATE_SPECULARENABLE, FALSE); + emit_tquad(&ptr, 0); emit_tquad(&ptr, 4); emit_end(&ptr); @@ -8407,6 +8421,7 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* The above SPECULARENABLE = FALSE on WARP matters here.*/ color = get_surface_color(rt, 5, 5); ok(compare_color(color, 0x00000080, 2), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); @@ -8476,14 +8491,25 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Despite our best efforts at not making color keying randomly triggering, those + * four broken() results occur every now and then on WARP. Presumably the non- + * existent alpha channel sometimes samples 0.0 instead of the expected 1.0. */ color = get_surface_color(rt, 5, 5); - ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); - ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 5, 245); - ok(compare_color(color, 0x00000080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00000080, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 245); - ok(compare_color(color, 0x00000080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00000080, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); IDirect3DTexture_Release(texture); ref = IDirectDrawSurface_Release(surface); -- 2.34.1

3 2

[PATCH 1/2] wined3d: Use the chunk allocator for GL texture buffers.
by Zebediah Figura 09 Feb '22

09 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2d37e29a655..0a904615a83 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3113,6 +3113,23 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct bo->id = 0; } +static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info, GLenum binding) +{ + switch (binding) + { + case GL_ATOMIC_COUNTER_BUFFER: + case GL_DRAW_INDIRECT_BUFFER: + case GL_PIXEL_UNPACK_BUFFER: + return true; + + case GL_TEXTURE_BUFFER: + return gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]; + + default: + return false; + } +} + bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) { @@ -3127,19 +3144,15 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei if (gl_info->supported[ARB_BUFFER_STORAGE]) { - switch (binding) + if (use_buffer_chunk_suballocation(gl_info, binding)) { - case GL_ATOMIC_COUNTER_BUFFER: - case GL_DRAW_INDIRECT_BUFFER: - case GL_PIXEL_UNPACK_BUFFER: - if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) - buffer_offset = memory->offset; - break; - - default: - WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); - id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); - break; + if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) + buffer_offset = memory->offset; + } + else + { + WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); + id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); } if (!id) -- 2.34.1

2 3

[PATCH v3] ws2_32: Trace status on operation failure.
by Paul Gofman 09 Feb '22

09 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use TRACE instead of WARN. v3: - don't check status. dlls/ws2_32/socket.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb2086b11e9..e5e29107853 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -747,7 +747,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) } if (status) { - WARN( "failed; status %#lx\n", status ); + TRACE( "failed, status %#lx\n", status ); WSASetLastError( NtStatusToWSAError( status ) ); return INVALID_SOCKET; } @@ -814,6 +814,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D if (ret_len) *ret_len = overlapped->InternalHigh; WSASetLastError( NtStatusToWSAError(status) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -867,6 +868,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR status = piosb->u.Status; } SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -955,6 +957,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1021,6 +1024,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1149,7 +1153,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + if (status) TRACE( "failed, status %#lx.\n", status ); + else TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); free( params ); free( ret_addr ); @@ -1218,6 +1223,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) { /* NtStatusToWSAError() has no mapping for WSAEALREADY */ SetLastError( status == STATUS_ADDRESS_ALREADY_ASSOCIATED ? WSAEALREADY : NtStatusToWSAError( status ) ); + TRACE( "failed, status %#lx.\n", status ); return -1; } return 0; @@ -1273,6 +1279,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -1303,6 +1310,7 @@ static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD fla IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); if (!status && overlapped) status = STATUS_PENDING; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -1334,6 +1342,7 @@ int WINAPI getpeername( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1358,6 +1367,7 @@ int WINAPI getsockname( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; WSASetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1370,6 +1380,7 @@ static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); if (!status) *optlen = io.Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1960,6 +1971,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s else if (status == STATUS_SUCCESS) *ret_size = piosb->Information; + TRACE( "status %#lx.\n", status ); return NtStatusToWSAError( status ); } @@ -2322,6 +2334,7 @@ int WINAPI listen( SOCKET s, int backlog ) status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -2517,6 +2530,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, free( params ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2661,6 +2675,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) free( params ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2744,6 +2759,7 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3055,6 +3071,7 @@ int WINAPI shutdown( SOCKET s, int how ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3112,6 +3129,7 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret } } SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3156,6 +3174,7 @@ int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3201,6 +3220,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); + TRACE( "status %#lx.\n", status ); return NT_SUCCESS( status ); } @@ -3224,6 +3244,7 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3563,7 +3584,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, ret = (*callback)( &caller_id, &caller_data, NULL, NULL, &callee_id, &callee_data, &group, context ); - + TRACE( "callback returned %d.\n", ret ); switch (ret) { case CF_ACCEPT: @@ -3579,6 +3600,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, &server_handle, sizeof(server_handle), NULL, 0 ); closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); + TRACE( "status %#lx.\n", status ); return -1; } -- 2.34.1

2 1

[PATCH] ws2_32/tests: Cancel a call that currently incorrectly returns STATUS_PENDING.
by Zebediah Figura 09 Feb '22

09 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 226207 causes test failures otherwise. dlls/ws2_32/tests/afd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 55029bfd30d..d8a78947de4 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1387,6 +1387,12 @@ static void test_recv(void) todo_wine ok(!io.Status, "got %#x\n", io.Status); todo_wine ok(io.Information == 1, "got %#Ix\n", io.Information); todo_wine ok(buffer[0] == 'a', "got %s\n", debugstr_an(buffer, io.Information)); + if (ret == STATUS_PENDING) + { + CancelIo((HANDLE)client); + ret = WaitForSingleObject(event, 100); + ok(!ret, "wait timed out\n"); + } params.msg_flags = AFD_MSG_NOT_OOB | AFD_MSG_PEEK; -- 2.34.1

1 0

[PATCH vkd3d v5 6/6] vkd3d-shader/hlsl: Parse valid texture array types.
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Multisampled objects, namely Texture2DMS and Texture2DMSArray are not parsed yet since they require a different type of declaration, with the number of samples stated expicitly. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a37e5d88..c1edfe7e 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -133,6 +133,7 @@ texture3D {return KW_TEXTURE3D; } Texture3D {return KW_TEXTURE3D; } textureCUBE {return KW_TEXTURECUBE; } TextureCube {return KW_TEXTURECUBE; } +TextureCubeArray {return KW_TEXTURECUBEARRAY; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } uniform {return KW_UNIFORM; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ec688764..42cad016 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2138,6 +2138,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %token KW_TEXTURE2DMSARRAY %token KW_TEXTURE3D %token KW_TEXTURECUBE +%token KW_TEXTURECUBEARRAY %token KW_TRUE %token KW_TYPEDEF %token KW_UNIFORM @@ -2682,6 +2683,18 @@ texture_type: { $$ = HLSL_SAMPLER_DIM_CUBE; } + | KW_TEXTURE1DARRAY + { + $$ = HLSL_SAMPLER_DIM_1DARRAY; + } + | KW_TEXTURE2DARRAY + { + $$ = HLSL_SAMPLER_DIM_2DARRAY; + } + | KW_TEXTURECUBEARRAY + { + $$ = HLSL_SAMPLER_DIM_CUBEARRAY; + } type: KW_VECTOR '<' type ',' C_INTEGER '>' -- 2.25.1

5 4

[PATCH vkd3d v5 5/6] vkd3d-shader/hlsl: Remove Texture3DArrays from lexer and parser.
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- For they don't exist. *mystic noises* Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 1 - libs/vkd3d-shader/hlsl.y | 1 - 2 files changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e9281ec3..a37e5d88 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -131,7 +131,6 @@ Texture2DMS {return KW_TEXTURE2DMS; } Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } texture3D {return KW_TEXTURE3D; } Texture3D {return KW_TEXTURE3D; } -Texture3DArray {return KW_TEXTURE3DARRAY; } textureCUBE {return KW_TEXTURECUBE; } TextureCube {return KW_TEXTURECUBE; } true {return KW_TRUE; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2f1bd447..ec688764 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2137,7 +2137,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %token KW_TEXTURE2DMS %token KW_TEXTURE2DMSARRAY %token KW_TEXTURE3D -%token KW_TEXTURE3DARRAY %token KW_TEXTURECUBE %token KW_TRUE %token KW_TYPEDEF -- 2.25.1

5 4

[PATCH vkd3d v5 4/6] vkd3d-shader/hlsl: Check texture dimension type on method calls.
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Note that for multi-sampled textures (and only for multi-sampled textures) the Load method requires the sample index as argument 2, and thus, can accept from 3 to 4 arguments. While multi-sampled textures won't be parsed yet, I added a FIXME as a reminder that the behaviour is rather different, this also allowed to be more precise in the succesive fixmes. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 18126032..2f1bd447 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1837,12 +1837,21 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl /* Only HLSL_IR_LOAD can return an object. */ object_load = hlsl_ir_load(object); - if (!strcmp(name, "Load")) + if (!strcmp(name, "Load") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBE + && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY) { const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); struct hlsl_ir_resource_load *load; struct hlsl_ir_node *coords; + if (object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS + || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY) + { + FIXME("'Load' method for multi-sample textures.\n"); + return false; + } + if (params->args_count < 1 || params->args_count > 3) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, @@ -1850,7 +1859,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl return false; } if (params->args_count >= 2) - FIXME("Ignoring index and/or offset parameter(s).\n"); + hlsl_fixme(ctx, loc, "Offset parameter."); + if (params->args_count == 3) + hlsl_fixme(ctx, loc, "Tiled resource status argument."); /* +1 for the mipmap level */ if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0], @@ -1863,7 +1874,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } - else if (!strcmp(name, "Sample")) + else if (!strcmp(name, "Sample") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) { const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; @@ -1913,8 +1926,12 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } - else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") + else if ((!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + && (object_type->sampler_dim == HLSL_SAMPLER_DIM_2D + || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DARRAY + || object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBE + || object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBEARRAY)) { const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); enum hlsl_resource_load_type load_type; -- 2.25.1

5 4

[PATCH vkd3d v5 3/6] vkd3d-shader/hlsl: Handle additional dimension types for textures.
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 25 ++++++++++++--------- libs/vkd3d-shader/hlsl.h | 16 ++++++++++++-- libs/vkd3d-shader/hlsl_sm4.c | 43 ++++++++++++++++++++++-------------- 3 files changed, 55 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e96969d1..8a0f4b01 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -932,10 +932,15 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { static const char *const dimensions[] = { - [HLSL_SAMPLER_DIM_1D] = "1D", - [HLSL_SAMPLER_DIM_2D] = "2D", - [HLSL_SAMPLER_DIM_3D] = "3D", - [HLSL_SAMPLER_DIM_CUBE] = "Cube" + [HLSL_SAMPLER_DIM_1D] = "1D", + [HLSL_SAMPLER_DIM_2D] = "2D", + [HLSL_SAMPLER_DIM_3D] = "3D", + [HLSL_SAMPLER_DIM_CUBE] = "Cube", + [HLSL_SAMPLER_DIM_1DARRAY] = "1DArray", + [HLSL_SAMPLER_DIM_2DARRAY] = "2DArray", + [HLSL_SAMPLER_DIM_2DMS] = "2DMS", + [HLSL_SAMPLER_DIM_2DMSARRAY] = "2DMSArray", + [HLSL_SAMPLER_DIM_CUBEARRAY] = "CubeArray", }; switch (type->base_type) @@ -1778,11 +1783,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) static const char *const sampler_names[] = { - "sampler", - "sampler1D", - "sampler2D", - "sampler3D", - "samplerCUBE" + [HLSL_SAMPLER_DIM_GENERIC] = "sampler", + [HLSL_SAMPLER_DIM_1D] = "sampler1D", + [HLSL_SAMPLER_DIM_2D] = "sampler2D", + [HLSL_SAMPLER_DIM_3D] = "sampler3D", + [HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE", }; static const struct @@ -1834,7 +1839,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } - for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) + for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) { type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3dfeea1d..8f365abb 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -98,7 +98,13 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_CUBE, - HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE + HLSL_SAMPLER_DIM_LAST_SAMPLER = HLSL_SAMPLER_DIM_CUBE, + HLSL_SAMPLER_DIM_1DARRAY, + HLSL_SAMPLER_DIM_2DARRAY, + HLSL_SAMPLER_DIM_2DMS, + HLSL_SAMPLER_DIM_2DMSARRAY, + HLSL_SAMPLER_DIM_CUBEARRAY, + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, }; enum hlsl_matrix_majority @@ -487,7 +493,7 @@ struct hlsl_ctx struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4]; - struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; + struct hlsl_type *sampler[HLSL_SAMPLER_DIM_LAST_SAMPLER + 1]; struct hlsl_type *Void; } builtin_types; @@ -673,11 +679,17 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) { case HLSL_SAMPLER_DIM_1D: return 1; + case HLSL_SAMPLER_DIM_1DARRAY: case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_2DMS: return 2; + case HLSL_SAMPLER_DIM_2DARRAY: + case HLSL_SAMPLER_DIM_2DMSARRAY: case HLSL_SAMPLER_DIM_3D: case HLSL_SAMPLER_DIM_CUBE: return 3; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return 4; default: assert(0); return 0; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 4eebd583..d62a1bed 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -434,6 +434,16 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ return D3D_SRV_DIMENSION_TEXTURE3D; case HLSL_SAMPLER_DIM_CUBE: return D3D_SRV_DIMENSION_TEXTURECUBE; + case HLSL_SAMPLER_DIM_1DARRAY: + return D3D_SRV_DIMENSION_TEXTURE1DARRAY; + case HLSL_SAMPLER_DIM_2DARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DARRAY; + case HLSL_SAMPLER_DIM_2DMS: + return D3D_SRV_DIMENSION_TEXTURE2DMS; + case HLSL_SAMPLER_DIM_2DMSARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DMSARRAY; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; default: assert(0); return D3D_SRV_DIMENSION_UNKNOWN; @@ -721,6 +731,16 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ return VKD3D_SM4_RESOURCE_TEXTURE_3D; case HLSL_SAMPLER_DIM_CUBE: return VKD3D_SM4_RESOURCE_TEXTURE_CUBE; + case HLSL_SAMPLER_DIM_1DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY; + case HLSL_SAMPLER_DIM_2DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY; + case HLSL_SAMPLER_DIM_2DMS: + return VKD3D_SM4_RESOURCE_TEXTURE_2DMS; + case HLSL_SAMPLER_DIM_2DMSARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; default: assert(0); return 0; @@ -1307,6 +1327,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf const struct hlsl_deref *resource, const struct hlsl_ir_node *coords) { struct sm4_instruction instr; + unsigned int dim_count; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_LD; @@ -1318,23 +1339,11 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ - switch (resource_type->sampler_dim) - { - case HLSL_SAMPLER_DIM_1D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); - break; - - case HLSL_SAMPLER_DIM_2D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); - break; - - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - break; - - case HLSL_SAMPLER_DIM_GENERIC: - assert(0); - } + dim_count = hlsl_sampler_dim_count(resource_type->sampler_dim); + if (dim_count == 1) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + if (dim_count == 2) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); sm4_src_from_deref(ctx, &instr.srcs[1], resource, resource_type, instr.dsts[0].writemask); -- 2.25.1

5 4

[PATCH vkd3d v5 2/6] vkd3d-shader/hlsl: Move sampler_dim_count() to hlsl.h.
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 17 +++++++++++++++++ libs/vkd3d-shader/hlsl.y | 23 +++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2319895a..3dfeea1d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -667,6 +667,23 @@ static inline struct hlsl_type *hlsl_get_numeric_type(const struct hlsl_ctx *ctx return hlsl_get_matrix_type(ctx, base_type, dimx, dimy); } +static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) +{ + switch (dim) + { + case HLSL_SAMPLER_DIM_1D: + return 1; + case HLSL_SAMPLER_DIM_2D: + return 2; + case HLSL_SAMPLER_DIM_3D: + case HLSL_SAMPLER_DIM_CUBE: + return 3; + default: + assert(0); + return 0; + } +} + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9476765f..18126032 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1513,23 +1513,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t return statements_list; } -static unsigned int sampler_dim_count(enum hlsl_sampler_dim dim) -{ - switch (dim) - { - case HLSL_SAMPLER_DIM_1D: - return 1; - case HLSL_SAMPLER_DIM_2D: - return 2; - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - return 3; - default: - assert(0); - return 0; - } -} - struct find_function_call_args { const struct parse_initializer *params; @@ -1856,7 +1839,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (!strcmp(name, "Load")) { - const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); struct hlsl_ir_resource_load *load; struct hlsl_ir_node *coords; @@ -1882,7 +1865,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl } else if (!strcmp(name, "Sample")) { - const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; struct hlsl_ir_node *offset = NULL; @@ -1933,7 +1916,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) { - const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); enum hlsl_resource_load_type load_type; const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; -- 2.25.1

5 4

[PATCH vkd3d v5 1/6] vkd3d-shader/hlsl: Fix wrong conditional in compare_param_hlsl_types().
by Francisco Casas 09 Feb '22

09 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 917c7bf7..e96969d1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -794,8 +794,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - && t1->sampler_dim != t2->sampler_dim) + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) { if (t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; -- 2.25.1

5 4

[PATCH] ws2_32: Trace status on operation failure.
by Paul Gofman 09 Feb '22

09 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 226140. v2: - use TRACE instead of WARN. dlls/ws2_32/socket.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb2086b11e9..9e12fdcb0d4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -747,7 +747,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) } if (status) { - WARN( "failed; status %#lx\n", status ); + TRACE( "failed, status %#lx\n", status ); WSASetLastError( NtStatusToWSAError( status ) ); return INVALID_SOCKET; } @@ -814,6 +814,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D if (ret_len) *ret_len = overlapped->InternalHigh; WSASetLastError( NtStatusToWSAError(status) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return !status; } @@ -867,6 +868,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR status = piosb->u.Status; } SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return !status; } @@ -955,6 +957,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1021,6 +1024,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1149,7 +1153,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + if (status) TRACE( "failed, status %#lx.\n", status ); + else TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); free( params ); free( ret_addr ); @@ -1218,6 +1223,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) { /* NtStatusToWSAError() has no mapping for WSAEALREADY */ SetLastError( status == STATUS_ADDRESS_ALREADY_ASSOCIATED ? WSAEALREADY : NtStatusToWSAError( status ) ); + TRACE( "failed, status %#lx.\n", status ); return -1; } return 0; @@ -1273,6 +1279,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return !status; } @@ -1303,6 +1310,7 @@ static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD fla IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); if (!status && overlapped) status = STATUS_PENDING; SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return !status; } @@ -1334,6 +1342,7 @@ int WINAPI getpeername( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1358,6 +1367,7 @@ int WINAPI getsockname( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; WSASetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1370,6 +1380,7 @@ static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); if (!status) *optlen = io.Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1960,6 +1971,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s else if (status == STATUS_SUCCESS) *ret_size = piosb->Information; + if (status) TRACE( "failed, status %#lx.\n", status ); return NtStatusToWSAError( status ); } @@ -2322,6 +2334,7 @@ int WINAPI listen( SOCKET s, int backlog ) status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -2517,6 +2530,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, free( params ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2661,6 +2675,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) free( params ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2744,6 +2759,7 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3055,6 +3071,7 @@ int WINAPI shutdown( SOCKET s, int how ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3112,6 +3129,7 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret } } SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3156,6 +3174,7 @@ int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3201,6 +3220,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return NT_SUCCESS( status ); } @@ -3224,6 +3244,7 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) TRACE( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3579,6 +3600,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, &server_handle, sizeof(server_handle), NULL, 0 ); closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); + if (status) TRACE( "failed, status %#lx.\n", status ); return -1; } -- 2.34.1

2 2

[PATCH 1/7] winhttp/tests: Fix typo in an ok() message.
by Matteo Bruni 09 Feb '22

09 Feb '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 354c85c6d28..35f6bc5cf26 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5116,7 +5116,7 @@ static void test_chunked_read(void) header[0] = 0; len = sizeof(header); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, header, &len, 0 ); - ok( ret, "failed to get TRANSFER_ENCODING header (error %lu\n", GetLastError() ); + ok( ret, "failed to get TRANSFER_ENCODING header with error %lu\n", GetLastError() ); ok( !lstrcmpW( header, L"chunked" ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); trace( "transfer encoding: %s\n", wine_dbgstr_w(header) ); -- 2.34.1

2 7

[PATCH 3/5] msvcp60: Remove code specific to newer versions of the dll.
by Piotr Caban 09 Feb '22

09 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 250 --------------------------------------------- 1 file changed, 250 deletions(-)

1 0

[PATCH 2/5] msvcp60: Remove STREAMSIZE_BITS definition.
by Piotr Caban 09 Feb '22

09 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 248 ------------------------------------------- dlls/msvcp60/msvcp.h | 2 - 2 files changed, 250 deletions(-)

1 0

[PATCH 1/5] msvcp60: Use %Id format when tracing streamoff and streamsize.
by Piotr Caban 09 Feb '22

09 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 112 ++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-)

1 0

[PATCH] fonts: Add Segoe UI Symbol font replacement.
by Dmitry Timoshkov 09 Feb '22

09 Feb '22

Segoe UI Symbol font is used by many WPF .Net applications. This patch adds the font with just single glyph 0x25d4, created by modifying glyph 'one in the circle' from the OpenSymbol font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/seguisym.sfd | 99 +++++++++++++++++++++++++++++++++++++++++++++ fonts/seguisym.ttf | Bin 0 -> 1688 bytes 3 files changed, 100 insertions(+) create mode 100644 fonts/seguisym.sfd create mode 100644 fonts/seguisym.ttf diff --git a/fonts/Makefile.in b/fonts/Makefile.in index b8021851987..afce01fdb8d 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -4,6 +4,7 @@ FONT_SRCS = \ fixedsys_jp.sfd \ marlett.sfd \ ms_sans_serif.sfd \ + seguisym.sfd \ small_fonts.sfd \ small_fonts_jp.sfd \ symbol.sfd \ diff --git a/fonts/seguisym.sfd b/fonts/seguisym.sfd new file mode 100644 index 00000000000..476969b3fc1 --- /dev/null +++ b/fonts/seguisym.sfd @@ -0,0 +1,99 @@ +SplineFontDB: 3.0 +FontName: WineSegoeUISymbol +FullName: Segoe UI Symbol +FamilyName: Segoe UI Symbol +Weight: Regular +Copyright: Copyright (C) 2022 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -119 +UnderlineWidth: 119 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +XUID: [1021 135 1692684408 1110823] +FSType: 0 +OS2Version: 2 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +PfmFamily: 17 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 2 11 5 2 4 2 4 2 2 3 +OS2TypoAscent: 1491 +OS2TypoAOffset: 0 +OS2TypoDescent: -431 +OS2TypoDOffset: 0 +OS2TypoLinegap: 269 +OS2WinAscent: 2210 +OS2WinAOffset: 0 +OS2WinDescent: 514 +OS2WinDOffset: 0 +HheadAscent: 2210 +HheadAOffset: 0 +HheadDescent: -514 +HheadDOffset: 0 +OS2SubXSize: 1434 +OS2SubYSize: 1331 +OS2SubXOff: 0 +OS2SubYOff: 283 +OS2SupXSize: 1434 +OS2SupYSize: 1331 +OS2SupXOff: 0 +OS2SupYOff: 977 +OS2StrikeYSize: 102 +OS2StrikeYPos: 530 +OS2FamilyClass: 2053 +OS2Vendor: 'Wine' +OS2CodePages: 00000001.40000000 +OS2UnicodeRanges: 8000006f.1200fbef.0064c000.00000002 +DEI: 91125 +Encoding: Custom +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 38 14 +Grid +-2048 741 m 0 + 4096 741 l 0 +918 2662 m 0 + 918 -1434 l 0 +EndSplineSet +BeginChars: 256 1 + +StartChar: uni25D4 +Encoding: 255 9684 0 +Width: 1764 +Flags: WO +LayerCount: 2 +Fore +SplineSet +882.5 731 m 24,0,-1 + 882 1372 l 0,1,2 + 586.611 1347.2 586.611 1347.2 426 1184 c 0,3,4 + 240 995 240 995 240 730 c 0,5,6 + 240 459.078 240 459.078 426 276 c 0,7,8 + 617 88 617 88 882 88 c 0,9,10 + 1142.95 88 1142.95 88 1334 276 c 0,11,12 + 1534.8 473.599 1534.8 473.599 1522 730 c 0,13,-1 + 882.5 731 l 24,0,-1 +140 730 m 0,14,15 + 140 1036 140 1036 358 1254 c 0,16,17 + 574 1470 574 1470 882 1470 c 0,18,19 + 1188 1470 1188 1470 1404 1254 c 0,20,21 + 1620 1035 1620 1035 1620 730 c 0,22,23 + 1620 421 1620 421 1404 208 c 0,24,25 + 1189 -10 1189 -10 882 -10 c 0,26,27 + 573 -10 573 -10 358 208 c 0,28,29 + 140 420 140 420 140 730 c 0,14,15 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/seguisym.ttf b/fonts/seguisym.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9dc577f45388d30d2049fb18bb1d8493c9e897c0 GIT binary patch literal 1688 zcmds1U1(cn7=FI<m(1BF8Dm4N`b8UELE5v^+DZvhY>4(kr){zc12t{aBrM4Z$?3Mp zz<R%nUFsCX>D`9dASh!xuVgZYij~D|mjkbc2=j-jr#|1wsj~=zw|<BBd!P5`d*AoG z-wy<U0jxpCbJ=X}8A{YxC&-5mEQ~qcd#@CzdV%uGOSM7+v5{9PUm`uZbkvi`m<d3? zn|7mAXf-xB83~q0Ia;c=R~FxvPtiU^`BJ%9SbkAEyH0$aG+Cx%@K@t|#@bDJxLos& z?>>jGD1S^jUUioWI0fd`<CO2J6^=LXG!D@IIAvKc)QYh;=1tmf0NUY(+wwZMriYn- zhIU8&iK4^f6H_n6(m!EmlnUTP>VvhvcxLlwD`$R6ISNf_Ik+Zz<`1877?*P{h@{}w zFanK%`@=PAr3iF07!8~>>xMW5)@GhI$7#H`&-JgdqV0;B+D=n5_-XnY;O@e2KVbPY zwNN`$sTVPm+DL7f-}ujqf#?}6h(4pN{UIS(Sw;z}Lefb>_C27Xu-Y^w)qx=xkmLqG z%Bc<RQ84$$LQjSZewt3?Dx0Fe4;APCKZ3K2M}u#fzpJSpYs+Syos3{~U0^KTi5R%) ztXt;wbVt_+v92q%snnf_C4NtL*utC6cp{ldB@@YvCjDXYx?eW)x6fvbD?!|o;i((I zee8I`h**jE-aSb<HK`}#Q<F)#cTXZ7v6AwUhxMla-8<*cUlcopdGU*Z+oyY7F(I68 zw|mvU;$Obn)2?Z+-Sh4z{xANIA6>ZcIgg>!>vpgCU;3B7?e#W-Z5zb<TYHU%c!&D? zDG=ky>0^z5crL^`9>A>-8;FUC5SxgLl@MD<h&R;<Gj=dTmej|BccL0%4TE?q#5$h9 zhau*@;f?S6n~)+CVhaz7W0-}D2HI$%f)dK`AhD0y5poAM$sx+1M!QF^Hl-YKjq6(U zKSF*Km~|WNW~Eg2<i6Pv>DZ1VGqsA>Y|C7w=C;a5TskeF$Q&+bi9F^wFECyWi_}$V zE|%P)%+JY%c5Tt6Vm|O+rLDlsm@k%As|A8A{p+ko@g^gxcn)6zn|wNm`mcGiZr#he z%~DZ1qqdxu|H%7a>paK`n(Rg;s7taA8~cNL6q3NfVzX6o>(aLOkJ`3P%^^D1x$I6V z)sSuNP)}1(T7GV;AzLrS=Ce4)GayLYhe1(56Ix`oUU44FOax}ZHz;`3wmaXE{sj6$ B2nYZG literal 0 HcmV?d00001 -- 2.34.1

1 0

[PATCH] winevulkan: Enable VK_EXT_pipeline_creation_feedback.
by Georg Lehmann 09 Feb '22

09 Feb '22

We did previously not support this extension because it runs into 32bit alignment issues. But it is core in 1.3, so we already enabled the functionality. Additionally vkd3d-proton wants to use the extension and it does not care about 32bit. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..6e09f018b84 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -96,7 +96,6 @@ UNSUPPORTED_EXTENSIONS = [ "VK_AMD_display_native_hdr", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_pipeline_creation_feedback", "VK_GOOGLE_display_timing", "VK_KHR_external_fence_win32", "VK_KHR_external_semaphore_win32", -- 2.35.0

2 4

[PATCH v2] qedit: Build without -DWINE_NO_LONG_TYPES.
by Zebediah Figura 09 Feb '22

09 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qedit/Makefile.in | 1 - dlls/qedit/mediadet.c | 40 ++++++++++++++-------------- dlls/qedit/samplegrabber.c | 14 ++++++---- dlls/qedit/timeline.c | 54 +++++++++++++++++++------------------- 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 7b0eea3c592..f9b6f5c3ed9 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qedit.dll IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index cdf2ea8ee5b..5fbd931f3f8 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -79,7 +79,7 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) 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); return hr; } @@ -87,7 +87,7 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) V_VT(var) = VT_BSTR; if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", var, NULL))) { - ERR("Failed to get CLSID, hr %#x.\n", hr); + ERR("Failed to get CLSID, hr %#lx.\n", hr); IPropertyBag_Release(prop_bag); return hr; } @@ -95,7 +95,7 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) VariantClear(var); if (FAILED(hr = IPropertyBag_Read(prop_bag, L"FriendlyName", var, NULL))) - ERR("Failed to get name, hr %#x.\n", hr); + ERR("Failed to get name, hr %#lx.\n", hr); IPropertyBag_Release(prop_bag); return hr; @@ -135,20 +135,20 @@ static HRESULT find_splitter(MediaDetImpl *detector) if (FAILED(hr = IBaseFilter_EnumPins(detector->source, &enum_pins))) { - ERR("Failed to enumerate source pins, hr %#x.\n", hr); + ERR("Failed to enumerate source pins, hr %#lx.\n", hr); return hr; } hr = IEnumPins_Next(enum_pins, 1, &source_pin, NULL); IEnumPins_Release(enum_pins); if (hr != S_OK) { - ERR("Failed to get source pin, hr %#x.\n", hr); + ERR("Failed to get source pin, hr %#lx.\n", hr); return hr; } if (FAILED(hr = get_pin_media_type(source_pin, &mt))) { - ERR("Failed to get media type, hr %#x.\n", hr); + ERR("Failed to get media type, hr %#lx.\n", hr); IPin_Release(source_pin); return hr; } @@ -248,28 +248,28 @@ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid static ULONG WINAPI MediaDet_inner_AddRef(IUnknown *iface) { - MediaDetImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedIncrement(&This->ref); + MediaDetImpl *detector = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&detector->ref); - TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", detector, refcount); - return ref; + return refcount; } static ULONG WINAPI MediaDet_inner_Release(IUnknown *iface) { - MediaDetImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->ref); + MediaDetImpl *detector = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&detector->ref); - TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %lu.\n", detector, refcount); - if (ref == 0) + if (!refcount) { - MD_cleanup(This); - CoTaskMemFree(This); + MD_cleanup(detector); + CoTaskMemFree(detector); } - return ref; + return refcount; } static const IUnknownVtbl mediadet_vtbl = @@ -464,7 +464,7 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) MediaDetImpl *This = impl_from_IMediaDet(iface); HRESULT hr; - TRACE("(%p)->(%d)\n", This, newVal); + TRACE("detector %p, index %ld.\n", This, newVal); if (This->num_streams == -1) { @@ -623,7 +623,7 @@ static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, LONG Width, LONG Height) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, + FIXME("(%p)->(%.16e %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; } @@ -633,7 +633,7 @@ static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, LONG Height, BSTR Filename) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%f %d %d %p): not implemented!\n", This, StreamTime, Width, Height, Filename); + FIXME("(%p)->(%.16e %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; } diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index d1b974d3d5d..a89229c4447 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -163,7 +163,7 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa ref = IMediaSample_Release(sample) + 1 - ref; if (ref) { - ERR("(%p) Callback referenced sample %p by %u\n", This, sample, ref); + ERR("(%p) Callback referenced sample %p by %lu\n", This, sample, ref); /* ugly as hell but some apps are sooo buggy */ while (ref--) IMediaSample_Release(sample); @@ -181,7 +181,7 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa case -1: break; default: - FIXME("unsupported method %d\n", This->grabberMethod); + FIXME("Unknown method %ld.\n", This->grabberMethod); /* do not bother us again */ This->grabberMethod = -1; } @@ -315,7 +315,9 @@ static HRESULT WINAPI SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB *cb, LONG whichMethod) { struct sample_grabber *This = impl_from_ISampleGrabber(iface); - TRACE("(%p)->(%p, %u)\n", This, cb, whichMethod); + + TRACE("filter %p, callback %p, method %ld.\n", This, cb, whichMethod); + if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); This->grabberIface = cb; @@ -413,7 +415,9 @@ SampleGrabber_IMemInputPin_ReceiveMultiple(IMemInputPin *iface, IMediaSample **s { struct sample_grabber *This = impl_from_IMemInputPin(iface); LONG idx; - TRACE("(%p)->(%p, %u, %p) output = %p, grabber = %p\n", This, samples, nSamples, nProcessed, This->source.pMemInputPin, This->grabberIface); + + TRACE("filter %p, samples %p, count %lu, ret_count %p.\n", This, samples, nSamples, nProcessed); + if (!samples || !nProcessed) return E_POINTER; if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) @@ -615,7 +619,7 @@ static HRESULT WINAPI sample_grabber_source_DecideAllocator(struct strmbase_sour if (FAILED(hr = IFilterGraph_QueryInterface(filter->filter.graph, &IID_IFilterGraph2, (void **)&graph))) { - ERR("Failed to get IFilterGraph2 interface, hr %#x.\n", hr); + ERR("Failed to get IFilterGraph2 interface, hr %#lx.\n", hr); return hr; } diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 3a4ed5c017e..c084ecc6c2e 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -97,25 +97,25 @@ static HRESULT WINAPI Timeline_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Timeline_AddRef(IUnknown *iface) { - TimelineImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedIncrement(&This->ref); + TimelineImpl *timeline = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&timeline->ref); - TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", timeline, refcount); - return ref; + return refcount; } static ULONG WINAPI Timeline_Release(IUnknown *iface) { - TimelineImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->ref); + TimelineImpl *timeline = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&timeline->ref); - TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %lu.\n", timeline, refcount); - if (ref == 0) - CoTaskMemFree(This); + if (!refcount) + CoTaskMemFree(timeline); - return ref; + return refcount; } static const IUnknownVtbl timeline_vtbl = @@ -201,7 +201,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_RemGroupFromList(IAMTimeline *iface, static HRESULT WINAPI Timeline_IAMTimeline_GetGroup(IAMTimeline *iface, IAMTimelineObj **group, LONG index) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%p,%d): not implemented!\n", This, group, index); + FIXME("(%p)->(%p,%ld): not implemented!\n", This, group, index); return E_NOTIMPL; } @@ -229,7 +229,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_GetInsertMode(IAMTimeline *iface, LON static HRESULT WINAPI Timeline_IAMTimeline_SetInsertMode(IAMTimeline *iface, LONG mode) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%d): not implemented!\n", This, mode); + FIXME("(%p)->(%ld): not implemented!\n", This, mode); return E_NOTIMPL; } @@ -317,7 +317,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_GetCountOfType(IAMTimeline *iface, LO LONG *value_with_comps, TIMELINE_MAJOR_TYPE type) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%d,%p,%p,%04x): not implemented!\n", This, group, value, value_with_comps, type); + FIXME("(%p)->(%ld,%p,%p,%#x): not implemented!\n", This, group, value, value_with_comps, type); return E_NOTIMPL; } @@ -325,7 +325,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_ValidateSourceNames(IAMTimeline *ifac LONG_PTR notify_event) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%d,%p,%lx): not implemented!\n", This, flags, override, notify_event); + FIXME("(%p)->(%ld,%p,%#Ix): not implemented!\n", This, flags, override, notify_event); return E_NOTIMPL; } @@ -475,25 +475,25 @@ static HRESULT WINAPI TimelineObj_QueryInterface(IAMTimelineObj *iface, REFIID r static ULONG WINAPI TimelineObj_AddRef(IAMTimelineObj *iface) { - TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - ULONG ref = InterlockedIncrement(&This->ref); + TimelineObjImpl *obj = impl_from_IAMTimelineObj(iface); + ULONG refcount = InterlockedIncrement(&obj->ref); - TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", obj, refcount); - return ref; + return refcount; } static ULONG WINAPI TimelineObj_Release(IAMTimelineObj *iface) { - TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - ULONG ref = InterlockedDecrement(&This->ref); + TimelineObjImpl *obj = impl_from_IAMTimelineObj(iface); + ULONG refcount = InterlockedDecrement(&obj->ref); - TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %lu.\n", obj, refcount); - if (!ref) - CoTaskMemFree(This); + if (!refcount) + CoTaskMemFree(obj); - return ref; + return refcount; } static HRESULT WINAPI TimelineObj_GetStartStop(IAMTimelineObj *iface, REFERENCE_TIME *start, REFERENCE_TIME *stop) @@ -629,7 +629,7 @@ static HRESULT WINAPI TimelineObj_GetUserID(IAMTimelineObj *iface, LONG *id) static HRESULT WINAPI TimelineObj_SetUserID(IAMTimelineObj *iface, LONG id) { TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%d): not implemented!\n", This, id); + FIXME("(%p)->(%ld): not implemented!\n", This, id); return E_NOTIMPL; } @@ -664,7 +664,7 @@ static HRESULT WINAPI TimelineObj_GetUserData(IAMTimelineObj *iface, BYTE *data, static HRESULT WINAPI TimelineObj_SetUserData(IAMTimelineObj *iface, BYTE *data, LONG size) { TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%p,%d): not implemented!\n", This, data, size); + FIXME("(%p)->(%p,%ld): not implemented!\n", This, data, size); return E_NOTIMPL; } @@ -912,7 +912,7 @@ static HRESULT WINAPI timelinegrp_GetPreviewMode(IAMTimelineGroup *iface, BOOL * static HRESULT WINAPI timelinegrp_SetMediaTypeForVB(IAMTimelineGroup *iface, LONG type) { TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); - FIXME("(%p)->(%d)\n", This, type); + FIXME("(%p)->(%ld)\n", This, type); return E_NOTIMPL; } -- 2.34.1

1 0

[PATCH 1/5] winepulse.drv: Expose audio devices to the application.
by Gabriel Ivăncescu 09 Feb '22

09 Feb '22

This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before. It keeps a list of the devices on the unixlib side, which then stores the device type, pulse name and display (friendly) name into the registry, for persistent settings of an app to identify the device by guid. The keys are stored under HKLM\Software\Wine\Drivers\winepulse.drv\devices, with the following format: <type>,<pulse device name> Where <type> is a single character, which is either 0 (for output/sinks) or 1 (for input/sources), and <pulse device name> is the device name that PulseAudio uses to identify the device. The "name" value is stored under this key which is the display name of the device. When enumerating the devices, the "name" is taken and a GUID is generated if it's missing or invalid under the "guid" value of the same key; this preserves the GUID for the same device unless the registry key is cleaned. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This patchset has lived in wine-staging for a long time, but has been recently rebased to deal with unixlib separation. dlls/winepulse.drv/mmdevdrv.c | 184 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/pulse.c | 176 ++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 320 insertions(+), 41 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e1..bf14324 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -134,6 +134,7 @@ struct ACImpl { IUnknown *marshal; IMMDevice *parent; struct list entry; + char device[256]; float *vol; LONG ref; @@ -147,8 +148,6 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = L"PulseAudio"; - static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -267,39 +266,96 @@ static void set_stream_volumes(ACImpl *This) pulse_call(set_volumes, &params); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **keys, UINT *num, UINT *def_index) { - WCHAR *id; + WCHAR flow_char = (flow == eRender) ? '0' : '1'; + DWORD i, k = 0, count = 0, maxlen, size, type; + WCHAR *id, *key_name = NULL; + HKEY dev_key, key = NULL; + LSTATUS status; + GUID guid; TRACE("%d %p %p %p\n", flow, ids, num, def_index); - *num = 1; + *num = 0; *def_index = 0; - - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); + *ids = NULL; *keys = NULL; - if (!*ids) - return E_OUTOFMEMORY; - (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); - if (!*keys || !id) { - HeapFree(GetProcessHeap(), 0, id); - HeapFree(GetProcessHeap(), 0, *keys); - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - *keys = NULL; - return E_OUTOFMEMORY; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Wine\\Drivers\\winepulse.drv\\devices", + 0, KEY_READ | KEY_WOW64_64KEY, &key) == ERROR_SUCCESS) { + status = RegQueryInfoKeyW(key, NULL, NULL, NULL, &count, &maxlen, NULL, NULL, NULL, NULL, NULL, NULL); + if (status != ERROR_SUCCESS || maxlen < 3) + count = 0; } - memcpy(id, defaultW, sizeof(defaultW)); - if (flow == eRender) - (*keys)[0] = pulse_render_guid; - else - (*keys)[0] = pulse_capture_guid; + if (count && !(key_name = malloc((maxlen + 1) * sizeof(WCHAR)))) + goto err; + + *ids = HeapAlloc(GetProcessHeap(), 0, (count + 1) * sizeof(**ids)); + *keys = HeapAlloc(GetProcessHeap(), 0, (count + 1) * sizeof(**keys)); + if (!*ids || !*keys) + goto err; + + if (!(id = HeapAlloc(GetProcessHeap(), 0, sizeof(L"PulseAudio")))) + goto err; + wcscpy(id, L"PulseAudio"); + (*ids)[k] = id; + (*keys)[k++] = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; + + for (i = 0; i < count; i++) { + DWORD key_name_size = maxlen + 1; + + if (RegEnumKeyExW(key, i, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS || + key_name_size < 3 || key_name[0] != flow_char || + RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) + continue; + + status = RegQueryValueExW(dev_key, L"name", 0, &type, NULL, &size); + if (status == ERROR_SUCCESS && type == REG_SZ && size >= sizeof(WCHAR)) { + if (!(id = HeapAlloc(GetProcessHeap(), 0, size))) { + RegCloseKey(dev_key); + goto err; + } + status = RegQueryValueExW(dev_key, L"name", 0, &type, (BYTE*)id, &size); + if (status == ERROR_SUCCESS && type == REG_SZ && size >= sizeof(WCHAR)) { + id[size / sizeof(WCHAR) - 1] = 0; + + size = sizeof(guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)&guid, &size); + + if (status != ERROR_SUCCESS || type != REG_BINARY || size != sizeof(guid)) { + CoCreateGuid(&guid); + status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)&guid, sizeof(guid)); + if (status != ERROR_SUCCESS) + ERR("Failed to store device GUID for %s to registry\n", debugstr_w(key_name + 2)); + } + (*ids)[k] = id; + (*keys)[k++] = guid; + } else { + HeapFree(GetProcessHeap(), 0, id); + } + } + RegCloseKey(dev_key); + } + *num = k; + *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, k * sizeof(**ids)); + *keys = HeapReAlloc(GetProcessHeap(), 0, *keys, k * sizeof(**keys)); + if (key) RegCloseKey(key); + free(key_name); return S_OK; + +err: + if (key) RegCloseKey(key); + while (k--) HeapFree(GetProcessHeap(), 0, (*ids)[k]); + HeapFree(GetProcessHeap(), 0, *keys); + HeapFree(GetProcessHeap(), 0, *ids); + free(key_name); + *ids = NULL; + *keys = NULL; + return E_OUTOFMEMORY; } int WINAPI AUDDRV_GetPriority(void) @@ -314,26 +370,89 @@ int WINAPI AUDDRV_GetPriority(void) return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; } +static BOOL get_pulse_name_by_guid(const GUID *guid, char name[256], EDataFlow *flow) +{ + DWORD key_name_size; + WCHAR key_name[258]; + DWORD index = 0; + HKEY key; + + /* Return empty string for default PulseAudio device */ + name[0] = 0; + if (IsEqualGUID(guid, &pulse_render_guid)) { + *flow = eRender; + return TRUE; + } else if (IsEqualGUID(guid, &pulse_capture_guid)) { + *flow = eCapture; + return TRUE; + } + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Wine\\Drivers\\winepulse.drv\\devices", + 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { + WARN("No devices found in registry\n"); + return FALSE; + } + + for (;;) { + DWORD size, type; + LSTATUS status; + GUID reg_guid; + HKEY dev_key; + + key_name_size = ARRAY_SIZE(key_name); + if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, + NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) { + ERR("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE *)&reg_guid, &size); + RegCloseKey(dev_key); + + if (status == ERROR_SUCCESS && type == REG_BINARY && size == sizeof(reg_guid) && IsEqualGUID(&reg_guid, guid)) { + RegCloseKey(key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if (key_name[0] == '0') + *flow = eRender; + else if (key_name[0] == '1') + *flow = eCapture; + else { + WARN("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, name, 256, NULL, NULL); + } + } + + RegCloseKey(key); + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + return FALSE; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { - ACImpl *This; + ACImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); EDataFlow dataflow; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if (IsEqualGUID(guid, &pulse_render_guid)) - dataflow = eRender; - else if (IsEqualGUID(guid, &pulse_capture_guid)) - dataflow = eCapture; - else - return E_UNEXPECTED; *out = NULL; - - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; + if (!get_pulse_name_by_guid(guid, This->device, &dataflow)) { + HeapFree(GetProcessHeap(), 0, This); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; @@ -609,6 +728,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = name = get_application_name(); + params.device = This->device; params.dataflow = This->dataflow; params.mode = mode; params.flags = flags; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3e65936..8934387 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -81,6 +81,11 @@ typedef struct _ACPacket UINT32 discont; } ACPacket; +typedef struct _PhysDevice { + struct list entry; + char device[0]; +} PhysDevice; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -89,6 +94,9 @@ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; static UINT g_phys_speakers_mask = 0; +static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); +static struct list g_phys_sources = LIST_INIT(g_phys_sources); +static HKEY devices_key; static const REFERENCE_TIME MinimumPeriod = 30000; static const REFERENCE_TIME DefaultPeriod = 100000; @@ -128,6 +136,16 @@ static void dump_attr(const pa_buffer_attr *attr) TRACE("prebuf: %u\n", attr->prebuf); } +static void free_phys_device_lists(void) +{ + PhysDevice *dev, *dev_next; + + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, &g_phys_speakers, PhysDevice, entry) + free(dev); + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, &g_phys_sources, PhysDevice, entry) + free(dev); +} + /* copied from kernelbase */ static int muldiv(int a, int b, int c) { @@ -152,6 +170,61 @@ static int muldiv(int a, int b, int c) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static HKEY reg_create_key(HKEY root, const WCHAR *name, ULONG name_len) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + HANDLE ret = 0; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = NtCreateKey(&ret, KEY_QUERY_VALUE | KEY_WRITE | KEY_WOW64_64KEY, &attr, 0, NULL, 0, NULL); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) { + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root) i += 10; + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey(&ret, KEY_QUERY_VALUE | KEY_WRITE | KEY_WOW64_64KEY, &attr, 0, NULL, 0, NULL); + + if (attr.RootDirectory != root) NtClose(attr.RootDirectory); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } + return ret; +} + +static HKEY open_devices_key(void) +{ + static const WCHAR drv_key_devicesW[] = { + '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','p','u','l','s','e','.','d','r','v','\\','d','e','v','i','c','e','s' + }; + HANDLE ret; + + if (!(ret = reg_create_key(NULL, drv_key_devicesW, sizeof(drv_key_devicesW)))) + ERR("Failed to open devices registry key\n"); + return ret; +} + /* Following pulseaudio design here, mainloop has the lock taken whenever * it is handling something for pulse, and the lock is required whenever * doing any pa_* call that can affect the state in any way @@ -190,6 +263,7 @@ static NTSTATUS pulse_process_attach(void *args) static NTSTATUS pulse_process_detach(void *args) { + free_phys_device_lists(); if (pulse_ctx) { pa_context_disconnect(pulse_ctx); @@ -357,12 +431,73 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -/* For default PulseAudio render device, OR together all of the - * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void store_device_info(EDataFlow flow, const char *device, const char *name) +{ + static const WCHAR nameW[] = { 'n','a','m','e' }; + UNICODE_STRING name_str = { sizeof(nameW), sizeof(nameW), (WCHAR*)nameW }; + UINT name_len = strlen(name); + WCHAR key_name[258], *wname; + DWORD len, key_len; + HKEY key; + + if (!devices_key || !(wname = malloc((name_len + 1) * sizeof(WCHAR)))) + return; + + key_name[0] = (flow == eCapture) ? '1' : '0'; + key_name[1] = ','; + + key_len = ntdll_umbstowcs(device, strlen(device), key_name + 2, ARRAY_SIZE(key_name) - 2); + if (!key_len || key_len >= ARRAY_SIZE(key_name) - 2) + goto done; + key_len += 2; + + if (!(len = ntdll_umbstowcs(name, name_len, wname, name_len))) + goto done; + wname[len] = 0; + + if (!(key = reg_create_key(devices_key, key_name, key_len * sizeof(WCHAR)))) { + ERR("Failed to open registry key for device %s\n", device); + goto done; + } + + if (NtSetValueKey(key, &name_str, 0, REG_SZ, wname, (len + 1) * sizeof(WCHAR))) + ERR("Failed to store name for %s to registry\n", device); + NtClose(key); + +done: + free(wname); +} + +static void pulse_add_device(struct list *list, const char *device) +{ + DWORD len = strlen(device); + PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, device[len + 1])); + + if (!dev) + return; + memcpy(dev->device, device, len + 1); + + list_add_tail(list, &dev->entry); +} + static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { - if (i) + if (i && i->name && i->name[0]) { + /* For default PulseAudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + + store_device_info(eRender, i->name, i->description); + pulse_add_device(&g_phys_speakers, i->name); + } +} + +static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + if (i && i->name && i->name[0]) { + store_device_info(eCapture, i->name, i->description); + pulse_add_device(&g_phys_sources, i->name); + } } /* For most hardware on Windows, users must choose a configuration with an even @@ -579,7 +714,15 @@ static NTSTATUS pulse_test_connect(void *args) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + free_phys_device_lists(); + list_init(&g_phys_speakers); + list_init(&g_phys_sources); g_phys_speakers_mask = 0; + + devices_key = open_devices_key(); + pulse_add_device(&g_phys_speakers, ""); + pulse_add_device(&g_phys_sources, ""); + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && @@ -588,6 +731,15 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + o = pa_context_get_source_info_list(pulse_ctx, &pulse_phys_sources_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + NtClose(devices_key); + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -771,8 +923,9 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV return S_OK; } -static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_bytes) +static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *device, UINT32 period_bytes) { + pa_stream_flags_t flags = PA_STREAM_START_CORKED | PA_STREAM_START_UNMUTED | PA_STREAM_ADJUST_LATENCY; int ret; char buffer[64]; static LONG number; @@ -797,12 +950,17 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_b attr.maxlength = stream->bufsize_frames * pa_frame_size(&stream->ss); attr.prebuf = pa_frame_size(&stream->ss); dump_attr(&attr); + + /* If device name is given, use exactly the specified device */ + if (device[0]) + flags |= PA_STREAM_DONT_MOVE; + else + device = NULL; /* use default */ + if (stream->dataflow == eRender) - ret = pa_stream_connect_playback(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY, NULL, NULL); + ret = pa_stream_connect_playback(stream->stream, device, &attr, flags, NULL, NULL); else - ret = pa_stream_connect_record(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY); + ret = pa_stream_connect_record(stream->stream, device, &attr, flags); if (ret < 0) { WARN("Returns %i\n", ret); return AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -864,7 +1022,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->share = params->mode; stream->flags = params->flags; - hr = pulse_stream_connect(stream, stream->period_bytes); + hr = pulse_stream_connect(stream, params->device, stream->period_bytes); if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d28a73c..5445a0f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -40,6 +40,7 @@ struct main_loop_params struct create_stream_params { const char *name; + const char *device; EDataFlow dataflow; AUDCLNT_SHAREMODE mode; DWORD flags; -- 2.34.1

4 11

[PATCH] ws2_32: Output WARN on operation failure.
by Paul Gofman 09 Feb '22

09 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The old winsock implementation was printing warnings for any error status from socket operation. That was handy for debugging. Without that pretty much any problem analysis involving tracing network operations starts from adding such logs. dlls/ws2_32/socket.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb2086b11e9..8a08dcd6667 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -814,6 +814,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D if (ret_len) *ret_len = overlapped->InternalHigh; WSASetLastError( NtStatusToWSAError(status) ); + if (status) WARN( "failed, status %#lx.\n", status ); return !status; } @@ -867,6 +868,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR status = piosb->u.Status; } SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return !status; } @@ -955,6 +957,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1021,6 +1024,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1149,7 +1153,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + if (status) WARN( "failed, status %#lx.\n", status ); + else TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); free( params ); free( ret_addr ); @@ -1218,6 +1223,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) { /* NtStatusToWSAError() has no mapping for WSAEALREADY */ SetLastError( status == STATUS_ADDRESS_ALREADY_ASSOCIATED ? WSAEALREADY : NtStatusToWSAError( status ) ); + WARN( "failed, status %#lx.\n", status ); return -1; } return 0; @@ -1273,6 +1279,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return !status; } @@ -1303,6 +1310,7 @@ static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD fla IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); if (!status && overlapped) status = STATUS_PENDING; SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return !status; } @@ -1334,6 +1342,7 @@ int WINAPI getpeername( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1358,6 +1367,7 @@ int WINAPI getsockname( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; WSASetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1370,6 +1380,7 @@ static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); if (!status) *optlen = io.Information; SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -1960,6 +1971,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s else if (status == STATUS_SUCCESS) *ret_size = piosb->Information; + if (status) WARN( "failed, status %#lx.\n", status ); return NtStatusToWSAError( status ); } @@ -2322,6 +2334,7 @@ int WINAPI listen( SOCKET s, int backlog ) status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -2517,6 +2530,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, free( params ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2661,6 +2675,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) free( params ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2744,6 +2759,7 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3055,6 +3071,7 @@ int WINAPI shutdown( SOCKET s, int how ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3112,6 +3129,7 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret } } SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3156,6 +3174,7 @@ int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3201,6 +3220,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); + if (status) WARN( "failed, status %#lx.\n", status ); return NT_SUCCESS( status ); } @@ -3224,6 +3244,7 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + if (status) WARN( "failed, status %#lx.\n", status ); return status ? -1 : 0; } @@ -3579,6 +3600,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, &server_handle, sizeof(server_handle), NULL, 0 ); closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); + if (status) WARN( "failed, status %#lx.\n", status ); return -1; } -- 2.34.1

2 3

[PATCH] winegstreamer: Do not block forever if EOS races with command queue.
by Giovanni Mascellani 09 Feb '22

09 Feb '22

Currently, the winegstreamer media source checks for EOS when RequestSample() is called, but doesn't handle the cases when EOS is detected between the RequestSample() call and the moment when the request is popped from the command queue and serviced. This can result in the media source waiting forever for a sample and get stuck. This commit fixes the bug by adding a check for EOS in wg_parser_stream_get_event(). This commit fixes Medieval Dynasty hanging on developer logos on the Steam Deck. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 13 ++++++++++--- dlls/winegstreamer/wg_parser.c | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 85ec31d2498..5393835b696 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -548,9 +548,16 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) return; case WG_PARSER_EVENT_EOS: - stream->eos = TRUE; - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEEndOfStream, &GUID_NULL, S_OK, &empty_var); - dispatch_end_of_presentation(stream->parent_source); + if (stream->eos) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEError, &GUID_NULL, MF_E_END_OF_STREAM, &empty_var); + } + else + { + stream->eos = TRUE; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEEndOfStream, &GUID_NULL, S_OK, &empty_var); + dispatch_end_of_presentation(stream->parent_source); + } return; case WG_PARSER_EVENT_SEGMENT: diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 013566b25e9..beb4d92bf5b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -106,7 +106,7 @@ struct wg_parser_stream GstBuffer *buffer; GstMapInfo map_info; - bool flushing, eos, enabled, has_caps; + bool flushing, eos, processed_eos, enabled, has_caps; uint64_t duration; }; @@ -681,7 +681,7 @@ static NTSTATUS wg_parser_stream_get_event(void *args) pthread_mutex_lock(&parser->mutex); - while (!parser->flushing && stream->event.type == WG_PARSER_EVENT_NONE) + while (!parser->flushing && !stream->processed_eos && stream->event.type == WG_PARSER_EVENT_NONE) pthread_cond_wait(&stream->event_cond, &parser->mutex); if (parser->flushing) @@ -691,7 +691,16 @@ static NTSTATUS wg_parser_stream_get_event(void *args) return VFW_E_WRONG_STATE; } - *params->event = stream->event; + if (stream->processed_eos) + params->event->type = WG_PARSER_EVENT_EOS; + else + *params->event = stream->event; + + if (stream->event.type == WG_PARSER_EVENT_EOS && !stream->processed_eos) + { + stream->processed_eos = true; + pthread_cond_signal(&stream->event_cond); + } if (stream->event.type != WG_PARSER_EVENT_BUFFER) { -- 2.34.1

3 8

[PATCH v2] kernelbase: Implement GetFileInformationByHandleEx(FileFullDirectoryInfo).
by Paul Gofman 09 Feb '22

09 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix test failures on Win7. dlls/kernel32/tests/file.c | 75 ++++++++++++++++++++++++++++++++++---- dlls/kernelbase/file.c | 12 +++++- include/winbase.h | 15 ++++++++ 3 files changed, 93 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f8e49491a7d..1f905cd59f8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4181,11 +4181,13 @@ todo_wine_if (i == 1) static void test_GetFileInformationByHandleEx(void) { int i; - char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024], *strPtr; - BOOL ret; + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024], buffer2[1024], *strPtr; + BOOL first, ret; DWORD ret2, written; + unsigned int count, count2, size; HANDLE directory, file; FILE_ID_BOTH_DIR_INFO *bothDirInfo; + FILE_FULL_DIR_INFO *full_dir_info; FILE_BASIC_INFO *basicInfo; FILE_STANDARD_INFO *standardInfo; FILE_NAME_INFO *nameInfo; @@ -4195,17 +4197,26 @@ static void test_GetFileInformationByHandleEx(void) FILE_DISPOSITION_INFO dispinfo; FILE_END_OF_FILE_INFO eofinfo; FILE_RENAME_INFO renameinfo; + BOOL full_dir_info_supported; - struct { + struct + { FILE_INFO_BY_HANDLE_CLASS handleClass; void *ptr; DWORD size; DWORD errorCode; - } checks[] = { + BOOL not_always_supported; + } + checks[] = + { {0xdeadbeef, NULL, 0, ERROR_INVALID_PARAMETER}, {FileIdBothDirectoryInfo, NULL, 0, ERROR_BAD_LENGTH}, {FileIdBothDirectoryInfo, NULL, sizeof(buffer), ERROR_NOACCESS}, - {FileIdBothDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}}; + {FileIdBothDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}, + {FileFullDirectoryInfo, NULL, 0, ERROR_BAD_LENGTH, TRUE}, + {FileFullDirectoryInfo, NULL, sizeof(buffer), ERROR_NOACCESS}, + {FileFullDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}, + }; if (!pGetFileInformationByHandleEx) { @@ -4232,10 +4243,17 @@ static void test_GetFileInformationByHandleEx(void) { SetLastError(0xdeadbeef); ret = pGetFileInformationByHandleEx(directory, checks[i].handleClass, checks[i].ptr, checks[i].size); + if (checks[i].not_always_supported && !ret && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("class %u is not supported, skipping the rest.\n", checks[i].handleClass); + break; + } ok(!ret && GetLastError() == checks[i].errorCode, "GetFileInformationByHandleEx: expected error %u, " "got %u.\n", checks[i].errorCode, GetLastError()); } + full_dir_info_supported = (i == ARRAY_SIZE(checks)); + first = TRUE; while (TRUE) { memset(buffer, 0xff, sizeof(buffer)); @@ -4243,8 +4261,51 @@ static void test_GetFileInformationByHandleEx(void) if (!ret && GetLastError() == ERROR_NO_MORE_FILES) break; ok(ret, "GetFileInformationByHandleEx: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); - if (!ret) - break; + + if (full_dir_info_supported && first) + { + count = 1; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + while (bothDirInfo->NextEntryOffset) + { + ++count; + size = offsetof(FILE_ID_BOTH_DIR_INFO, FileName[bothDirInfo->FileNameLength / 2]); + size = (size + 7) & ~7; + ok(bothDirInfo->NextEntryOffset == size, + "Got unexpected structure size, NextEntryOffset %u (%u).\n", bothDirInfo->NextEntryOffset, + size); + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + size = offsetof(FILE_FULL_DIR_INFO, FileName[bothDirInfo->FileNameLength / 2]); + ret = pGetFileInformationByHandleEx(directory, FileFullDirectoryRestartInfo, buffer2, sizeof(buffer2)); + ok(ret, "failed to query for FileFullDirectoryInfo, got error %u.\n", GetLastError()); + + count2 = 0; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + full_dir_info = (FILE_FULL_DIR_INFO *)buffer2; + while (1) + { + ++count2; + ok(bothDirInfo->FileNameLength == full_dir_info->FileNameLength, + "FileNameLength does not match, count2 %u.\n", count2); + ok(!memcmp(bothDirInfo->FileName, full_dir_info->FileName, full_dir_info->FileNameLength), + "FileName does not match, count %u.\n", count2); + + if (!full_dir_info->NextEntryOffset || !bothDirInfo->NextEntryOffset) + break; + + size = offsetof(FILE_FULL_DIR_INFO, FileName[full_dir_info->FileNameLength / 2]); + size = (size + 7) & ~7; + ok(full_dir_info->NextEntryOffset == size, + "Got unexpected structure size, NextEntryOffset %u (%u).\n", bothDirInfo->NextEntryOffset, + size); + full_dir_info = (FILE_FULL_DIR_INFO *)(((char *)full_dir_info) + full_dir_info->NextEntryOffset); + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + ok(count2 == count, "Got unexpected count2 %u, count %u.\n", count2, count); + first = FALSE; + } + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; while (TRUE) { diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 576e03eb62b..c1d9401f5c2 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2954,13 +2954,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ NTSTATUS status; IO_STATUS_BLOCK io; + TRACE( "%p, %u, %p, %u.\n", handle, class, info, size ); + switch (class) { case FileStreamInfo: case FileCompressionInfo: case FileRemoteProtocolInfo: - case FileFullDirectoryInfo: - case FileFullDirectoryRestartInfo: case FileStorageInfo: case FileAlignmentInfo: case FileIdExtdDirectoryInfo: @@ -2969,6 +2969,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileFullDirectoryRestartInfo: + case FileFullDirectoryInfo: + status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size, + FileFullDirectoryInformation, FALSE, NULL, + (class == FileFullDirectoryRestartInfo) ); + break; + case FileAttributeTagInfo: status = NtQueryInformationFile( handle, &io, info, size, FileAttributeTagInformation ); break; @@ -3002,6 +3009,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ case FileIoPriorityHintInfo: case FileEndOfFileInfo: default: + WARN( "class %u is not supported.\n", class ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..b2d5ca68d42 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -823,6 +823,21 @@ typedef struct _FILE_ID_BOTH_DIR_INFO { WCHAR FileName[1]; } FILE_ID_BOTH_DIR_INFO, *PFILE_ID_BOTH_DIR_INFO; +typedef struct _FILE_FULL_DIR_INFO { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + WCHAR FileName[1]; +} FILE_FULL_DIR_INFO, *PFILE_FULL_DIR_INFO; + typedef struct _FILE_BASIC_INFO { LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime; -- 2.34.1

1 0

[PATCH 01/17] dlls/concrt140: enable compilation with long types
by Eric Pouech 09 Feb '22

09 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/concrt140/Makefile.in | 1 - dlls/crtdll/Makefile.in | 2 +- dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++-------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 +++++++++--------- dlls/msvcp90/misc.c | 18 ++++++++-------- dlls/msvcp90/msvcp_main.c | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/concurrency.c | 4 ++-- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/except_i386.c | 18 ++++++++-------- dlls/msvcrt/except_x86_64.c | 12 +++++------ dlls/msvcrt/file.c | 48 ++++++++++++++++++++++--------------------- dlls/msvcrt/locale.c | 14 ++++++------- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/misc.c | 6 +++-- dlls/msvcrt/thread.c | 4 ++-- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 39 files changed, 116 insertions(+), 117 deletions(-) diff --git a/dlls/concrt140/Makefile.in b/dlls/concrt140/Makefile.in index 3b74c2e5b4b..aac1ed7b34a 100644 --- a/dlls/concrt140/Makefile.in +++ b/dlls/concrt140/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = concrt140.dll PARENTSRC = ../msvcrt diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 619fd59c5c4..ffdbb2ab7a1 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTDLL -D_CRTIMP= +EXTRADEFS = -D_CRTDLL -D_CRTIMP= MODULE = crtdll.dll IMPORTS = ntdll DELAYIMPORTS = advapi32 user32 diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 995d890493b..2e3e3edc9ea 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcirt.dll -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCIRT +EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 IMPORTS = msvcrt diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1103ea309a0..35f532425d3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -634,7 +634,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_seekoff, 16) #define call_streambuf_seekoff(this, off, dir, mode) CALL_VTBL_FUNC(this, 12, streampos, (streambuf*, streamoff, ios_seek_dir, int), (this, off, dir, mode)) streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, ios_seek_dir dir, int mode) { - TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + TRACE("(%p %ld %d %d)\n", this, offset, dir, mode); return EOF; } @@ -643,7 +643,7 @@ streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, ios_se DEFINE_THISCALL_WRAPPER(streambuf_seekpos, 12) streampos __thiscall streambuf_seekpos(streambuf *this, streampos pos, int mode) { - TRACE("(%p %d %d)\n", this, pos, mode); + TRACE("(%p %ld %d)\n", this, pos, mode); return call_streambuf_seekoff(this, pos, SEEKDIR_beg, mode); } @@ -1181,7 +1181,7 @@ int __thiscall filebuf_overflow(filebuf *this, int c) DEFINE_THISCALL_WRAPPER(filebuf_seekoff, 16) streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_dir dir, int mode) { - TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + TRACE("(%p %ld %d %d)\n", this, offset, dir, mode); if (call_streambuf_sync(&this->base) == EOF) return EOF; return _lseek(this->fd, offset, dir); @@ -1520,7 +1520,7 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, { char *base[3]; - TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + TRACE("(%p %ld %d %d)\n", this, offset, dir, mode); if ((unsigned int)dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) return EOF; @@ -1720,7 +1720,7 @@ int __thiscall stdiobuf_pbackfail(stdiobuf *this, int c) DEFINE_THISCALL_WRAPPER(stdiobuf_seekoff, 16) streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek_dir dir, int mode) { - TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + TRACE("(%p %ld %d %d)\n", this, offset, dir, mode); call_streambuf_overflow(&this->base, EOF); if (fseek(this->file, offset, dir)) return EOF; @@ -2070,7 +2070,7 @@ LONG __thiscall ios_flags_set(ios *this, LONG flags) { LONG prev = this->flags; - TRACE("(%p %x)\n", this, flags); + TRACE("(%p %lx)\n", this, flags); this->flags = flags; return prev; @@ -2225,7 +2225,7 @@ LONG __thiscall ios_setf(ios *this, LONG flags) { LONG prev = this->flags; - TRACE("(%p %x)\n", this, flags); + TRACE("(%p %lx)\n", this, flags); ios_lock(this); this->flags |= flags; @@ -2240,7 +2240,7 @@ LONG __thiscall ios_setf_mask(ios *this, LONG flags, LONG mask) { LONG prev = this->flags; - TRACE("(%p %x %x)\n", this, flags, mask); + TRACE("(%p %lx %lx)\n", this, flags, mask); ios_lock(this); this->flags = (this->flags & (~mask)) | (flags & mask); @@ -2311,7 +2311,7 @@ LONG __thiscall ios_unsetf(ios *this, LONG flags) { LONG prev = this->flags; - TRACE("(%p %x)\n", this, flags); + TRACE("(%p %lx)\n", this, flags); ios_lock(this); this->flags &= ~flags; @@ -2607,7 +2607,7 @@ ostream* __thiscall ostream_seekp(ostream *this, streampos pos) { ios *base = ostream_get_ios(this); - TRACE("(%p %d)\n", this, pos); + TRACE("(%p %ld)\n", this, pos); ios_lockbuf(base); if (streambuf_seekpos(base->sb, pos, OPENMODE_out) == EOF) @@ -2623,7 +2623,7 @@ ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_ { ios *base = ostream_get_ios(this); - TRACE("(%p %d %d)\n", this, off, dir); + TRACE("(%p %ld %d)\n", this, off, dir); ios_lockbuf(base); if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_out) == EOF) @@ -3749,7 +3749,7 @@ istream* __thiscall istream_seekg(istream *this, streampos pos) { ios *base = istream_get_ios(this); - TRACE("(%p %d)\n", this, pos); + TRACE("(%p %ld)\n", this, pos); ios_lockbuf(base); if (streambuf_seekpos(base->sb, pos, OPENMODE_in) == EOF) @@ -3765,7 +3765,7 @@ istream* __thiscall istream_seekg_offset(istream *this, streamoff off, ios_seek_ { ios *base = istream_get_ios(this); - TRACE("(%p %d %d)\n", this, off, dir); + TRACE("(%p %ld %d)\n", this, off, dir); ios_lockbuf(base); if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_in) == EOF) @@ -4010,7 +4010,7 @@ static LONG istream_internal_read_integer(istream *this, LONG min_value, LONG ma int num_base; LONG ret; - TRACE("(%p %d %d %d)\n", this, min_value, max_value, set_flag); + TRACE("(%p %ld %ld %d)\n", this, min_value, max_value, set_flag); num_base = istream_getint(this, buffer); errno = 0; @@ -4035,7 +4035,7 @@ static ULONG istream_internal_read_unsigned_integer(istream *this, LONG min_valu int num_base; ULONG ret; - TRACE("(%p %d %u)\n", this, min_value, max_value); + TRACE("(%p %ld %lu)\n", this, min_value, max_value); num_base = istream_getint(this, buffer); errno = 0; diff --git a/dlls/msvcp100/Makefile.in b/dlls/msvcp100/Makefile.in index 35602aa4096..43416c92ad2 100644 --- a/dlls/msvcp100/Makefile.in +++ b/dlls/msvcp100/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp100.dll IMPORTS = msvcr100 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=100 +EXTRADEFS = -D_MSVCP_VER=100 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp110/Makefile.in b/dlls/msvcp110/Makefile.in index 8046916629d..b2814b35cc3 100644 --- a/dlls/msvcp110/Makefile.in +++ b/dlls/msvcp110/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp110.dll IMPORTS = msvcr110 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=110 +EXTRADEFS = -D_MSVCP_VER=110 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp120/Makefile.in b/dlls/msvcp120/Makefile.in index 896efa40f18..605dcfe4988 100644 --- a/dlls/msvcp120/Makefile.in +++ b/dlls/msvcp120/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp120.dll IMPORTS = msvcr120 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=120 +EXTRADEFS = -D_MSVCP_VER=120 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index d26db254d76..eb0c8c3ef39 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp140.dll -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=140 +EXTRADEFS = -D_MSVCP_VER=140 PARENTSRC = ../msvcp90 IMPORTLIB = msvcp140 diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index 6c3626ee470..90dc3c03ff1 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp60.dll -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=60 +EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 IMPORTS = msvcrt diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index cecea919bed..5d1894cb073 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -94,7 +94,7 @@ static void init_cxx_funcs(void) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { diff --git a/dlls/msvcp70/Makefile.in b/dlls/msvcp70/Makefile.in index 0f402323581..36ba70b761b 100644 --- a/dlls/msvcp70/Makefile.in +++ b/dlls/msvcp70/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp70.dll IMPORTS = msvcr70 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=70 +EXTRADEFS = -D_MSVCP_VER=70 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index d84b2c1c24d..dfa0a2b23d5 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp71.dll IMPORTS = msvcr71 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=71 +EXTRADEFS = -D_MSVCP_VER=71 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp80/Makefile.in b/dlls/msvcp80/Makefile.in index 1cc21b853ab..c541c1b0d11 100644 --- a/dlls/msvcp80/Makefile.in +++ b/dlls/msvcp80/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp80.dll IMPORTS = msvcr80 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=80 +EXTRADEFS = -D_MSVCP_VER=80 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index 0d06a710d29..5d812db58d9 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp90.dll IMPORTS = msvcr90 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=90 +EXTRADEFS = -D_MSVCP_VER=90 C_SRCS = \ details.c \ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index dd7fea203eb..6be2bad1a38 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7476,7 +7476,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_long(const num_put *thi char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return num_put_char__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, num_put_char__Ifmt(this, fmt, "ld", base->fmtfl), v)); @@ -7492,7 +7492,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_put_long, 32) ostreambuf_iterator_char* __thiscall num_put_char_put_long(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, LONG v) { - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return call_num_put_char_do_put_long(this, ret, dest, base, fill, v); } @@ -7518,7 +7518,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_ulong(const num_put *th char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return num_put_char__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, num_put_char__Ifmt(this, fmt, "lu", base->fmtfl), v)); @@ -7534,7 +7534,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_put_ulong, 32) ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, ULONG v) { - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } @@ -8375,7 +8375,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_long(const num_put *t char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return num_put_wchar__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "ld", base->fmtfl), v)); @@ -8394,7 +8394,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_long(const num_put *t char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return num_put_short__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "ld", base->fmtfl), v)); @@ -8412,7 +8412,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_put_long, 32) ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_long(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, LONG v) { - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return call_num_put_wchar_do_put_long(this, ret, dest, base, fill, v); } @@ -8438,7 +8438,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_ulong(const num_put * char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return num_put_wchar__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "lu", base->fmtfl), v)); @@ -8457,7 +8457,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_ulong(const num_put * char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return num_put_short__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "lu", base->fmtfl), v)); @@ -8475,7 +8475,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_put_ulong, 32) ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_ulong(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, ULONG v) { - TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v); return call_num_put_wchar_do_put_ulong(this, ret, dest, base, fill, v); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 2d309911f10..c7856e0e33d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1224,13 +1224,13 @@ typedef int (__cdecl *_Thrd_start_t)(void*); int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b) { - TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + TRACE("(%p %lu %p %lu)\n", a.hnd, a.id, b.hnd, b.id); return a.id == b.id; } int __cdecl _Thrd_lt(_Thrd_t a, _Thrd_t b) { - TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + TRACE("(%p %lu %p %lu)\n", a.hnd, a.id, b.hnd, b.id); return a.id < b.id; } @@ -1258,7 +1258,7 @@ static _Thrd_t thread_current(void) } ret.id = GetCurrentThreadId(); - TRACE("(%p %u)\n", ret.hnd, ret.id); + TRACE("(%p %lu)\n", ret.hnd, ret.id); return ret; } @@ -1284,7 +1284,7 @@ ULONGLONG __cdecl _Thrd_current(void) int __cdecl _Thrd_join(_Thrd_t thr, int *code) { - TRACE("(%p %u %p)\n", thr.hnd, thr.id, code); + TRACE("(%p %lu %p)\n", thr.hnd, thr.id, code); if (WaitForSingleObject(thr.hnd, INFINITE)) return _THRD_ERROR; @@ -1469,7 +1469,7 @@ void __thiscall _Pad__Release(_Pad *this) BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) { - TRACE("(%p %x %x)\n", cs, spin_count, flags); + TRACE("(%p %lx %lx)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); } @@ -1479,7 +1479,7 @@ BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( HANDLE CDECL MSVCP__crtCreateEventExW( SECURITY_ATTRIBUTES *attribs, LPCWSTR name, DWORD flags, DWORD access) { - TRACE("(%p %s 0x%08x 0x%08x)\n", attribs, debugstr_w(name), flags, access); + TRACE("(%p %s 0x%08lx 0x%08lx)\n", attribs, debugstr_w(name), flags, access); return CreateEventExW(attribs, name, flags, access); } @@ -1514,7 +1514,7 @@ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( SECURITY_ATTRIBUTES *attribs, LONG initial_count, LONG max_count, LPCWSTR name, DWORD flags, DWORD access) { - TRACE("(%p %d %d %s 0x%08x 0x%08x)\n", attribs, initial_count, max_count, debugstr_w(name), + TRACE("(%p %ld %ld %s 0x%08lx 0x%08lx)\n", attribs, initial_count, max_count, debugstr_w(name), flags, access); return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access); } @@ -1544,7 +1544,7 @@ VOID CDECL MSVCP__crtCloseThreadpoolTimer(TP_TIMER *timer) VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, FILETIME *due_time, DWORD period, DWORD window_length) { - TRACE("(%p %p 0x%08x 0x%08x)\n", timer, due_time, period, window_length); + TRACE("(%p %p 0x%08lx 0x%08lx)\n", timer, due_time, period, window_length); return SetThreadpoolTimer(timer, due_time, period, window_length); } @@ -1699,7 +1699,7 @@ const char* __cdecl _Syserror_map(int err) /* ?_Winerror_message@std@@YAKKPEADK@Z */ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) { - TRACE("(%u %p %u)\n", err, buf, size); + TRACE("(%lu %p %lu)\n", err, buf, size); return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 7f61f59a078..cf37631da0e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -189,7 +189,7 @@ static void init_cxx_funcs(void) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 94962b962f3..a48ae314257 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 IMPORTS = ntdll diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 7d5ec65444a..26db1d46f7a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 IMPORTS = ntdll diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index c4cbb9ab5c2..d2957c2f1d3 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 IMPORTS = ntdll diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index ac08107c04e..4383c5ccb87 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 IMPORTS = ntdll diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index d0d265ef344..5a83c81c547 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 IMPORTS = ntdll diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b9cb3fd88d8..2153949b41e 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 IMPORTS = ntdll diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 876553d6c02..96176a12553 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 IMPORTS = ntdll diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index d6aa44dd7ce..e8a510d9937 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt IMPORTS = ntdll diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 6afe6e81489..e5a24f13855 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -527,7 +527,7 @@ DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_ctor_name, 12) scheduler_resource_allocation_error* __thiscall scheduler_resource_allocation_error_ctor_name( scheduler_resource_allocation_error *this, const char *name, HRESULT hr) { - TRACE("(%p %s %x)\n", this, wine_dbgstr_a(name), hr); + TRACE("(%p %s %lx)\n", this, wine_dbgstr_a(name), hr); __exception_ctor(&this->e, name, &scheduler_resource_allocation_error_vtable); this->hr = hr; return this; @@ -1101,7 +1101,7 @@ static void ThreadScheduler_dtor(ThreadScheduler *this) { int i; - if(this->ref != 0) WARN("ref = %d\n", this->ref); + if(this->ref != 0) WARN("ref = %ld\n", this->ref); SchedulerPolicy_dtor(&this->policy); for(i=0; i<this->shutdown_count; i++) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 3e41887e88e..2c549c1e7a5 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -153,7 +153,7 @@ static BOOL handle_enhanced_keys(INPUT_RECORD *ir, unsigned char *ch1, unsigned } } - WARN("Unmapped char keyState=%x vk=%x\n", + WARN("Unmapped char keyState=%lx vk=%x\n", ir->Event.KeyEvent.dwControlKeyState, ir->Event.KeyEvent.wVirtualScanCode); return FALSE; } diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ac0bb50f0fb..a7140a9011f 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -272,7 +272,7 @@ int CDECL raise(int sig) */ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) { - TRACE("(%08x,%p)\n", ex, ptr); + TRACE("(%08lx,%p)\n", ex, ptr); /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ return msvcrt_exception_filter(ptr); } diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 23a027368ba..eb41af36d7e 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -368,7 +368,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG *rec = *prev_rec; rec->ExceptionFlags &= ~EH_UNWINDING; if(TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); @@ -538,7 +538,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) if (rec->ExceptionCode != CXX_EXCEPTION) { - TRACE( "non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode ); + TRACE( "non-c++ exception thrown in SEH handler: %lx\n", rec->ExceptionCode ); terminate(); } @@ -601,7 +601,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame *rec = *msvcrt_get_thread_data()->exc_record; rec->ExceptionFlags &= ~EH_UNWINDING; if(TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); @@ -633,7 +633,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame thread_data_t *data = msvcrt_get_thread_data(); exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n", + TRACE("handling C exception code %lx rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); if (data->se_translator) { @@ -866,7 +866,7 @@ int CDECL _except_handler2(PEXCEPTION_RECORD rec, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatcher) { - FIXME("exception %x flags=%x at %p handler=%p %p %p stub\n", + FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->Handler, context, dispatcher); return ExceptionContinueSearch; @@ -883,7 +883,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, EXCEPTION_POINTERS exceptPtrs; PSCOPETABLE pScopeTable; - TRACE("exception %x flags=%x at %p handler=%p %p %p semi-stub\n", + TRACE("exception %lx flags=%lx at %p handler=%p %p %p semi-stub\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->handler, context, dispatcher); @@ -952,7 +952,7 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), EXCEPTION_POINTERS exceptPtrs; const SCOPETABLE_V4 *scope_table = get_scopetable_v4( frame, *cookie ); - TRACE( "exception %x flags=%x at %p handler=%p %p %p cookie=%x scope table=%p cookies=%d/%x,%d/%x\n", + TRACE( "exception %lx flags=%lx at %p handler=%p %p %p cookie=%lx scope table=%p cookies=%d/%lx,%d/%lx\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->handler, context, dispatcher, *cookie, scope_table, scope_table->gs_cookie_offset, scope_table->gs_cookie_xor, @@ -1187,7 +1187,7 @@ int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, rec.Cause.Underflow = rec.Enable.Underflow & rec.Status.Underflow; rec.Cause.Inexact = rec.Enable.Inexact & rec.Status.Inexact; - TRACE("opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + TRACE("opcode: %lx\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); if(*(WORD*)ctx->ErrorOffset == 0x35dc) { /* fdiv m64fp */ if(exception_code==STATUS_FLOAT_DIVIDE_BY_ZERO || exception_code==STATUS_FLOAT_INVALID_OPERATION) { @@ -1213,7 +1213,7 @@ int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, return ret; } - FIXME("unsupported opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + FIXME("unsupported opcode: %lx\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7cbffc0d837..4ef143100d6 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -350,7 +350,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) } __EXCEPT_CTX(cxx_rethrow_filter, &ctx) { - TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; if (untrans_rec) @@ -486,7 +486,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) if (rec->ExceptionCode != CXX_EXCEPTION) { - TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode); + TRACE("non-c++ exception thrown in SEH handler: %lx\n", rec->ExceptionCode); terminate(); } @@ -558,7 +558,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("nested exception detected\n"); unwindlevel = tryblock->end_level; orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); - TRACE("setting orig_frame to %lx\n", orig_frame); + TRACE("setting orig_frame to %Ix\n", orig_frame); } } } @@ -591,7 +591,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { - TRACE("handling C++ exception rec %p frame %lx descr %p\n", rec, frame, descr); + TRACE("handling C++ exception rec %p frame %Ix descr %p\n", rec, frame, descr); dump_exception_type(exc_type, rec->ExceptionInformation[3]); dump_function_descr(descr, dispatch->ImageBase); } @@ -601,7 +601,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, thread_data_t *data = msvcrt_get_thread_data(); exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %lx descr %p\n", + TRACE("handling C exception code %lx rec %p frame %Ix descr %p\n", rec->ExceptionCode, rec, frame, descr); if (data->se_translator) { @@ -647,7 +647,7 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { - TRACE( "%p %lx %p %p\n", rec, frame, context, dispatch ); + TRACE( "%p %Ix %p %p\n", rec, frame, context, dispatch ); return cxx_frame_handler( rec, frame, context, dispatch, rva_to_ptr(*(UINT*)dispatch->HandlerData, dispatch->ImageBase) ); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2666492956c..6ae16cd496a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -822,7 +822,7 @@ int CDECL _access(const char *filename, int mode) { DWORD attr = GetFileAttributesA(filename); - TRACE("(%s,%d) %d\n",filename,mode,attr); + TRACE("(%s,%d) %ld\n",filename,mode,attr); if (!filename || attr == INVALID_FILE_ATTRIBUTES) { @@ -857,7 +857,7 @@ int CDECL _waccess(const wchar_t *filename, int mode) { DWORD attr = GetFileAttributesW(filename); - TRACE("(%s,%d) %d\n",debugstr_w(filename),mode,attr); + TRACE("(%s,%d) %ld\n",debugstr_w(filename),mode,attr); if (!filename || attr == INVALID_FILE_ATTRIBUTES) { @@ -931,7 +931,7 @@ int CDECL _unlink(const char *path) TRACE("%s\n",debugstr_a(path)); if(DeleteFileA(path)) return 0; - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -944,7 +944,7 @@ int CDECL _wunlink(const wchar_t *path) TRACE("(%s)\n",debugstr_w(path)); if(DeleteFileW(path)) return 0; - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -972,7 +972,7 @@ int CDECL _commit(int fd) } else { - TRACE(":failed-last error (%d)\n",GetLastError()); + TRACE(":failed-last error (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); ret = -1; } @@ -1083,7 +1083,7 @@ int CDECL _close(int fd) ret = CloseHandle(info->handle) ? 0 : -1; msvcrt_free_fd(fd); if (ret) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-last error (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); } } @@ -1309,7 +1309,7 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence) return ofs.QuadPart; } release_ioinfo(info); - TRACE(":error-last error (%d)\n",GetLastError()); + TRACE(":error-last error (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -1369,7 +1369,7 @@ int CDECL _locking(int fd, int mode, __msvcrt_long nbytes) return -1; } - TRACE(":fd (%d) by 0x%08Ix mode %s\n", + TRACE(":fd (%d) by 0x0%lx mode %s\n", fd,nbytes,(mode==_LK_UNLCK)?"_LK_UNLCK": (mode==_LK_LOCK)?"_LK_LOCK": (mode==_LK_NBLCK)?"_LK_NBLCK": @@ -1802,7 +1802,7 @@ int CDECL _fstat64(int fd, struct _stat64* buf) if ((status = NtQueryInformationFile( info->handle, &io, &basic_info, sizeof(basic_info), FileBasicInformation )) || (status = NtQueryInformationFile( info->handle, &io, &std_info, sizeof(std_info), FileStandardInformation ))) { - WARN(":failed-error %x\n",status); + WARN(":failed-error %lx\n",status); msvcrt_set_errno(ERROR_INVALID_PARAMETER); release_ioinfo(info); return -1; @@ -1816,7 +1816,7 @@ int CDECL _fstat64(int fd, struct _stat64* buf) RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; buf->st_nlink = std_info.NumberOfLinks; - TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",basic_info.FileAttributes, buf->st_mode); + TRACE(":dwFileAttributes = 0x%lx, mode set to 0x%x\n",basic_info.FileAttributes, buf->st_mode); } release_ioinfo(info); return 0; @@ -2303,7 +2303,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-last error (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return *_errno(); } @@ -2547,7 +2547,7 @@ int CDECL _open_osfhandle(intptr_t handle, int oflags) flags |= split_oflags(oflags); fd = msvcrt_alloc_fd((HANDLE)handle, flags); - TRACE(":handle (%Iu) fd (%d) flags 0x%08x\n", handle, fd, flags); + TRACE(":handle (%Iu) fd (%d) flags 0x%08lx\n", handle, fd, flags); return fd; } @@ -2913,14 +2913,14 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) } else { - TRACE(":failed-last error (%d)\n",GetLastError()); + TRACE(":failed-last error (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } } if (count > 4) - TRACE("(%u), %s\n",num_read,debugstr_an(buf, num_read)); + TRACE("(%lu), %s\n",num_read,debugstr_an(buf, num_read)); return num_read; } @@ -3016,7 +3016,7 @@ int CDECL _stat64(const char* path, struct _stat64 * buf) if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) { - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n",GetLastError()); *_errno() = ENOENT; return -1; } @@ -3172,7 +3172,7 @@ int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf) if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) { - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n",GetLastError()); *_errno() = ENOENT; return -1; } @@ -3323,7 +3323,7 @@ char * CDECL _tempnam(const char *dir, const char *prefix) DeleteFileA(tmpbuf); return _strdup(tmpbuf); } - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n",GetLastError()); return NULL; } @@ -3344,7 +3344,7 @@ wchar_t * CDECL _wtempnam(const wchar_t *dir, const wchar_t *prefix) DeleteFileW(tmpbuf); return _wcsdup(tmpbuf); } - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n",GetLastError()); return NULL; } @@ -3456,7 +3456,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) if (!WriteFile(hand, buf, count, &num_written, NULL) || num_written != count) { - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, + TRACE("WriteFile (fd %d, hand %p) failed-last error (%ld)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); num_written = -1; @@ -3584,7 +3584,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) if (num_written != j) { - TRACE("WriteFile/WriteConsoleW (fd %d, hand %p) failed-last error (%d)\n", fd, + TRACE("WriteFile/WriteConsoleW (fd %d, hand %p) failed-last error (%ld)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); release_ioinfo(info); @@ -4843,7 +4843,7 @@ int CDECL remove(const char *path) TRACE("(%s)\n",path); if (DeleteFileA(path)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -4856,7 +4856,7 @@ int CDECL _wremove(const wchar_t *path) TRACE("(%s)\n",debugstr_w(path)); if (DeleteFileW(path)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -4869,7 +4869,7 @@ int CDECL rename(const char *oldpath,const char *newpath) TRACE(":from %s to %s\n",oldpath,newpath); if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -4882,7 +4882,7 @@ int CDECL _wrename(const wchar_t *oldpath,const wchar_t *newpath) TRACE(":from %s to %s\n",debugstr_w(oldpath),debugstr_w(newpath)); if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3b3d027f466..924671e7047 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -854,7 +854,7 @@ int CDECL __crtLCMapStringA( WCHAR buf_out[32], *out = buf_out; int in_len, out_len, r; - TRACE("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + TRACE("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n", lcid, mapflags, src, srclen, dst, dstlen, codepage, xflag); in_len = MultiByteToWideChar(codepage, MB_ERR_INVALID_CHARS, src, srclen, NULL, 0); @@ -904,7 +904,7 @@ done: int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int srclen, wchar_t *dst, int dstlen, unsigned int codepage, int xflag) { - FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + FIXME("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n", lcid, mapflags, debugstr_w(src), srclen, dst, dstlen, codepage, xflag); return LCMapStringW(lcid, mapflags, src, srclen, dst, dstlen); @@ -916,7 +916,7 @@ int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1, const char *src2, int len2 ) { - FIXME("(lcid %x, flags %x, %s(%d), %s(%d), partial stub\n", + FIXME("(lcid %lx, flags %lx, %s(%d), %s(%d), partial stub\n", lcid, flags, debugstr_a(src1), len1, debugstr_a(src2), len2 ); /* FIXME: probably not entirely right */ return CompareStringA( lcid, flags, src1, len1, src2, len2 ); @@ -928,7 +928,7 @@ int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len int CDECL __crtCompareStringW( LCID lcid, DWORD flags, const wchar_t *src1, int len1, const wchar_t *src2, int len2 ) { - FIXME("(lcid %x, flags %x, %s(%d), %s(%d), partial stub\n", + FIXME("(lcid %lx, flags %lx, %s(%d), %s(%d), partial stub\n", lcid, flags, debugstr_w(src1), len1, debugstr_w(src2), len2 ); /* FIXME: probably not entirely right */ return CompareStringW( lcid, flags, src1, len1, src2, len2 ); @@ -939,7 +939,7 @@ int CDECL __crtCompareStringW( LCID lcid, DWORD flags, const wchar_t *src1, int */ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, wchar_t *buffer, int len ) { - FIXME("(lcid %x, type %x, %p(%d), partial stub\n", lcid, type, buffer, len ); + FIXME("(lcid %lx, type %lx, %p(%d), partial stub\n", lcid, type, buffer, len ); /* FIXME: probably not entirely right */ return GetLocaleInfoW( lcid, type, buffer, len ); } @@ -950,7 +950,7 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, wchar_t *buffer, int len */ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, wchar_t *buffer, int len ) { - TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len); + TRACE("(%s, %lx, %p, %d)\n", debugstr_w(locale), type, buffer, len); return GetLocaleInfoEx(locale, type, buffer, len); } #endif @@ -964,7 +964,7 @@ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, wchar_t *buffe BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, wchar_t *buffer, int len, WORD *out) { - FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n", + FIXME("(unk %lx, type %lx, wstr %p(%d), %p) partial stub\n", unk, type, buffer, len, out); return GetStringTypeW(type, buffer, len, out); diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 23dfb24ac5d..db8554668ad 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -89,7 +89,7 @@ static inline void msvcrt_free_tls_mem(void) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%u)\n", + TRACE("(%p, %s, %p) pid(%lx), tid(%lx), tls(%lu)\n", hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved, GetCurrentProcessId(), GetCurrentThreadId(), msvcrt_tls_index); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 33afe8d1d90..854403a71bf 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -10318,7 +10318,7 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, WORD operation; int raise = 0; - TRACE("(%x %x %lf %lf %x %p)\n", fpe, op, arg, res, cw, unk); + TRACE("(%lx %x %lf %lf %lx %p)\n", fpe, op, arg, res, cw, unk); #ifdef _WIN64 cw = ((cw >> 7) & 0x3f) | ((cw >> 3) & 0xc00); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 03af50d8b01..9758f354b89 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -325,7 +325,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) ret = MultiByteToWideChar(newcp, 0, bufA, charcount, bufW, charcount); if (ret != charcount) - ERR("MultiByteToWideChar of chars failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); + ERR("MultiByteToWideChar of chars failed for cp %d, ret=%d (exp %d), error=%ld\n", newcp, ret, charcount, GetLastError()); GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); LCMapStringW(lcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); @@ -350,7 +350,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) ret = WideCharToMultiByte(newcp, 0, bufW, charcount, bufA, charcount, NULL, NULL); if (ret != charcount) - ERR("WideCharToMultiByte failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); + ERR("WideCharToMultiByte failed for cp %d, ret=%d (exp %d), error=%ld\n", newcp, ret, charcount, GetLastError()); charcount = 0; for (i = 0; i < 256; i++) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 73fadfcbb74..16188394b98 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -516,7 +516,7 @@ int CDECL __crtGetShowWindowMode(void) STARTUPINFOW si; GetStartupInfoW(&si); - TRACE("flags=%x window=%d\n", si.dwFlags, si.wShowWindow); + TRACE("flags=%lx window=%d\n", si.dwFlags, si.wShowWindow); return si.dwFlags & STARTF_USESHOWWINDOW ? si.wShowWindow : SW_SHOWDEFAULT; } @@ -526,7 +526,7 @@ int CDECL __crtGetShowWindowMode(void) BOOL CDECL __crtInitializeCriticalSectionEx( CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) { - TRACE("(%p %x %x)\n", cs, spin_count, flags); + TRACE("(%p %lx %lx)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); } @@ -570,7 +570,7 @@ LONG CDECL __crtUnhandledException(EXCEPTION_POINTERS *ep) */ void CDECL __crtSleep(DWORD timeout) { - TRACE("(%u)\n", timeout); + TRACE("(%lu)\n", timeout); Sleep(timeout); } diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index e71b949a6d5..6aad9a22d47 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -164,7 +164,7 @@ uintptr_t CDECL _beginthread( (void*)start_address, &trampoline->module)) { trampoline->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); + WARN("failed to get module for the start_address: %lu\n", GetLastError()); } #endif @@ -230,7 +230,7 @@ uintptr_t CDECL _beginthreadex( (void*)start_address, &trampoline->module)) { trampoline->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); + WARN("failed to get module for the start_address: %lu\n", GetLastError()); } #endif diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 7f9151d4c3a..bd4f78729d0 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd IMPORTS = ntdll diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index e7d9951575e..bf7f62ada8a 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase IMPORTS = ntdll

2 17

[PATCH 1/2] winealsa: Remove the ability to read additional devices from the registry.
by Huw Davies 09 Feb '22

09 Feb '22

If necessary, this could be re-written using the NT registry api in the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 53 ------------------------------------ 1 file changed, 53 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5aa1b4aab63..8713b6153ce 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -165,9 +165,6 @@ static struct list g_sessions = LIST_INIT(g_sessions); static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; static const char defname[] = "default"; -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v',0}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -474,54 +471,6 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return S_OK; } -static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***ids, - GUID **guids, UINT *num) -{ - static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; - static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; - HKEY key; - WCHAR reg_devices[256]; - DWORD size = sizeof(reg_devices), type; - const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ - if(RegQueryValueExW(key, value_name, 0, &type, - (BYTE*)reg_devices, &size) == ERROR_SUCCESS){ - WCHAR *p = reg_devices; - - if(type != REG_MULTI_SZ){ - ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - RegCloseKey(key); - return; - } - - while(*p){ - char devname[64]; - - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); - - if(alsa_try_open(devname, stream)){ - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - (*ids)[*num] = construct_device_id(flow, p, NULL); - get_device_guid(flow, devname, &(*guids)[*num]); - ++*num; - } - - p += lstrlenW(p) + 1; - } - } - - RegCloseKey(key); - } -} - struct card_type { struct list entry; int first_card_number; @@ -570,8 +519,6 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, ++*num; } - get_reg_devices(flow, stream, ids, guids, num); - for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; -- 2.25.1

2 1

[PATCH] mf: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 09 Feb '22

09 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/Makefile.in | 1 - dlls/mf/clock.c | 16 ++++---- dlls/mf/copier.c | 38 +++++++++--------- dlls/mf/evr.c | 36 ++++++++--------- dlls/mf/main.c | 20 +++++----- dlls/mf/quality.c | 8 ++-- dlls/mf/samplegrabber.c | 26 ++++++------- dlls/mf/sar.c | 58 +++++++++++++-------------- dlls/mf/session.c | 86 ++++++++++++++++++++--------------------- dlls/mf/topology.c | 58 +++++++++++++-------------- 10 files changed, 173 insertions(+), 174 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index cbb41fb8d74..36727d4d4e3 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c index 4a3ad7ec7c1..e9877533a5a 100644 --- a/dlls/mf/clock.c +++ b/dlls/mf/clock.c @@ -158,7 +158,7 @@ static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&notification->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -168,7 +168,7 @@ static ULONG WINAPI sink_notification_Release(IUnknown *iface) struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&notification->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -253,7 +253,7 @@ static ULONG WINAPI present_clock_AddRef(IMFPresentationClock *iface) struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); ULONG refcount = InterlockedIncrement(&clock->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -265,7 +265,7 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) struct clock_timer *timer, *timer2; struct clock_sink *sink, *sink2; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -312,7 +312,7 @@ static HRESULT WINAPI present_clock_GetCorrelatedTime(IMFPresentationClock *ifac struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); HRESULT hr = MF_E_CLOCK_NO_TIME_SOURCE; - TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + TRACE("%p, %#lx, %p, %p.\n", iface, reserved, clock_time, system_time); EnterCriticalSection(&clock->cs); if (clock->time_source) @@ -335,7 +335,7 @@ static HRESULT WINAPI present_clock_GetState(IMFPresentationClock *iface, DWORD { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); - TRACE("%p, %#x, %p.\n", iface, reserved, state); + TRACE("%p, %#lx, %p.\n", iface, reserved, state); EnterCriticalSection(&clock->cs); *state = clock->state; @@ -816,7 +816,7 @@ static HRESULT present_clock_schedule_timer(struct presentation_clock *clock, DW { if (FAILED(hr = IMFPresentationTimeSource_GetCorrelatedTime(clock->time_source, 0, &clocktime, &systime))) { - WARN("Failed to get clock time, hr %#x.\n", hr); + WARN("Failed to get clock time, hr %#lx.\n", hr); return hr; } time -= clocktime; @@ -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, %#lx, %s, %p, %p, %p.\n", iface, flags, debugstr_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..ab995fb98db 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -72,7 +72,7 @@ static ULONG WINAPI sample_copier_transform_AddRef(IMFTransform *iface) struct sample_copier *transform = impl_from_IMFTransform(iface); ULONG refcount = InterlockedIncrement(&transform->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -82,7 +82,7 @@ static ULONG WINAPI sample_copier_transform_Release(IMFTransform *iface) struct sample_copier *transform = impl_from_IMFTransform(iface); ULONG refcount = InterlockedDecrement(&transform->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -120,7 +120,7 @@ static HRESULT WINAPI sample_copier_transform_GetStreamCount(IMFTransform *iface static HRESULT WINAPI sample_copier_transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, DWORD output_size, DWORD *outputs) { - TRACE("%p, %u, %p, %u, %p.\n", iface, input_size, inputs, output_size, outputs); + TRACE("%p, %lu, %p, %lu, %p.\n", iface, input_size, inputs, output_size, outputs); return E_NOTIMPL; } @@ -129,7 +129,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputStreamInfo(IMFTransform *i { struct sample_copier *transform = impl_from_IMFTransform(iface); - TRACE("%p, %u, %p.\n", iface, id, info); + TRACE("%p, %lu, %p.\n", iface, id, info); memset(info, 0, sizeof(*info)); @@ -145,7 +145,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputStreamInfo(IMFTransform * { struct sample_copier *transform = impl_from_IMFTransform(iface); - TRACE("%p, %u, %p.\n", iface, id, info); + TRACE("%p, %lu, %p.\n", iface, id, info); memset(info, 0, sizeof(*info)); @@ -171,7 +171,7 @@ static HRESULT WINAPI sample_copier_transform_GetAttributes(IMFTransform *iface, static HRESULT WINAPI sample_copier_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - TRACE("%p, %u, %p.\n", iface, id, attributes); + TRACE("%p, %lu, %p.\n", iface, id, attributes); return E_NOTIMPL; } @@ -179,21 +179,21 @@ static HRESULT WINAPI sample_copier_transform_GetInputStreamAttributes(IMFTransf static HRESULT WINAPI sample_copier_transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - TRACE("%p, %u, %p.\n", iface, id, attributes); + TRACE("%p, %lu, %p.\n", iface, id, attributes); return E_NOTIMPL; } static HRESULT WINAPI sample_copier_transform_DeleteInputStream(IMFTransform *iface, DWORD id) { - TRACE("%p, %u.\n", iface, id); + TRACE("%p, %lu.\n", iface, id); return E_NOTIMPL; } static HRESULT WINAPI sample_copier_transform_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) { - TRACE("%p, %u, %p.\n", iface, streams, ids); + TRACE("%p, %lu, %p.\n", iface, streams, ids); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputAvailableType(IMFTransform static const GUID *types[] = { &MFMediaType_Video, &MFMediaType_Audio }; HRESULT hr; - TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -225,7 +225,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputAvailableType(IMFTransfor IMFMediaType *cloned_type = NULL; HRESULT hr = S_OK; - TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type); EnterCriticalSection(&transform->cs); if (transform->buffer_type) @@ -326,7 +326,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, %lu, %p, %#lx.\n", iface, id, type, flags); return sample_copier_set_media_type(transform, TRUE, id, type, flags); } @@ -335,7 +335,7 @@ static HRESULT WINAPI sample_copier_transform_SetOutputType(IMFTransform *iface, { struct sample_copier *transform = impl_from_IMFTransform(iface); - TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags); return sample_copier_set_media_type(transform, FALSE, id, type, flags); } @@ -371,7 +371,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputCurrentType(IMFTransform * { struct sample_copier *transform = impl_from_IMFTransform(iface); - TRACE("%p, %u, %p.\n", iface, id, type); + TRACE("%p, %lu, %p.\n", iface, id, type); return sample_copier_get_current_type(transform, id, SAMPLE_COPIER_INPUT_TYPE_SET, type); } @@ -380,7 +380,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputCurrentType(IMFTransform { struct sample_copier *transform = impl_from_IMFTransform(iface); - TRACE("%p, %u, %p.\n", iface, id, type); + TRACE("%p, %lu, %p.\n", iface, id, type); return sample_copier_get_current_type(transform, id, SAMPLE_COPIER_OUTPUT_TYPE_SET, type); } @@ -390,7 +390,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputStatus(IMFTransform *iface struct sample_copier *transform = impl_from_IMFTransform(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, id, flags); + TRACE("%p, %lu, %p.\n", iface, id, flags); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -431,7 +431,7 @@ static HRESULT WINAPI sample_copier_transform_SetOutputBounds(IMFTransform *ifac static HRESULT WINAPI sample_copier_transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) { - FIXME("%p, %u, %p.\n", iface, id, event); + FIXME("%p, %lu, %p.\n", iface, id, event); return E_NOTIMPL; } @@ -463,7 +463,7 @@ static HRESULT WINAPI sample_copier_transform_ProcessInput(IMFTransform *iface, struct sample_copier *transform = impl_from_IMFTransform(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, sample, flags); if (id) return MF_E_INVALIDSTREAMNUMBER; @@ -492,7 +492,7 @@ static HRESULT WINAPI sample_copier_transform_ProcessOutput(IMFTransform *iface, HRESULT hr = S_OK; LONGLONG time; - TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); + TRACE("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, buffers, status); EnterCriticalSection(&transform->cs); if (!(transform->flags & SAMPLE_COPIER_OUTPUT_TYPE_SET)) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 5e8b559af04..eae8338df7a 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -267,7 +267,7 @@ static ULONG WINAPI video_stream_sink_AddRef(IMFStreamSink *iface) struct video_stream *stream = impl_from_IMFStreamSink(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -296,7 +296,7 @@ static HRESULT WINAPI video_stream_sink_GetEvent(IMFStreamSink *iface, DWORD fla { struct video_stream *stream = impl_from_IMFStreamSink(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -325,7 +325,7 @@ static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEv { struct video_stream *stream = impl_from_IMFStreamSink(iface); - TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %ld, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -403,7 +403,7 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS hr = MF_E_NO_CLOCK; else if (FAILED(hr = IMFSample_GetSampleTime(sample, &timestamp))) { - WARN("No sample timestamp, hr %#x.\n", hr); + WARN("No sample timestamp, hr %#lx.\n", hr); } else if (stream->parent->state == EVR_STATE_RUNNING || stream->flags & EVR_STREAM_PREROLLING) { @@ -551,7 +551,7 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHan static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, IMFMediaType **type) { - TRACE("%p, %u, %p.\n", iface, index, type); + TRACE("%p, %lu, %p.\n", iface, index, type); return MF_E_NO_MORE_TYPES; } @@ -1153,7 +1153,7 @@ static ULONG WINAPI video_renderer_sink_AddRef(IMFMediaSink *iface) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedIncrement(&renderer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1162,7 +1162,7 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) struct video_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&renderer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1230,7 +1230,7 @@ static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO struct video_renderer *renderer = impl_from_IMFMediaSink(iface); HRESULT hr; - TRACE("%p, %#x, %p, %p.\n", iface, id, media_type, stream_sink); + TRACE("%p, %#lx, %p, %p.\n", iface, id, media_type, stream_sink); /* Rely on mixer for stream id validation. */ @@ -1254,7 +1254,7 @@ static HRESULT WINAPI video_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, HRESULT hr; size_t i; - TRACE("%p, %#x.\n", iface, id); + TRACE("%p, %#lx.\n", iface, id); /* Rely on mixer for stream id validation. */ @@ -1309,7 +1309,7 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa struct video_renderer *renderer = impl_from_IMFMediaSink(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, stream); + TRACE("%p, %lu, %p.\n", iface, index, stream); EnterCriticalSection(&renderer->cs); if (renderer->flags & EVR_SHUT_DOWN) @@ -1335,7 +1335,7 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, HRESULT hr = S_OK; size_t i; - TRACE("%p, %#x, %p.\n", iface, id, stream); + TRACE("%p, %#lx, %p.\n", iface, id, stream); EnterCriticalSection(&renderer->cs); if (renderer->flags & EVR_SHUT_DOWN) @@ -1747,7 +1747,7 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform_AddRef(mixer); else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) { - WARN("Failed to create default mixer object, hr %#x.\n", hr); + WARN("Failed to create default mixer object, hr %#lx.\n", hr); return hr; } @@ -1755,7 +1755,7 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFVideoPresenter_AddRef(presenter); else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) { - WARN("Failed to create default presenter, hr %#x.\n", hr); + WARN("Failed to create default presenter, hr %#lx.\n", hr); IMFTransform_Release(mixer); return hr; } @@ -1810,7 +1810,7 @@ static HRESULT WINAPI video_renderer_events_GetEvent(IMFMediaEventGenerator *ifa { struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(renderer->event_queue, flags, event); } @@ -1840,7 +1840,7 @@ static HRESULT WINAPI video_renderer_events_QueueEvent(IMFMediaEventGenerator *i { struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); - TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, event_type, ext_type, hr, value); } @@ -2143,7 +2143,7 @@ static HRESULT WINAPI video_renderer_service_lookup_LookupService(IMFTopologySer struct video_renderer *renderer = impl_from_IMFTopologyServiceLookup(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %u, %s, %s, %p, %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid), + TRACE("%p, %u, %lu, %s, %s, %p, %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid), objects, num_objects); EnterCriticalSection(&renderer->cs); @@ -2237,7 +2237,7 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L HRESULT hr = S_OK; unsigned int idx; - TRACE("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + TRACE("%p, %ld, %Id, %Id.\n", iface, event, param1, param2); EnterCriticalSection(&renderer->cs); @@ -2275,7 +2275,7 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L } else { - WARN("Unhandled event %d.\n", event); + WARN("Unhandled event %ld.\n", event); hr = MF_E_UNEXPECTED; } diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 50451170275..6b1d9293c8a 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -73,7 +73,7 @@ static ULONG WINAPI activate_object_AddRef(IMFActivate *iface) struct activate_object *activate = impl_from_IMFActivate(iface); ULONG refcount = InterlockedIncrement(&activate->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -83,7 +83,7 @@ static ULONG WINAPI activate_object_Release(IMFActivate *iface) struct activate_object *activate = impl_from_IMFActivate(iface); ULONG refcount = InterlockedDecrement(&activate->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -597,7 +597,7 @@ static ULONG WINAPI file_scheme_handler_AddRef(IMFSchemeHandler *iface) struct file_scheme_handler *handler = impl_from_IMFSchemeHandler(iface); ULONG refcount = InterlockedIncrement(&handler->refcount); - TRACE("%p, refcount %u.\n", handler, refcount); + TRACE("%p, refcount %lu.\n", handler, refcount); return refcount; } @@ -608,7 +608,7 @@ static ULONG WINAPI file_scheme_handler_Release(IMFSchemeHandler *iface) ULONG refcount = InterlockedDecrement(&handler->refcount); struct file_scheme_handler_result *result, *next; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -665,7 +665,7 @@ static ULONG WINAPI create_object_context_AddRef(IUnknown *iface) struct create_object_context *context = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&context->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -675,7 +675,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) struct create_object_context *context = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&context->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -703,7 +703,7 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if IMFAsyncResult *caller, *item; HRESULT hr; - TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); if (cancel_cookie) *cancel_cookie = NULL; @@ -1238,7 +1238,7 @@ static ULONG WINAPI simple_type_handler_AddRef(IMFMediaTypeHandler *iface) struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); ULONG refcount = InterlockedIncrement(&handler->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1248,7 +1248,7 @@ static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface) struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); ULONG refcount = InterlockedDecrement(&handler->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1304,7 +1304,7 @@ static HRESULT WINAPI simple_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandle { struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); - TRACE("%p, %u, %p.\n", iface, index, type); + TRACE("%p, %lu, %p.\n", iface, index, type); if (index > 0) return MF_E_NO_MORE_TYPES; diff --git a/dlls/mf/quality.c b/dlls/mf/quality.c index 6c71a5a71c6..a611d6fdaed 100644 --- a/dlls/mf/quality.c +++ b/dlls/mf/quality.c @@ -86,7 +86,7 @@ static ULONG WINAPI standard_quality_manager_AddRef(IMFQualityManager *iface) struct quality_manager *manager = impl_from_IMFQualityManager(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -96,7 +96,7 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) struct quality_manager *manager = impl_from_IMFQualityManager(iface); ULONG refcount = InterlockedDecrement(&manager->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -178,7 +178,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualit static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, LONG input_index, IMFSample *sample) { - TRACE("%p, %p, %d, %p stub.\n", iface, node, input_index, sample); + TRACE("%p, %p, %ld, %p stub.\n", iface, node, input_index, sample); return E_NOTIMPL; } @@ -186,7 +186,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityMana static HRESULT WINAPI standard_quality_manager_NotifyProcessOutput(IMFQualityManager *iface, IMFTopologyNode *node, LONG output_index, IMFSample *sample) { - TRACE("%p, %p, %d, %p stub.\n", iface, node, output_index, sample); + TRACE("%p, %p, %ld, %p stub.\n", iface, node, output_index, sample); return E_NOTIMPL; } diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e7d3be68df3..f711f6d8c44 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -206,7 +206,7 @@ static HRESULT WINAPI sample_grabber_stream_GetEvent(IMFStreamSink *iface, DWORD { struct sample_grabber *grabber = impl_from_IMFStreamSink(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; @@ -245,7 +245,7 @@ static HRESULT WINAPI sample_grabber_stream_QueueEvent(IMFStreamSink *iface, Med { struct sample_grabber *grabber = impl_from_IMFStreamSink(iface); - TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; @@ -614,7 +614,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMe static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, IMFMediaType **media_type) { - TRACE("%p, %u, %p.\n", iface, index, media_type); + TRACE("%p, %lu, %p.\n", iface, index, media_type); if (!media_type) return E_POINTER; @@ -741,14 +741,14 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba if (!sample_reported) { if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) - WARN("Failed to report a sample, hr %#x.\n", hr); + WARN("Failed to report a sample, hr %#lx.\n", hr); stream_release_pending_item(item); sample_reported = TRUE; } else { if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); + WARN("Failed to schedule a sample, hr %#lx.\n", hr); break; } } @@ -814,7 +814,7 @@ static ULONG WINAPI sample_grabber_sink_AddRef(IMFMediaSink *iface) struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedIncrement(&grabber->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -834,7 +834,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&grabber->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -888,7 +888,7 @@ static HRESULT WINAPI sample_grabber_sink_AddStreamSink(IMFMediaSink *iface, DWO { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); - TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); + TRACE("%p, %#lx, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); return grabber->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } @@ -897,7 +897,7 @@ static HRESULT WINAPI sample_grabber_sink_RemoveStreamSink(IMFMediaSink *iface, { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); - TRACE("%p, %#x.\n", iface, stream_sink_id); + TRACE("%p, %#lx.\n", iface, stream_sink_id); return grabber->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } @@ -922,7 +922,7 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkByIndex(IMFMediaSink *ifa struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, stream); + TRACE("%p, %lu, %p.\n", iface, index, stream); if (grabber->is_shut_down) return MF_E_SHUTDOWN; @@ -950,7 +950,7 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface, struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); HRESULT hr = S_OK; - TRACE("%p, %#x, %p.\n", iface, stream_sink_id, stream); + TRACE("%p, %#lx, %p.\n", iface, stream_sink_id, stream); EnterCriticalSection(&grabber->cs); @@ -1233,7 +1233,7 @@ static HRESULT WINAPI sample_grabber_events_GetEvent(IMFMediaEventGenerator *ifa { struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(grabber->event_queue, flags, event); } @@ -1263,7 +1263,7 @@ static HRESULT WINAPI sample_grabber_events_QueueEvent(IMFMediaEventGenerator *i { struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); - TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(grabber->event_queue, event_type, ext_type, hr, value); } diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 3c9bac90c9f..33040be3ed0 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -223,7 +223,7 @@ static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedIncrement(&renderer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -262,7 +262,7 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&renderer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -306,7 +306,7 @@ static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); + TRACE("%p, %#lx, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } @@ -315,7 +315,7 @@ static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - TRACE("%p, %#x.\n", iface, stream_sink_id); + TRACE("%p, %#lx.\n", iface, stream_sink_id); return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } @@ -343,7 +343,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, stream); + TRACE("%p, %lu, %p.\n", iface, index, stream); EnterCriticalSection(&renderer->cs); @@ -368,7 +368,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); HRESULT hr = S_OK; - TRACE("%p, %#x, %p.\n", iface, stream_sink_id, stream); + TRACE("%p, %#lx, %p.\n", iface, stream_sink_id, stream); EnterCriticalSection(&renderer->cs); @@ -557,7 +557,7 @@ static HRESULT WINAPI audio_renderer_events_GetEvent(IMFMediaEventGenerator *ifa { struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(renderer->event_queue, flags, event); } @@ -587,7 +587,7 @@ static HRESULT WINAPI audio_renderer_events_QueueEvent(IMFMediaEventGenerator *i { struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); - TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, event_type, ext_type, hr, value); } @@ -634,7 +634,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink * if (renderer->state == STREAM_STATE_STOPPED) { if (FAILED(hr = IAudioClient_Start(renderer->audio_client))) - WARN("Failed to start audio client, hr %#x.\n", hr); + WARN("Failed to start audio client, hr %#lx.\n", hr); renderer->state = STREAM_STATE_RUNNING; } } @@ -664,10 +664,10 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStop(IMFClockStateSink *i if (SUCCEEDED(hr = IAudioClient_Stop(renderer->audio_client))) { if (FAILED(hr = IAudioClient_Reset(renderer->audio_client))) - WARN("Failed to reset audio client, hr %#x.\n", hr); + WARN("Failed to reset audio client, hr %#lx.\n", hr); } else - WARN("Failed to stop audio client, hr %#x.\n", hr); + WARN("Failed to stop audio client, hr %#lx.\n", hr); renderer->state = STREAM_STATE_STOPPED; renderer->flags &= ~SAR_PREROLLED; } @@ -694,7 +694,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockPause(IMFClockStateSink * if (renderer->audio_client) { if (FAILED(hr = IAudioClient_Stop(renderer->audio_client))) - WARN("Failed to stop audio client, hr %#x.\n", hr); + WARN("Failed to stop audio client, hr %#lx.\n", hr); renderer->state = STREAM_STATE_PAUSED; } else @@ -723,7 +723,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink if ((preroll = (renderer->state != STREAM_STATE_RUNNING))) { if (FAILED(hr = IAudioClient_Start(renderer->audio_client))) - WARN("Failed to start audio client, hr %#x.\n", hr); + WARN("Failed to start audio client, hr %#lx.\n", hr); renderer->state = STREAM_STATE_RUNNING; } } @@ -1236,7 +1236,7 @@ static HRESULT WINAPI audio_renderer_stream_GetEvent(IMFStreamSink *iface, DWORD { struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; @@ -1275,7 +1275,7 @@ static HRESULT WINAPI audio_renderer_stream_QueueEvent(IMFStreamSink *iface, Med { struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); - TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; @@ -1519,7 +1519,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMF { struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); - TRACE("%p, %u, %p.\n", iface, index, media_type); + TRACE("%p, %lu, %p.\n", iface, index, media_type); if (index == 0) { @@ -1543,14 +1543,14 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere (void **)&renderer->audio_client); if (FAILED(hr)) { - WARN("Failed to create audio client, hr %#x.\n", hr); + WARN("Failed to create audio client, hr %#lx.\n", hr); return hr; } /* FIXME: for now always use default format. */ if (FAILED(hr = IAudioClient_GetMixFormat(renderer->audio_client, &wfx))) { - WARN("Failed to get audio format, hr %#x.\n", hr); + WARN("Failed to get audio format, hr %#lx.\n", hr); return hr; } @@ -1566,46 +1566,46 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere CoTaskMemFree(wfx); if (FAILED(hr)) { - WARN("Failed to initialize audio client, hr %#x.\n", hr); + WARN("Failed to initialize audio client, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IAudioClient_GetService(renderer->audio_client, &IID_IAudioStreamVolume, (void **)&renderer->stream_volume))) { - WARN("Failed to get stream volume control, hr %#x.\n", hr); + WARN("Failed to get stream volume control, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IAudioClient_GetService(renderer->audio_client, &IID_ISimpleAudioVolume, (void **)&renderer->audio_volume))) { - WARN("Failed to get audio volume control, hr %#x.\n", hr); + WARN("Failed to get audio volume control, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IAudioClient_GetService(renderer->audio_client, &IID_IAudioRenderClient, (void **)&renderer->audio_render_client))) { - WARN("Failed to get audio render client, hr %#x.\n", hr); + WARN("Failed to get audio render client, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IAudioClient_SetEventHandle(renderer->audio_client, renderer->buffer_ready_event))) { - WARN("Failed to set event handle, hr %#x.\n", hr); + WARN("Failed to set event handle, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IAudioClient_GetBufferSize(renderer->audio_client, &renderer->max_frames))) { - WARN("Failed to get buffer size, hr %#x.\n", hr); + WARN("Failed to get buffer size, hr %#lx.\n", hr); return hr; } if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, &renderer->render_callback, NULL, &result))) { if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) - WARN("Failed to submit wait item, hr %#x.\n", hr); + WARN("Failed to submit wait item, hr %#lx.\n", hr); IMFAsyncResult_Release(result); } @@ -1714,7 +1714,7 @@ static HRESULT audio_renderer_collect_supported_types(struct audio_renderer *ren hr = IMMDevice_Activate(renderer->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&client); if (FAILED(hr)) { - WARN("Failed to create audio client, hr %#x.\n", hr); + WARN("Failed to create audio client, hr %#lx.\n", hr); return hr; } @@ -1724,7 +1724,7 @@ static HRESULT audio_renderer_collect_supported_types(struct audio_renderer *ren IAudioClient_Release(client); if (FAILED(hr)) { - WARN("Failed to get device audio format, hr %#x.\n", hr); + WARN("Failed to get device audio format, hr %#lx.\n", hr); return hr; } @@ -1732,7 +1732,7 @@ static HRESULT audio_renderer_collect_supported_types(struct audio_renderer *ren CoTaskMemFree(format); if (FAILED(hr)) { - WARN("Failed to initialize media type, hr %#x.\n", hr); + WARN("Failed to initialize media type, hr %#lx.\n", hr); return hr; } @@ -1843,7 +1843,7 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul } if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) - WARN("Failed to submit wait item, hr %#x.\n", hr); + WARN("Failed to submit wait item, hr %#lx.\n", hr); } static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e6c21332d20..05b7af81df7 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -338,7 +338,7 @@ static HRESULT WINAPI local_mft_registration_RegisterMFTs(IMFLocalMFTRegistratio HRESULT hr = S_OK; DWORD i; - TRACE("%p, %p, %u.\n", iface, info, count); + TRACE("%p, %p, %lu.\n", iface, info, count); for (i = 0; i < count; ++i) { @@ -380,7 +380,7 @@ static ULONG WINAPI session_op_AddRef(IUnknown *iface) struct session_op *op = impl_op_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&op->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -390,7 +390,7 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) struct session_op *op = impl_op_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&op->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -701,7 +701,7 @@ static void session_shutdown_current_topology(struct media_session *session) (void **)&activate))) { if (FAILED(hr = IMFActivate_ShutdownObject(activate))) - WARN("Failed to shut down activation object for the sink, hr %#x.\n", hr); + WARN("Failed to shut down activation object for the sink, hr %#lx.\n", hr); IMFActivate_Release(activate); } else if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) @@ -843,12 +843,12 @@ static void session_start(struct media_session *session, const GUID *time_format if (FAILED(hr = IMFMediaSource_BeginGetEvent(source->source, &session->events_callback, source->object))) { - WARN("Failed to subscribe to source events, hr %#x.\n", hr); + WARN("Failed to subscribe to source events, hr %#lx.\n", hr); } } if (FAILED(hr = IMFMediaSource_Start(source->source, source->pd, &GUID_NULL, start_position))) - WARN("Failed to start media source %p, hr %#x.\n", source->source, hr); + WARN("Failed to start media source %p, hr %#lx.\n", source->source, hr); } session->presentation.flags |= SESSION_FLAG_SOURCES_SUBSCRIBED; @@ -1335,7 +1335,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (FAILED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&topo_node->object.object))) { - WARN("Failed to get stream sink interface, hr %#x.\n", hr); + WARN("Failed to get stream sink interface, hr %#lx.\n", hr); break; } @@ -1352,7 +1352,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (FAILED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, 2, media_type))) { - WARN("Failed to initialize sample allocator for the stream, hr %#x.\n", hr); + WARN("Failed to initialize sample allocator for the stream, hr %#lx.\n", hr); } IMFVideoSampleAllocator_QueryInterface(topo_node->u.sink.allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&topo_node->u.sink.allocator_cb); @@ -1369,7 +1369,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (FAILED(IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_SOURCE, &IID_IMFMediaSource, (void **)&topo_node->u.source.source))) { - WARN("Missing MF_TOPONODE_SOURCE, hr %#x.\n", hr); + WARN("Missing MF_TOPONODE_SOURCE, hr %#lx.\n", hr); break; } @@ -1379,7 +1379,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, (void **)&sd))) { - WARN("Missing MF_TOPONODE_STREAM_DESCRIPTOR, hr %#x.\n", hr); + WARN("Missing MF_TOPONODE_STREAM_DESCRIPTOR, hr %#lx.\n", hr); break; } @@ -1394,7 +1394,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod hr = session_set_transform_stream_info(topo_node); } else - WARN("Failed to get IMFTransform for MFT node, hr %#x.\n", hr); + WARN("Failed to get IMFTransform for MFT node, hr %#lx.\n", hr); break; case MF_TOPOLOGY_TEE_NODE: @@ -1469,7 +1469,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo if (FAILED(hr = IMFTopology_CloneFrom(session->presentation.current_topology, topology))) { - WARN("Failed to clone topology, hr %#x.\n", hr); + WARN("Failed to clone topology, hr %#lx.\n", hr); return hr; } @@ -1647,7 +1647,7 @@ static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); ULONG refcount = InterlockedIncrement(&session->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1657,7 +1657,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); ULONG refcount = InterlockedDecrement(&session->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1689,7 +1689,7 @@ static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IM { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(session->event_queue, flags, event); } @@ -1717,7 +1717,7 @@ static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventTyp { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %ld, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, ext_type, hr, value); } @@ -1729,7 +1729,7 @@ static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, WORD node_count = 0; HRESULT hr; - TRACE("%p, %#x, %p.\n", iface, flags, topology); + TRACE("%p, %#lx, %p.\n", iface, flags, topology); if (topology) { @@ -1879,7 +1879,7 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl TOPOID topo_id; HRESULT hr; - TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); + TRACE("%p, %#lx, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); *topology = NULL; @@ -1998,7 +1998,7 @@ static HRESULT session_get_renderer_node_service(struct media_session *session, if (node_test_func(sink)) { if (FAILED(hr = MFGetService((IUnknown *)sink, service, riid, obj))) - WARN("Failed to get service from renderer node, %#x.\n", hr); + WARN("Failed to get service from renderer node, %#lx.\n", hr); } } IMFStreamSink_Release(stream_sink); @@ -2358,7 +2358,7 @@ static void session_set_presentation_clock(struct media_session *session) hr = IMFPresentationClock_SetTimeSource(session->clock, session->system_time_source); if (FAILED(hr)) - WARN("Failed to set time source, hr %#x.\n", hr); + WARN("Failed to set time source, hr %#lx.\n", hr); LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) { @@ -2368,7 +2368,7 @@ static void session_set_presentation_clock(struct media_session *session) if (FAILED(hr = IMFStreamSink_BeginGetEvent(node->object.sink_stream, &session->events_callback, node->object.object))) { - WARN("Failed to subscribe to stream sink events, hr %#x.\n", hr); + WARN("Failed to subscribe to stream sink events, hr %#lx.\n", hr); } } @@ -2383,11 +2383,11 @@ static void session_set_presentation_clock(struct media_session *session) if (sink->event_generator && FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(sink->event_generator, &session->events_callback, (IUnknown *)sink->event_generator))) { - WARN("Failed to subscribe to sink events, hr %#x.\n", hr); + WARN("Failed to subscribe to sink events, hr %#lx.\n", hr); } if (FAILED(hr = IMFMediaSink_SetPresentationClock(sink->sink, session->clock))) - WARN("Failed to set presentation clock for the sink, hr %#x.\n", hr); + WARN("Failed to set presentation clock for the sink, hr %#lx.\n", hr); } LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) @@ -2420,7 +2420,7 @@ static HRESULT session_start_clock(struct media_session *session) FIXME("Unhandled time format %s.\n", debugstr_guid(&session->presentation.time_format)); if (FAILED(hr = IMFPresentationClock_Start(session->clock, start_offset))) - WARN("Failed to start session clock, hr %#x.\n", hr); + WARN("Failed to start session clock, hr %#lx.\n", hr); return hr; } @@ -2521,7 +2521,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn { /* FIXME: abort and enter error state on failure. */ if (FAILED(hr = IMFMediaSinkPreroll_NotifyPreroll(sink->preroll, preroll_time))) - WARN("Preroll notification failed, hr %#x.\n", hr); + WARN("Preroll notification failed, hr %#lx.\n", hr); } else { @@ -2795,14 +2795,14 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop if (topo_node->u.sink.requests) { if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample))) - WARN("Stream sink failed to process sample, hr %#x.\n", hr); + WARN("Stream sink failed to process sample, hr %#lx.\n", hr); topo_node->u.sink.requests--; } } else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, NULL, NULL))) { - WARN("Failed to place sink marker, hr %#x.\n", hr); + WARN("Failed to place sink marker, hr %#lx.\n", hr); } break; case MF_TOPOLOGY_TRANSFORM_NODE: @@ -2824,7 +2824,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop sample_entry->sample, 0)) == MF_E_NOTACCEPTING) break; if (FAILED(hr)) - WARN("Failed to process input for stream %u/%u, hr %#x.\n", i, stream_id, hr); + WARN("Failed to process input for stream %u/%lu, hr %#lx.\n", i, stream_id, hr); transform_release_sample(sample_entry); } else @@ -2838,7 +2838,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop if (drain) { if (FAILED(hr = IMFTransform_ProcessMessage(topo_node->object.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) - WARN("Drain command failed for transform, hr %#x.\n", hr); + WARN("Drain command failed for transform, hr %#lx.\n", hr); } transform_node_pull_samples(session, topo_node); @@ -2905,7 +2905,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I { case MF_TOPOLOGY_SOURCESTREAM_NODE: if (FAILED(hr = IMFMediaStream_RequestSample(topo_node->object.source_stream, NULL))) - WARN("Sample request failed, hr %#x.\n", hr); + WARN("Sample request failed, hr %#lx.\n", hr); break; case MF_TOPOLOGY_TRANSFORM_NODE: @@ -2961,7 +2961,7 @@ static void session_request_sample(struct media_session *session, IMFStreamSink if (FAILED(hr = IMFTopologyNode_GetInput(sink_node->node, 0, &upstream_node, &upstream_output))) { - WARN("Failed to get upstream node connection, hr %#x.\n", hr); + WARN("Failed to get upstream node connection, hr %#lx.\n", hr); return; } @@ -3000,7 +3000,7 @@ static void session_deliver_sample(struct media_session *session, IMFMediaStream if (FAILED(hr = IMFTopologyNode_GetOutput(source_node->node, 0, &downstream_node, &downstream_input))) { - WARN("Failed to get downstream node connection, hr %#x.\n", hr); + WARN("Failed to get downstream node connection, hr %#lx.\n", hr); return; } @@ -3028,7 +3028,7 @@ static void session_sink_invalidated(struct media_session *session, IMFMediaEven if (!event) { if (FAILED(hr = MFCreateMediaEvent(MESinkInvalidated, &GUID_NULL, S_OK, NULL, &event))) - WARN("Failed to create event, hr %#x.\n", hr); + WARN("Failed to create event, hr %#lx.\n", hr); } if (!event) @@ -3153,20 +3153,20 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM if (FAILED(hr = IMFMediaEventGenerator_EndGetEvent(event_source, result, &event))) { - WARN("Failed to get event from %p, hr %#x.\n", event_source, hr); + WARN("Failed to get event from %p, hr %#lx.\n", event_source, hr); goto failed; } if (FAILED(hr = IMFMediaEvent_GetType(event, &event_type))) { - WARN("Failed to get event type, hr %#x.\n", hr); + WARN("Failed to get event type, hr %#lx.\n", hr); goto failed; } value.vt = VT_EMPTY; if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) { - WARN("Failed to get event value, hr %#x.\n", hr); + WARN("Failed to get event value, hr %#lx.\n", hr); goto failed; } @@ -3333,7 +3333,7 @@ failed: IMFMediaEvent_Release(event); if (FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(event_source, iface, (IUnknown *)event_source))) - WARN("Failed to re-subscribe, hr %#x.\n", hr); + WARN("Failed to re-subscribe, hr %#lx.\n", hr); IMFMediaEventGenerator_Release(event_source); @@ -3400,7 +3400,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i if (state == sink->object) { if (FAILED(hr = IMFMediaSink_QueryInterface(sink->sink, &IID_IMFFinalizableMediaSink, (void **)&fin_sink))) - WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#x.\n", hr); + WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#lx.\n", hr); } else { @@ -3564,7 +3564,7 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess value = rate; if (FAILED(hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, &value))) - WARN("Source does not support rate %f, hr %#x.\n", rate, hr); + WARN("Source does not support rate %f, hr %#lx.\n", rate, hr); IMFRateSupport_Release(rate_support); /* Only "first" source is considered. */ @@ -3591,7 +3591,7 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess IMFRateSupport_Release(rate_support); if (FAILED(hr)) { - WARN("Sink %p does not support rate %f, hr %#x.\n", sink->sink, rate, hr); + WARN("Sink %p does not support rate %f, hr %#lx.\n", sink->sink, rate, hr); break; } } @@ -3721,7 +3721,7 @@ static ULONG WINAPI node_attribute_editor_Release(IMFTopologyNodeAttributeEditor static HRESULT WINAPI node_attribute_editor_UpdateNodeAttributes(IMFTopologyNodeAttributeEditor *iface, TOPOID id, DWORD count, MFTOPONODE_ATTRIBUTE_UPDATE *updates) { - FIXME("%p, %s, %u, %p.\n", iface, wine_dbgstr_longlong(id), count, updates); + FIXME("%p, %s, %lu, %p.\n", iface, wine_dbgstr_longlong(id), count, updates); return E_NOTIMPL; } @@ -3791,7 +3791,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTopoLoader, (void **)&object->topo_loader))) { - WARN("Failed to create custom topology loader, hr %#x.\n", hr); + WARN("Failed to create custom topology loader, hr %#lx.\n", hr); } } @@ -3802,7 +3802,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFQualityManager, (void **)&object->quality_manager))) { - WARN("Failed to create custom quality manager, hr %#x.\n", hr); + WARN("Failed to create custom quality manager, hr %#lx.\n", hr); } } } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8eb1b763e64..ff90bc2c8af 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -174,7 +174,7 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface) struct topology *topology = impl_from_IMFTopology(iface); ULONG refcount = InterlockedIncrement(&topology->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -267,7 +267,7 @@ static ULONG WINAPI topology_Release(IMFTopology *iface) struct topology *topology = impl_from_IMFTopology(iface); ULONG refcount = InterlockedDecrement(&topology->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -702,7 +702,7 @@ static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src) { if (FAILED(hr = create_topology_node(src_topology->nodes.nodes[i]->node_type, &node))) { - WARN("Failed to create a node, hr %#x.\n", hr); + WARN("Failed to create a node, hr %#lx.\n", hr); break; } @@ -931,7 +931,7 @@ static ULONG WINAPI topology_node_AddRef(IMFTopologyNode *iface) struct topology_node *node = impl_from_IMFTopologyNode(iface); ULONG refcount = InterlockedIncrement(&node->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -942,7 +942,7 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) ULONG refcount = InterlockedDecrement(&node->refcount); unsigned int i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1441,7 +1441,7 @@ static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD struct topology_node *node = impl_from_IMFTopologyNode(iface); struct topology_node *connection = unsafe_impl_from_IMFTopologyNode(peer); - TRACE("%p, %u, %p, %u.\n", iface, output_index, peer, input_index); + TRACE("%p, %lu, %p, %lu.\n", iface, output_index, peer, input_index); if (!connection) { @@ -1456,7 +1456,7 @@ static HRESULT WINAPI topology_node_DisconnectOutput(IMFTopologyNode *iface, DWO { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("%p, %u.\n", iface, output_index); + TRACE("%p, %lu.\n", iface, output_index); return topology_node_disconnect_output(node, output_index); } @@ -1467,7 +1467,7 @@ static HRESULT WINAPI topology_node_GetInput(IMFTopologyNode *iface, DWORD input struct topology_node *node = impl_from_IMFTopologyNode(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p, %p.\n", iface, input_index, ret, output_index); + TRACE("%p, %lu, %p, %p.\n", iface, input_index, ret, output_index); EnterCriticalSection(&node->cs); @@ -1498,7 +1498,7 @@ static HRESULT WINAPI topology_node_GetOutput(IMFTopologyNode *iface, DWORD outp struct topology_node *node = impl_from_IMFTopologyNode(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p, %p.\n", iface, output_index, ret, input_index); + TRACE("%p, %lu, %p, %p.\n", iface, output_index, ret, input_index); EnterCriticalSection(&node->cs); @@ -1528,7 +1528,7 @@ static HRESULT WINAPI topology_node_SetOutputPrefType(IMFTopologyNode *iface, DW struct topology_node *node = impl_from_IMFTopologyNode(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, mediatype); + TRACE("%p, %lu, %p.\n", iface, index, mediatype); EnterCriticalSection(&node->cs); @@ -1562,7 +1562,7 @@ static HRESULT WINAPI topology_node_GetOutputPrefType(IMFTopologyNode *iface, DW struct topology_node *node = impl_from_IMFTopologyNode(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, mediatype); + TRACE("%p, %lu, %p.\n", iface, index, mediatype); EnterCriticalSection(&node->cs); @@ -1581,7 +1581,7 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO struct topology_node *node = impl_from_IMFTopologyNode(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, mediatype); + TRACE("%p, %lu, %p.\n", iface, index, mediatype); EnterCriticalSection(&node->cs); @@ -1622,7 +1622,7 @@ static HRESULT WINAPI topology_node_GetInputPrefType(IMFTopologyNode *iface, DWO struct topology_node *node = impl_from_IMFTopologyNode(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, mediatype); + TRACE("%p, %lu, %p.\n", iface, index, mediatype); EnterCriticalSection(&node->cs); @@ -1833,7 +1833,7 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO UINT32 primary_output; HRESULT hr; - TRACE("%p, %u, %d, %p.\n", node, stream, output, type); + TRACE("%p, %lu, %d, %p.\n", node, stream, output, type); if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) return hr; @@ -1916,7 +1916,7 @@ static ULONG WINAPI topology_loader_AddRef(IMFTopoLoader *iface) struct topology_loader *loader = impl_from_IMFTopoLoader(iface); ULONG refcount = InterlockedIncrement(&loader->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1926,7 +1926,7 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) struct topology_loader *loader = impl_from_IMFTopoLoader(iface); ULONG refcount = InterlockedDecrement(&loader->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) free(loader); @@ -2456,16 +2456,16 @@ static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, DWO return hr; if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &input_type))) - WARN("Failed to get upstream media type hr %#x.\n", hr); + WARN("Failed to get upstream media type hr %#lx.\n", hr); if (SUCCEEDED(hr) && FAILED(hr = MFGetTopoNodeCurrentType(downstream_node, downstream_input, FALSE, &output_type))) - WARN("Failed to get downstream media type hr %#x.\n", hr); + WARN("Failed to get downstream media type hr %#lx.\n", hr); if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) - WARN("Input type wasn't accepted, hr %#x.\n", hr); + WARN("Input type wasn't accepted, hr %#lx.\n", hr); if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0))) - WARN("Output type wasn't accepted, hr %#x.\n", hr); + WARN("Output type wasn't accepted, hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -2558,7 +2558,7 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); if (FAILED(hr = topology_loader_connect_d3d_aware_input(context, node))) - WARN("Failed to connect D3D-aware input, hr %#x.\n", hr); + WARN("Failed to connect D3D-aware input, hr %#lx.\n", hr); } else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) { @@ -2642,7 +2642,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) { if (FAILED(hr = topology_loader_clone_node(&context, node, NULL, 0))) - WARN("Failed to clone source node, hr %#x.\n", hr); + WARN("Failed to clone source node, hr %#lx.\n", hr); } IMFTopologyNode_Release(node); @@ -2652,7 +2652,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in { if (FAILED(hr = topology_loader_resolve_nodes(&context, &layer_size))) { - WARN("Failed to resolve for marker %u, hr %#x.\n", context.marker, hr); + WARN("Failed to resolve for marker %u, hr %#lx.\n", context.marker, hr); break; } @@ -2734,7 +2734,7 @@ static ULONG WINAPI seq_source_AddRef(IMFSequencerSource *iface) struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); ULONG refcount = InterlockedIncrement(&seq_source->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -2744,7 +2744,7 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); ULONG refcount = InterlockedDecrement(&seq_source->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) free(seq_source); @@ -2755,14 +2755,14 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) static HRESULT WINAPI seq_source_AppendTopology(IMFSequencerSource *iface, IMFTopology *topology, DWORD flags, MFSequencerElementId *id) { - FIXME("%p, %p, %x, %p.\n", iface, topology, flags, id); + FIXME("%p, %p, %lx, %p.\n", iface, topology, flags, id); return E_NOTIMPL; } static HRESULT WINAPI seq_source_DeleteTopology(IMFSequencerSource *iface, MFSequencerElementId id) { - FIXME("%p, %#x.\n", iface, id); + FIXME("%p, %#lx.\n", iface, id); return E_NOTIMPL; } @@ -2778,14 +2778,14 @@ static HRESULT WINAPI seq_source_GetPresentationContext(IMFSequencerSource *ifac static HRESULT WINAPI seq_source_UpdateTopology(IMFSequencerSource *iface, MFSequencerElementId id, IMFTopology *topology) { - FIXME("%p, %#x, %p.\n", iface, id, topology); + FIXME("%p, %#lx, %p.\n", iface, id, topology); return E_NOTIMPL; } static HRESULT WINAPI seq_source_UpdateTopologyFlags(IMFSequencerSource *iface, MFSequencerElementId id, DWORD flags) { - FIXME("%p, %#x, %#x.\n", iface, id, flags); + FIXME("%p, %#lx, %#lx.\n", iface, id, flags); return E_NOTIMPL; } -- 2.34.1

1 0

[PATCH v2] kernelbase: Implement SetCurrentConsoleFontEx
by Hugh McMaster 09 Feb '22

09 Feb '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in this version: - Move struct condrv_output_info_params_font to SetCurrentConsoleFontEx as anonymous struct. - ioctl size only contains meaningful bytes. - Calculate face_name string size in conhost. - Manage invalid font height, weight and face name parameters. dlls/kernel32/console.c | 7 ------ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 40 ++++++++++++++++----------------- dlls/kernelbase/console.c | 40 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 1 + programs/conhost/conhost.c | 25 ++++++++++++++++++--- programs/conhost/conhost.h | 14 +++++++----- programs/conhost/window.c | 27 +++++++++++++--------- 9 files changed, 111 insertions(+), 46 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 80f3419cd7a..58bd18d2a5f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -480,10 +480,3 @@ BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, C SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } - -BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) -{ - FIXME("(%p %d %p): stub!\n", hConsole, maxwindow, cfix); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 87fa0c39381..6e063bfaa7b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1390,7 +1390,7 @@ @ stdcall -import SetConsoleTitleW(wstr) @ stdcall -import SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) NTDLL.RtlSetCriticalSectionSpinCount -@ stdcall SetCurrentConsoleFontEx(long long ptr) +@ stdcall -import SetCurrentConsoleFontEx(long long ptr) @ stdcall -import SetCurrentDirectoryA(str) @ stdcall -import SetCurrentDirectoryW(wstr) @ stub SetDaylightFlag diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..5443a611f80 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3576,18 +3576,18 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CreatePipe(&pipe1, &pipe2, NULL, 0); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3595,47 +3595,47 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); cfix = orig_cfix; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CreatePipe(&pipe1, &pipe2, NULL, 0); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3643,35 +3643,35 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } static void test_GetConsoleFontSize(HANDLE std_output) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a7eeb439232..5f64fc90fa3 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1303,6 +1303,46 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute } +/****************************************************************************** + * SetCurrentConsoleFontEx (kernelbase.@) + */ +BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) +{ + struct + { + struct condrv_output_info_params params; + WCHAR face_name[LF_FACESIZE]; + } data; + + WCHAR *p = cfix->FaceName; + int len = 0; + DWORD size; + + TRACE( "(%p %d %p)\n", hConsole, maxwindow, cfix ); + + if (cfix->cbSize != sizeof(CONSOLE_FONT_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + data.params.mask = SET_CONSOLE_OUTPUT_INFO_FONT; + + data.params.info.font_width = cfix->dwFontSize.X; + data.params.info.font_height = cfix->dwFontSize.Y; + data.params.info.font_pitch_family = cfix->FontFamily; + data.params.info.font_weight = cfix->FontWeight; + + while (*p && len < LF_FACESIZE) { p++; len++; } + size = len * sizeof(WCHAR); + + memcpy( data.face_name, cfix->FaceName, size ); + size += sizeof(struct condrv_output_info_params); + + return console_ioctl( hConsole, IOCTL_CONDRV_SET_OUTPUT_INFO, &data, size, NULL, 0, NULL ); +} + + /*********************************************************************** * ReadConsoleInputA (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 01135d6250a..91c4909e006 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,6 +1422,7 @@ @ stdcall SetConsoleTitleW(wstr) @ stdcall SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount +@ stdcall SetCurrentConsoleFontEx(long long ptr) @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) @ stdcall SetDefaultDllDirectories(long) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 4d2332a1ee9..b5e294b9401 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -155,6 +155,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 #define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0080 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 2b137c40fb0..77b6c222621 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1830,7 +1830,7 @@ NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new } static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, - const struct condrv_output_info_params *params ) + const struct condrv_output_info_params *params, size_t in_size ) { const struct condrv_output_info *info = &params->info; NTSTATUS status; @@ -1917,6 +1917,24 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + WCHAR *face_name = (WCHAR *)(params + 1); + size_t face_name_size = in_size - sizeof(*params); + unsigned int height = info->font_height; + unsigned int weight = FW_NORMAL; + + if (!*face_name) + { + face_name = screen_buffer->font.face_name; + face_name_size = screen_buffer->font.face_len * sizeof(WCHAR); + } + + if (!height) height = 12; + if (info->font_weight >= FW_SEMIBOLD) weight = FW_BOLD; + + update_console_font( screen_buffer->console, face_name, face_name_size, height, weight ); + } if (is_active( screen_buffer )) { @@ -2429,8 +2447,9 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return get_output_info( screen_buffer, out_size ); case IOCTL_CONDRV_SET_OUTPUT_INFO: - if (in_size != sizeof(struct condrv_output_info_params) || *out_size) return STATUS_INVALID_PARAMETER; - return set_output_info( screen_buffer, in_data ); + if (in_size < sizeof(struct condrv_output_info_params) || *out_size) + return STATUS_INVALID_PARAMETER; + return set_output_info( screen_buffer, in_data, in_size ); case IOCTL_CONDRV_FILL_OUTPUT: if (in_size != sizeof(struct condrv_fill_output_params) || *out_size != sizeof(DWORD)) diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 5e9b999380c..3cbd2ed2d80 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -130,17 +130,21 @@ struct screen_buffer struct wine_rb_entry entry; /* map entry */ }; -BOOL init_window( struct console *console ); -void init_message_window( struct console *console ); -void update_window_region( struct console *console, const RECT *update ); -void update_window_config( struct console *console, BOOL delay ); - +/* conhost.c */ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); +/* window.c */ +void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, + unsigned int height, unsigned int weight ); +BOOL init_window( struct console *console ); +void init_message_window( struct console *console ); +void update_window_region( struct console *console, const RECT *update ); +void update_window_config( struct console *console, BOOL delay ); + static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) { SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index db04ba120e4..b88b95c41ce 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -652,7 +652,8 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, return font; } -static void fill_logfont( LOGFONTW *lf, const WCHAR *name, unsigned int height, unsigned int weight ) +static void fill_logfont( LOGFONTW *lf, const WCHAR *face_name, size_t face_name_size, + unsigned int height, unsigned int weight ) { lf->lfHeight = height; lf->lfWidth = 0; @@ -667,7 +668,8 @@ static void fill_logfont( LOGFONTW *lf, const WCHAR *name, unsigned int height, lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; - lstrcpyW( lf->lfFaceName, name ); + memcpy( lf->lfFaceName, face_name, face_name_size ); + lf->lfFaceName[face_name_size / sizeof(WCHAR)] = 0; } static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) @@ -705,6 +707,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->width = tm.tmAveCharWidth; font_info->height = tm.tmHeight + tm.tmExternalLeading; + font_info->pitch_family = tm.tmPitchAndFamily; font_info->weight = tm.tmWeight; free( font_info->face_name ); @@ -851,15 +854,15 @@ static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm /* sets logfont as the new font for the console */ -static void update_console_font( struct console *console, const WCHAR *font, - unsigned int height, unsigned int weight ) +void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, + unsigned int height, unsigned int weight ) { struct font_chooser fc; LOGFONTW lf; - if (font[0] && height && weight) + if (face_name[0] && height && weight) { - fill_logfont( &lf, font, height, weight ); + fill_logfont( &lf, face_name, face_name_size, height, weight ); if (set_console_font( console, &lf )) return; } @@ -1581,8 +1584,9 @@ static BOOL select_font( struct dialog_info *di ) if (font_idx < 0 || size_idx < 0 || size_idx >= di->font_count) return FALSE; - fill_logfont( &lf, di->font[size_idx].faceName, di->font[size_idx].height, - di->font[size_idx].weight ); + fill_logfont( &lf, di->font[size_idx].faceName, + wcslen(di->font[size_idx].faceName) * sizeof(WCHAR), + di->font[size_idx].height, di->font[size_idx].weight ); font = select_font_config( &config, di->console->output_cp, di->console->win, &lf ); if (!font) return FALSE; @@ -1702,7 +1706,9 @@ static INT_PTR WINAPI font_dialog_proc( HWND dialog, UINT msg, WPARAM wparam, LP { LOGFONTW lf; - fill_logfont( &lf, di->font[val].faceName, di->font[val].height, di->font[val].weight ); + fill_logfont( &lf, di->font[val].faceName, + wcslen(di->font[val].faceName) * sizeof(WCHAR), + di->font[val].height, di->font[val].weight ); DeleteObject( select_font_config( &di->config, di->console->output_cp, di->console->win, &lf )); } @@ -1901,7 +1907,8 @@ static void apply_config( struct console *console, const struct console_config * memcmp( console->active->font.face_name, config->face_name, console->active->font.face_len * sizeof(WCHAR) )) { - update_console_font( console, config->face_name, config->cell_height, config->font_weight ); + update_console_font( console, config->face_name, wcslen(config->face_name) * sizeof(WCHAR), + config->cell_height, config->font_weight ); } update_window( console ); -- 2.34.1

2 2

[PATCH v3] kernelbase: Implement SetCurrentConsoleFontEx
by Hugh McMaster 09 Feb '22

09 Feb '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in this version: - Use wcsnlen to determine the length of the FaceName string. - Use face_name_size to check for empty FaceName string. dlls/kernel32/console.c | 7 ------ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 40 ++++++++++++++++----------------- dlls/kernelbase/console.c | 37 ++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 1 + programs/conhost/conhost.c | 25 ++++++++++++++++++--- programs/conhost/conhost.h | 14 +++++++----- programs/conhost/window.c | 27 +++++++++++++--------- 9 files changed, 108 insertions(+), 46 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 80f3419cd7a..58bd18d2a5f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -480,10 +480,3 @@ BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, C SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } - -BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) -{ - FIXME("(%p %d %p): stub!\n", hConsole, maxwindow, cfix); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 87fa0c39381..6e063bfaa7b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1390,7 +1390,7 @@ @ stdcall -import SetConsoleTitleW(wstr) @ stdcall -import SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) NTDLL.RtlSetCriticalSectionSpinCount -@ stdcall SetCurrentConsoleFontEx(long long ptr) +@ stdcall -import SetCurrentConsoleFontEx(long long ptr) @ stdcall -import SetCurrentDirectoryA(str) @ stdcall -import SetCurrentDirectoryW(wstr) @ stub SetDaylightFlag diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..5443a611f80 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3576,18 +3576,18 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CreatePipe(&pipe1, &pipe2, NULL, 0); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3595,47 +3595,47 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); cfix = orig_cfix; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CreatePipe(&pipe1, &pipe2, NULL, 0); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3643,35 +3643,35 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } static void test_GetConsoleFontSize(HANDLE std_output) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a7eeb439232..56340922d32 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1303,6 +1303,43 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute } +/****************************************************************************** + * SetCurrentConsoleFontEx (kernelbase.@) + */ +BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) +{ + struct + { + struct condrv_output_info_params params; + WCHAR face_name[LF_FACESIZE]; + } data; + + size_t size; + + TRACE( "(%p %d %p)\n", hConsole, maxwindow, cfix ); + + if (cfix->cbSize != sizeof(CONSOLE_FONT_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + data.params.mask = SET_CONSOLE_OUTPUT_INFO_FONT; + + data.params.info.font_width = cfix->dwFontSize.X; + data.params.info.font_height = cfix->dwFontSize.Y; + data.params.info.font_pitch_family = cfix->FontFamily; + data.params.info.font_weight = cfix->FontWeight; + + size = wcsnlen( cfix->FaceName, LF_FACESIZE - 1 ) * sizeof(WCHAR); + + memcpy( data.face_name, cfix->FaceName, size ); + size += sizeof(struct condrv_output_info_params); + + return console_ioctl( hConsole, IOCTL_CONDRV_SET_OUTPUT_INFO, &data, size, NULL, 0, NULL ); +} + + /*********************************************************************** * ReadConsoleInputA (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 01135d6250a..91c4909e006 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,6 +1422,7 @@ @ stdcall SetConsoleTitleW(wstr) @ stdcall SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount +@ stdcall SetCurrentConsoleFontEx(long long ptr) @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) @ stdcall SetDefaultDllDirectories(long) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 4d2332a1ee9..b5e294b9401 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -155,6 +155,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 #define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0080 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 2b137c40fb0..8b03d749d21 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1830,7 +1830,7 @@ NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new } static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, - const struct condrv_output_info_params *params ) + const struct condrv_output_info_params *params, size_t in_size ) { const struct condrv_output_info *info = &params->info; NTSTATUS status; @@ -1917,6 +1917,24 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + WCHAR *face_name = (WCHAR *)(params + 1); + size_t face_name_size = in_size - sizeof(*params); + unsigned int height = info->font_height; + unsigned int weight = FW_NORMAL; + + if (!face_name_size) + { + face_name = screen_buffer->font.face_name; + face_name_size = screen_buffer->font.face_len * sizeof(WCHAR); + } + + if (!height) height = 12; + if (info->font_weight >= FW_SEMIBOLD) weight = FW_BOLD; + + update_console_font( screen_buffer->console, face_name, face_name_size, height, weight ); + } if (is_active( screen_buffer )) { @@ -2429,8 +2447,9 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return get_output_info( screen_buffer, out_size ); case IOCTL_CONDRV_SET_OUTPUT_INFO: - if (in_size != sizeof(struct condrv_output_info_params) || *out_size) return STATUS_INVALID_PARAMETER; - return set_output_info( screen_buffer, in_data ); + if (in_size < sizeof(struct condrv_output_info_params) || *out_size) + return STATUS_INVALID_PARAMETER; + return set_output_info( screen_buffer, in_data, in_size ); case IOCTL_CONDRV_FILL_OUTPUT: if (in_size != sizeof(struct condrv_fill_output_params) || *out_size != sizeof(DWORD)) diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 5e9b999380c..3cbd2ed2d80 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -130,17 +130,21 @@ struct screen_buffer struct wine_rb_entry entry; /* map entry */ }; -BOOL init_window( struct console *console ); -void init_message_window( struct console *console ); -void update_window_region( struct console *console, const RECT *update ); -void update_window_config( struct console *console, BOOL delay ); - +/* conhost.c */ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); +/* window.c */ +void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, + unsigned int height, unsigned int weight ); +BOOL init_window( struct console *console ); +void init_message_window( struct console *console ); +void update_window_region( struct console *console, const RECT *update ); +void update_window_config( struct console *console, BOOL delay ); + static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) { SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index db04ba120e4..b88b95c41ce 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -652,7 +652,8 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, return font; } -static void fill_logfont( LOGFONTW *lf, const WCHAR *name, unsigned int height, unsigned int weight ) +static void fill_logfont( LOGFONTW *lf, const WCHAR *face_name, size_t face_name_size, + unsigned int height, unsigned int weight ) { lf->lfHeight = height; lf->lfWidth = 0; @@ -667,7 +668,8 @@ static void fill_logfont( LOGFONTW *lf, const WCHAR *name, unsigned int height, lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; - lstrcpyW( lf->lfFaceName, name ); + memcpy( lf->lfFaceName, face_name, face_name_size ); + lf->lfFaceName[face_name_size / sizeof(WCHAR)] = 0; } static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) @@ -705,6 +707,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->width = tm.tmAveCharWidth; font_info->height = tm.tmHeight + tm.tmExternalLeading; + font_info->pitch_family = tm.tmPitchAndFamily; font_info->weight = tm.tmWeight; free( font_info->face_name ); @@ -851,15 +854,15 @@ static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm /* sets logfont as the new font for the console */ -static void update_console_font( struct console *console, const WCHAR *font, - unsigned int height, unsigned int weight ) +void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, + unsigned int height, unsigned int weight ) { struct font_chooser fc; LOGFONTW lf; - if (font[0] && height && weight) + if (face_name[0] && height && weight) { - fill_logfont( &lf, font, height, weight ); + fill_logfont( &lf, face_name, face_name_size, height, weight ); if (set_console_font( console, &lf )) return; } @@ -1581,8 +1584,9 @@ static BOOL select_font( struct dialog_info *di ) if (font_idx < 0 || size_idx < 0 || size_idx >= di->font_count) return FALSE; - fill_logfont( &lf, di->font[size_idx].faceName, di->font[size_idx].height, - di->font[size_idx].weight ); + fill_logfont( &lf, di->font[size_idx].faceName, + wcslen(di->font[size_idx].faceName) * sizeof(WCHAR), + di->font[size_idx].height, di->font[size_idx].weight ); font = select_font_config( &config, di->console->output_cp, di->console->win, &lf ); if (!font) return FALSE; @@ -1702,7 +1706,9 @@ static INT_PTR WINAPI font_dialog_proc( HWND dialog, UINT msg, WPARAM wparam, LP { LOGFONTW lf; - fill_logfont( &lf, di->font[val].faceName, di->font[val].height, di->font[val].weight ); + fill_logfont( &lf, di->font[val].faceName, + wcslen(di->font[val].faceName) * sizeof(WCHAR), + di->font[val].height, di->font[val].weight ); DeleteObject( select_font_config( &di->config, di->console->output_cp, di->console->win, &lf )); } @@ -1901,7 +1907,8 @@ static void apply_config( struct console *console, const struct console_config * memcmp( console->active->font.face_name, config->face_name, console->active->font.face_len * sizeof(WCHAR) )) { - update_console_font( console, config->face_name, config->cell_height, config->font_weight ); + update_console_font( console, config->face_name, wcslen(config->face_name) * sizeof(WCHAR), + config->cell_height, config->font_weight ); } update_window( console ); -- 2.34.1

1 0

[PATCH] dbgeng/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 09 Feb '22

09 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/tests/Makefile.in | 1 - dlls/dbgeng/tests/dbgeng.c | 136 +++++++++++++++++----------------- 2 files changed, 68 insertions(+), 69 deletions(-) diff --git a/dlls/dbgeng/tests/Makefile.in b/dlls/dbgeng/tests/Makefile.in index 8ffef052654..26006e9546b 100644 --- a/dlls/dbgeng/tests/Makefile.in +++ b/dlls/dbgeng/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dbgeng.dll IMPORTS = dbgeng diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 53dabd5bc36..b0428215a9a 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -35,67 +35,67 @@ static void test_engine_options(void) HRESULT hr; hr = DebugCreate(&IID_IDebugControl, (void **)&control); - ok(hr == S_OK, "Failed to create engine object, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create engine object, hr %#lx.\n", hr); options = 0xf; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); - ok(options == 0, "Unexpected options %#x.\n", options); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); + ok(options == 0, "Unexpected options %#lx.\n", options); hr = control->lpVtbl->AddEngineOptions(control, DEBUG_ENGOPT_INITIAL_BREAK); - ok(hr == S_OK, "Failed to add engine options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to add engine options, hr %#lx.\n", hr); options = 0; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); - ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); + ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options); hr = control->lpVtbl->AddEngineOptions(control, 0x01000000); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); options = 0; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); - ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); + ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options); hr = control->lpVtbl->RemoveEngineOptions(control, 0x01000000); - ok(hr == S_OK, "Failed to remove options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to remove options, hr %#lx.\n", hr); hr = control->lpVtbl->AddEngineOptions(control, DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); - ok(hr == S_OK, "Failed to add engine options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to add engine options, hr %#lx.\n", hr); options = 0; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); ok(options == (DEBUG_ENGOPT_INITIAL_BREAK | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION), - "Unexpected options %#x.\n", options); + "Unexpected options %#lx.\n", options); hr = control->lpVtbl->RemoveEngineOptions(control, DEBUG_ENGOPT_INITIAL_BREAK); - ok(hr == S_OK, "Failed to remove options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to remove options, hr %#lx.\n", hr); options = 0; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); - ok(options == DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION, "Unexpected options %#x.\n", options); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); + ok(options == DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION, "Unexpected options %#lx.\n", options); hr = control->lpVtbl->SetEngineOptions(control, DEBUG_ENGOPT_INITIAL_BREAK); - ok(hr == S_OK, "Failed to set options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set options, hr %#lx.\n", hr); options = 0; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); - ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); + ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options); hr = control->lpVtbl->SetEngineOptions(control, 0x01000000); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = control->lpVtbl->SetEngineOptions(control, 0x01000000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); options = 0; hr = control->lpVtbl->GetEngineOptions(control, &options); - ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); - ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); + ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr); + ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options); control->lpVtbl->Release(control); } @@ -264,13 +264,13 @@ static void test_attach(void) BOOL ret; hr = DebugCreate(&IID_IDebugClient, (void **)&client); - ok(hr == S_OK, "Failed to create engine object, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create engine object, hr %#lx.\n", hr); hr = client->lpVtbl->QueryInterface(client, &IID_IDebugControl, (void **)&control); - ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get interface pointer, hr %#lx.\n", hr); hr = client->lpVtbl->SetEventCallbacks(client, &event_callbacks); - ok(hr == S_OK, "Failed to set event callbacks, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event callbacks, hr %#lx.\n", hr); event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); @@ -284,7 +284,7 @@ static void test_attach(void) /* Non-invasive mode. */ hr = client->lpVtbl->AttachProcess(client, 0, info.dwProcessId, DEBUG_ATTACH_NONINVASIVE); - ok(hr == S_OK, "Failed to attach to process, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to attach to process, hr %#lx.\n", hr); is_debugged = TRUE; ret = CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); @@ -292,7 +292,7 @@ static void test_attach(void) ok(!is_debugged, "Unexpected mode.\n"); hr = control->lpVtbl->WaitForEvent(control, 0, INFINITE); - ok(hr == S_OK, "Waiting for event failed, hr %#x.\n", hr); + ok(hr == S_OK, "Waiting for event failed, hr %#lx.\n", hr); is_debugged = TRUE; ret = CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); @@ -300,11 +300,11 @@ static void test_attach(void) ok(!is_debugged, "Unexpected mode.\n"); hr = client->lpVtbl->DetachProcesses(client); - ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to detach, hr %#lx.\n", hr); hr = client->lpVtbl->EndSession(client, DEBUG_END_ACTIVE_DETACH); todo_wine - ok(hr == S_OK, "Failed to end session, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end session, hr %#lx.\n", hr); SetEvent(event); @@ -322,7 +322,7 @@ static void test_attach(void) static void test_module_information(void) { static const char *event_name = "dbgeng_test_event"; - unsigned int loaded, unloaded, index, length; + ULONG loaded, unloaded, index, length; DEBUG_MODULE_PARAMETERS params[2]; IDebugDataSpaces *dataspaces; PROCESS_INFORMATION info; @@ -336,19 +336,19 @@ static void test_module_information(void) BOOL ret; hr = DebugCreate(&IID_IDebugClient, (void **)&client); - ok(hr == S_OK, "Failed to create engine object, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create engine object, hr %#lx.\n", hr); hr = client->lpVtbl->QueryInterface(client, &IID_IDebugControl, (void **)&control); - ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get interface pointer, hr %#lx.\n", hr); hr = client->lpVtbl->QueryInterface(client, &IID_IDebugSymbols2, (void **)&symbols); - ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get interface pointer, hr %#lx.\n", hr); hr = client->lpVtbl->QueryInterface(client, &IID_IDebugDataSpaces, (void **)&dataspaces); - ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get interface pointer, hr %#lx.\n", hr); hr = control->lpVtbl->IsPointer64Bit(control); - ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); @@ -357,120 +357,120 @@ static void test_module_information(void) ok(ret, "Failed to create target process.\n"); hr = control->lpVtbl->SetEngineOptions(control, DEBUG_ENGOPT_INITIAL_BREAK); - ok(hr == S_OK, "Failed to set engine options, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set engine options, hr %#lx.\n", hr); hr = client->lpVtbl->AttachProcess(client, 0, info.dwProcessId, DEBUG_ATTACH_NONINVASIVE); - ok(hr == S_OK, "Failed to attach to process, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to attach to process, hr %#lx.\n", hr); hr = control->lpVtbl->IsPointer64Bit(control); - ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = control->lpVtbl->WaitForEvent(control, 0, INFINITE); - ok(hr == S_OK, "Waiting for event failed, hr %#x.\n", hr); + ok(hr == S_OK, "Waiting for event failed, hr %#lx.\n", hr); hr = control->lpVtbl->IsPointer64Bit(control); - ok(SUCCEEDED(hr), "Failed to get pointer length, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get pointer length, hr %#lx.\n", hr); /* Number of modules. */ hr = symbols->lpVtbl->GetNumberModules(symbols, &loaded, &unloaded); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(loaded > 0, "Unexpected module count %u.\n", loaded); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(loaded > 0, "Unexpected module count %lu.\n", loaded); /* Module base. */ hr = symbols->lpVtbl->GetModuleByIndex(symbols, loaded, &base); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); base = 0; hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!base, "Unexpected module base.\n"); hr = symbols->lpVtbl->GetModuleByOffset(symbols, 0, 0, &index, &base); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, 0, &index, &base); - ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get module, hr %#lx.\n", hr); hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, 0, NULL, NULL); - ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get module, hr %#lx.\n", hr); hr = symbols->lpVtbl->GetModuleByOffset(symbols, base + 1, 0, NULL, NULL); - ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get module, hr %#lx.\n", hr); hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, loaded, NULL, NULL); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); /* Parameters. */ base = 0; hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!base, "Unexpected module base.\n"); hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, 0, params); - ok(hr == S_OK, "Failed to get module parameters, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get module parameters, hr %#lx.\n", hr); ok(params[0].Base == base, "Unexpected module base.\n"); hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, &base, 100, params); - ok(hr == S_OK, "Failed to get module parameters, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get module parameters, hr %#lx.\n", hr); ok(params[0].Base == base, "Unexpected module base.\n"); bases[0] = base + 1; bases[1] = base; hr = symbols->lpVtbl->GetModuleParameters(symbols, 2, bases, 0, params); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#lx.\n", hr); ok(params[0].Base == DEBUG_INVALID_OFFSET, "Unexpected module base.\n"); ok(params[0].Size == 0, "Unexpected module size.\n"); ok(params[1].Base == base, "Unexpected module base.\n"); ok(params[1].Size != 0, "Unexpected module size.\n"); hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, bases, 0, params); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#lx.\n", hr); hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, bases, loaded, params); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#lx.\n", hr); hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, loaded, params); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); /* Image name. */ hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, buffer, sizeof(buffer), &length); - ok(hr == S_OK, "Failed to get image name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get image name, hr %#lx.\n", hr); ok(strlen(buffer) + 1 == length, "Unexpected length.\n"); hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, NULL, sizeof(buffer), &length); - ok(hr == S_OK, "Failed to get image name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get image name, hr %#lx.\n", hr); ok(length > 0, "Unexpected length.\n"); hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, DEBUG_ANY_ID, base, buffer, sizeof(buffer), &length); - ok(hr == S_OK, "Failed to get image name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get image name, hr %#lx.\n", hr); ok(strlen(buffer) + 1 == length, "Unexpected length.\n"); hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, buffer, length - 1, &length); - ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); - ok(strlen(buffer) + 2 == length, "Unexpected length %u.\n", length); + ok(hr == S_FALSE, "Failed to get image name, hr %#lx.\n", hr); + ok(strlen(buffer) + 2 == length, "Unexpected length %lu.\n", length); hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, NULL, length - 1, NULL); - ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); + ok(hr == S_FALSE, "Failed to get image name, hr %#lx.\n", hr); /* Read memory. */ base = 0; hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!base, "Unexpected module base.\n"); hr = dataspaces->lpVtbl->ReadVirtual(dataspaces, base, buffer, sizeof(buffer), &length); - ok(hr == S_OK, "Failed to read process memory, hr %#x.\n", hr); - ok(length == sizeof(buffer), "Unexpected length %u.\n", length); + ok(hr == S_OK, "Failed to read process memory, hr %#lx.\n", hr); + ok(length == sizeof(buffer), "Unexpected length %lu.\n", length); ok(buffer[0] == 'M' && buffer[1] == 'Z', "Unexpected contents.\n"); memset(buffer, 0, sizeof(buffer)); hr = dataspaces->lpVtbl->ReadVirtual(dataspaces, base, buffer, sizeof(buffer), NULL); - ok(hr == S_OK, "Failed to read process memory, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to read process memory, hr %#lx.\n", hr); ok(buffer[0] == 'M' && buffer[1] == 'Z', "Unexpected contents.\n"); hr = client->lpVtbl->DetachProcesses(client); - ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to detach, hr %#lx.\n", hr); SetEvent(event); wait_child_process(info.hProcess); -- 2.34.1

1 0

[PATCH 6/7] comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill background for checkboxes and radio buttons.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

Fix radio buttons of Mupen64-RR-Lua input window having stale background. Mupen64-RR-Lua doesn't actually handle WM_ERASEBKGND even though it returns nonzero. And tests show that a WM_CTLCOLORSTATIC is sent and the returned brush is used for filling background, even painting over the content from DrawThemeParentBackground(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 5 +++++ dlls/comctl32/tests/misc.c | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 14b2200afed..1349e10c4c0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2796,6 +2796,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; NMCUSTOMDRAW nmcd; + HBRUSH brush; LRESULT cdrf; LOGFONTW lf; HWND parent; @@ -2859,6 +2860,10 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + /* Tests show that the brush from WM_CTLCOLORSTATIC is used for filling background after a + * DrawThemeParentBackground() call */ + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + FillRect(hDC, &client_rect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); if (cdrf & CDRF_NOTIFYPOSTERASE) { diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 09c5b3d6c40..c3de9e68c5a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -843,14 +843,14 @@ static void test_themed_background(void) {ANIMATE_CLASSA, 0, empty_seq, TRUE}, {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq}, - {WC_BUTTONA, BS_CHECKBOX, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq, TRUE}, - {WC_BUTTONA, BS_3STATE, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_CHECKBOX, checkbox_seq}, + {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq}, + {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq}, + {WC_BUTTONA, BS_3STATE, checkbox_seq}, + {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq}, {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, - {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, + {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq}, {WC_BUTTONA, BS_SPLITBUTTON, splitbutton_seq}, @@ -950,7 +950,8 @@ static void test_themed_background(void) { /* WM_CTLCOLORSTATIC is used to fill background */ color = GetPixel(hdc, 40, 40); - todo_wine + /* BS_PUSHBOX is unimplemented on Wine */ + todo_wine_if(i == 11) ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); } else if (tests[i].seq == groupbox_seq) -- 2.32.0

2 2

[PATCH] dnsapi: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 09 Feb '22

09 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/Makefile.in | 1 - dlls/dnsapi/main.c | 81 ++++++++++++++--------------------- dlls/dnsapi/query.c | 37 ++++++++-------- dlls/dnsapi/tests/Makefile.in | 1 - dlls/dnsapi/tests/name.c | 4 +- dlls/dnsapi/tests/query.c | 63 ++++++++++++++------------- dlls/dnsapi/tests/record.c | 42 +++++++++--------- 7 files changed, 105 insertions(+), 124 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 1e280745bd0..b7785e5ebeb 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dnsapi.dll UNIXLIB = dnsapi.so IMPORTLIB = dnsapi diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 5d766416ecc..23738bf36fe 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -36,7 +36,7 @@ unixlib_handle_t resolv_handle = 0; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { - TRACE( "(%p,%u,%p)\n", hinst, reason, reserved ); + TRACE( "(%p, %lu, %p)\n", hinst, reason, reserved ); switch (reason) { @@ -56,10 +56,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) * DnsAcquireContextHandle_A [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred, - PHANDLE context ) +DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, void *cred, HANDLE *context ) { - FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context ); + FIXME( "(%#lx, %p, %p) stub\n", flags, cred, context ); *context = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -69,10 +68,9 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred, * DnsAcquireContextHandle_UTF8 [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred, - PHANDLE context ) +DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, void *cred, HANDLE *context ) { - FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context ); + FIXME( "(%#lx, %p, %p) stub\n", flags, cred, context ); *context = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -82,10 +80,9 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred, * DnsAcquireContextHandle_W [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred, - PHANDLE context ) +DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, void *cred, HANDLE *context ) { - FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context ); + FIXME( "(%#lx, %p, %p) stub\n", flags, cred, context ); *context = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -156,12 +153,10 @@ VOID WINAPI DnsReleaseContextHandle( HANDLE context ) * DnsModifyRecordsInSet_A [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete, - DWORD options, HANDLE context, - PVOID servers, PVOID reserved ) +DNS_STATUS WINAPI DnsModifyRecordsInSet_A( DNS_RECORDA *add, DNS_RECORDA *delete, DWORD options, HANDLE context, + void *servers, void *reserved ) { - FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, - context, servers, reserved ); + FIXME( "(%p, %p, %#lx, %p, %p, %p) stub\n", add, delete, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -169,12 +164,10 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete * DnsModifyRecordsInSet_UTF8 [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA delete, - DWORD options, HANDLE context, - PVOID servers, PVOID reserved ) +DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( DNS_RECORDA *add, DNS_RECORDA *delete, DWORD options, HANDLE context, + void *servers, void *reserved ) { - FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, - context, servers, reserved ); + FIXME( "(%p, %p, %#lx, %p, %p, %p) stub\n", add, delete, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -182,12 +175,10 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA del * DnsModifyRecordsInSet_W [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete, - DWORD options, HANDLE context, - PVOID servers, PVOID reserved ) +DNS_STATUS WINAPI DnsModifyRecordsInSet_W( DNS_RECORDW *add, DNS_RECORDW *delete, DWORD options, HANDLE context, + void *servers, void *reserved ) { - FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, - context, servers, reserved ); + FIXME( "(%p, %p, %#lx, %p, %p, %p) stub\n", add, delete, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -195,12 +186,10 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete * DnsWriteQuestionToBuffer_UTF8 [DNSAPI.@] * */ -BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( PDNS_MESSAGE_BUFFER buffer, PDWORD size, - PCSTR name, WORD type, WORD xid, - BOOL recurse ) +BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( DNS_MESSAGE_BUFFER *buffer, DWORD *size, const char *name, WORD type, + WORD xid, BOOL recurse ) { - FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_a(name), - type, xid, recurse ); + FIXME( "(%p, %p, %s, %d, %d, %d) stub\n", buffer, size, debugstr_a(name), type, xid, recurse ); return FALSE; } @@ -208,12 +197,10 @@ BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( PDNS_MESSAGE_BUFFER buffer, PDWORD si * DnsWriteQuestionToBuffer_W [DNSAPI.@] * */ -BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, PDWORD size, - PCWSTR name, WORD type, WORD xid, - BOOL recurse ) +BOOL WINAPI DnsWriteQuestionToBuffer_W( DNS_MESSAGE_BUFFER *buffer, DWORD *size, const WCHAR *name, WORD type, + WORD xid, BOOL recurse ) { - FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_w(name), - type, xid, recurse ); + FIXME( "(%p, %p, %s, %d, %d, %d) stub\n", buffer, size, debugstr_w(name), type, xid, recurse ); return FALSE; } @@ -221,12 +208,10 @@ BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, PDWORD size, * DnsReplaceRecordSetA [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, - HANDLE context, PVOID servers, - PVOID reserved ) +DNS_STATUS WINAPI DnsReplaceRecordSetA( DNS_RECORDA *set, DWORD options, HANDLE context, void *servers, + void *reserved ) { - FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, - servers, reserved ); + FIXME( "(%p, %#lx, %p, %p, %p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -234,12 +219,10 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, * DnsReplaceRecordSetUTF8 [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, - HANDLE context, PVOID servers, - PVOID reserved ) +DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( DNS_RECORDA *set, DWORD options, HANDLE context, void *servers, + void *reserved ) { - FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, - servers, reserved ); + FIXME( "(%p, %#lx, %p, %p, %p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -247,11 +230,9 @@ DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, * DnsReplaceRecordSetW [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsReplaceRecordSetW( PDNS_RECORDW set, DWORD options, - HANDLE context, PVOID servers, - PVOID reserved ) +DNS_STATUS WINAPI DnsReplaceRecordSetW( DNS_RECORDW *set, DWORD options, HANDLE context, void *servers, + void *reserved ) { - FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, - servers, reserved ); + FIXME( "(%p, %#lx, %p, %p, %p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index f732c6a6c65..12aa1086540 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -106,13 +106,11 @@ exit: static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) { - if (!req) - return "(null)"; - - return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, + if (!req) return "(null)"; + return wine_dbg_sprintf("{%lu %s %s %I64x %p %lu %p %p}", req->Version, debugstr_w(req->QueryName), debugstr_type(req->QueryType), - (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, - req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); + req->QueryOptions, req->pDnsServerList, req->InterfaceIndex, + req->pQueryCompletionCallback, req->pQueryContext); } /****************************************************************************** @@ -121,7 +119,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) */ DNS_STATUS WINAPI DnsQueryEx(DNS_QUERY_REQUEST *request, DNS_QUERY_RESULT *result, DNS_QUERY_CANCEL *cancel) { - FIXME("(%s %p %p)\n", debugstr_query_request(request), result, cancel); + FIXME("(%s, %p, %p)\n", debugstr_query_request(request), result, cancel); return DNS_ERROR_RCODE_NOT_IMPLEMENTED; } @@ -129,14 +127,14 @@ DNS_STATUS WINAPI DnsQueryEx(DNS_QUERY_REQUEST *request, DNS_QUERY_RESULT *resul * DnsQuery_A [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID servers, - PDNS_RECORDA *result, PVOID *reserved ) +DNS_STATUS WINAPI DnsQuery_A( const char *name, WORD type, DWORD options, void *servers, DNS_RECORDA **result, + void **reserved ) { WCHAR *nameW; DNS_RECORDW *resultW; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), + TRACE( "(%s, %s, %#lx, %p, %p, %p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -164,15 +162,15 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server * DnsQuery_UTF8 [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID servers, - PDNS_RECORDA *result, PVOID *reserved ) +DNS_STATUS WINAPI DnsQuery_UTF8( const char *name, WORD type, DWORD options, void *servers, DNS_RECORDA **result, + void **reserved ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned char answer[4096]; DWORD len = sizeof(answer); struct query_params query_params = { name, type, options, answer, &len }; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), + TRACE( "(%s, %s, %#lx, %p, %p, %p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -218,14 +216,14 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser * DnsQuery_W [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID servers, - PDNS_RECORDW *result, PVOID *reserved ) +DNS_STATUS WINAPI DnsQuery_W( const WCHAR *name, WORD type, DWORD options, void *servers, DNS_RECORDW **result, + void **reserved ) { char *nameU; DNS_RECORDA *resultA; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), debugstr_type( type ), + TRACE( "(%s, %s, %#lx, %p, %p, %p)\n", debugstr_w(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -329,13 +327,12 @@ err: * DnsQueryConfig [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR adapter, - PVOID reserved, PVOID buffer, PDWORD len ) +DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, const WCHAR *adapter, void *reserved, + void *buffer, DWORD *len ) { DNS_STATUS ret = ERROR_INVALID_PARAMETER; - TRACE( "(%d,0x%08x,%s,%p,%p,%p)\n", config, flag, debugstr_w(adapter), - reserved, buffer, len ); + TRACE( "(%d, %#lx, %s, %p, %p, %p)\n", config, flag, debugstr_w(adapter), reserved, buffer, len ); if (!len) return ERROR_INVALID_PARAMETER; diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 8764aebeaf9..3f8c424b4f7 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dnsapi.dll IMPORTS = dnsapi ws2_32 iphlpapi diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index f4d5b9e691d..946b941e83f 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -150,7 +150,7 @@ static void test_DnsValidateName_A( void ) { status = DnsValidateName_A( test_data[i].name, test_data[i].format ); ok( status == test_data[i].status || broken(status == test_data[i].status_broken), - "%d: \'%s\': got %d, expected %d\n", i, test_data[i].name, status, test_data[i].status ); + "%u: \'%s\': got %ld, expected %ld\n", i, test_data[i].name, status, test_data[i].status ); } } @@ -213,7 +213,7 @@ static void test_DnsFlushResolverCacheEntry_A(void) ret = DnsFlushResolverCacheEntry_A( NULL ); err = GetLastError(); ok( !ret, "got %d\n", ret ); - ok( err == 0xdeadbeef, "got %u\n", err ); + ok( err == 0xdeadbeef, "got %lu\n", err ); ret = DnsFlushResolverCacheEntry_A( "localhost" ); ok( ret, "got %d\n", ret ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index e691822a46a..3307fcbe3cc 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -46,20 +46,22 @@ static void test_DnsQuery(void) skip("query timed out\n"); return; } - ok(status == ERROR_SUCCESS, "got %d\n", status); + ok(status == ERROR_SUCCESS, "got %ld\n", status); DnsRecordListFree(rec, DnsFreeRecordList); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, + "got %ld\n", status); wcscpy(domain, L"_ldap._tcp.deadbeef"); status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, + "got %ld\n", status); wcscpy(domain, L"_ldap._tcp.dc._msdcs."); size = ARRAY_SIZE(domain) - wcslen(domain); ret = GetComputerNameExW(ComputerNameDnsDomain, domain + wcslen(domain), &size); - ok(ret, "GetComputerNameEx error %u\n", GetLastError()); + ok(ret, "GetComputerNameEx error %lu\n", GetLastError()); if (!size) { skip("computer is not in a domain\n"); @@ -67,7 +69,7 @@ static void test_DnsQuery(void) } status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); - trace("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), status); + trace("DnsQuery_W(%s) => %ld\n", wine_dbgstr_w(domain), status); if (status != ERROR_SUCCESS) { skip("domain %s doesn't have an SRV entry\n", wine_dbgstr_w(domain)); @@ -81,7 +83,8 @@ static void test_DnsQuery(void) /* IPv4 */ status = DnsQuery_W(name, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %ld\n", + wine_dbgstr_w(name), status); if (status == ERROR_SUCCESS) { SOCKADDR_IN addr; @@ -92,7 +95,7 @@ static void test_DnsQuery(void) addr.sin_addr.s_addr = rec->Data.A.IpAddress; size = sizeof(buf); ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); - ok(!ret, "WSAAddressToStringW error %d\n", ret); + ok(!ret, "WSAAddressToStringW error %lu\n", ret); trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); DnsRecordListFree(rec, DnsFreeRecordList); @@ -100,7 +103,8 @@ static void test_DnsQuery(void) /* IPv6 */ status = DnsQuery_W(name, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %ld\n", + wine_dbgstr_w(name), status); if (status == ERROR_SUCCESS) { SOCKADDR_IN6 addr; @@ -112,7 +116,7 @@ static void test_DnsQuery(void) memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); size = sizeof(buf); ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); - ok(!ret, "WSAAddressToStringW error %d\n", ret); + ok(!ret, "WSAAddressToStringW error %lu\n", ret); trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); DnsRecordListFree(rec, DnsFreeRecordList); @@ -138,7 +142,8 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) static void test_DnsQueryConfig( void ) { - DWORD err, size, i, ipv6_count; + DNS_STATUS err; + DWORD size, i, ipv6_count; WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; IP_ADAPTER_ADDRESSES *adapters, *ptr; DNS_ADDR_ARRAY *ipv4, *ipv6, *unspec; @@ -157,61 +162,61 @@ static void test_DnsQueryConfig( void ) ipv4 = malloc( size ); size--; err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); - ok( err == ERROR_MORE_DATA, "got %d\n", err ); + ok( err == ERROR_MORE_DATA, "got %ld\n", err ); size++; err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); - ok( !err, "got %d\n", err ); + ok( !err, "got %ld\n", err ); - ok( ipv4->AddrCount == ipv4->MaxCount, "got %d vs %d\n", ipv4->AddrCount, ipv4->MaxCount ); - ok( !ipv4->Tag, "got %08x\n", ipv4->Tag ); + ok( ipv4->AddrCount == ipv4->MaxCount, "got %lu vs %lu\n", ipv4->AddrCount, ipv4->MaxCount ); + ok( !ipv4->Tag, "got %#lx\n", ipv4->Tag ); ok( !ipv4->Family, "got %d\n", ipv4->Family ); - ok( !ipv4->WordReserved, "got %04x\n", ipv4->WordReserved ); - ok( !ipv4->Flags, "got %08x\n", ipv4->Flags ); - ok( !ipv4->MatchFlag, "got %08x\n", ipv4->MatchFlag ); - ok( !ipv4->Reserved1, "got %08x\n", ipv4->Reserved1 ); - ok( !ipv4->Reserved2, "got %08x\n", ipv4->Reserved2 ); + ok( !ipv4->WordReserved, "got %#x\n", ipv4->WordReserved ); + ok( !ipv4->Flags, "got %#lx\n", ipv4->Flags ); + ok( !ipv4->MatchFlag, "got %#lx\n", ipv4->MatchFlag ); + ok( !ipv4->Reserved1, "got %#lx\n", ipv4->Reserved1 ); + ok( !ipv4->Reserved2, "got %#lx\n", ipv4->Reserved2 ); size = 0; err = DnsQueryConfig( DnsConfigDnsServerList, 0, name, NULL, NULL, &size ); - ok( !err, "got %d\n", err ); + ok( !err, "got %ld\n", err ); ip4_array = malloc( size ); err = DnsQueryConfig( DnsConfigDnsServerList, 0, name, NULL, ip4_array, &size ); - ok( !err, "got %d\n", err ); + ok( !err, "got %ld\n", err ); - ok( ipv4->AddrCount == ip4_array->AddrCount, "got %d vs %d\n", ipv4->AddrCount, ip4_array->AddrCount ); + ok( ipv4->AddrCount == ip4_array->AddrCount, "got %lu vs %lu\n", ipv4->AddrCount, ip4_array->AddrCount ); for (i = 0; i < ipv4->AddrCount; i++) { SOCKADDR_IN *sa = (SOCKADDR_IN *)ipv4->AddrArray[i].MaxSa; ok( sa->sin_family == AF_INET, "got %d\n", sa->sin_family ); - ok( sa->sin_addr.s_addr == ip4_array->AddrArray[i], "got %08x vs %08x\n", + ok( sa->sin_addr.s_addr == ip4_array->AddrArray[i], "got %#lx vs %#lx\n", sa->sin_addr.s_addr, ip4_array->AddrArray[i] ); - ok( ipv4->AddrArray[i].Data.DnsAddrUserDword[0] == sizeof(*sa), "got %d\n", + ok( ipv4->AddrArray[i].Data.DnsAddrUserDword[0] == sizeof(*sa), "got %lu\n", ipv4->AddrArray[i].Data.DnsAddrUserDword[0] ); } size = 0; err = DnsQueryConfig( DnsConfigDnsServersIpv6, 0, name, NULL, NULL, &size ); - ok( !err || err == DNS_ERROR_NO_DNS_SERVERS, "got %d\n", err ); + ok( !err || err == DNS_ERROR_NO_DNS_SERVERS, "got %ld\n", err ); ipv6_count = 0; ipv6 = NULL; if (!err) { ipv6 = malloc( size ); err = DnsQueryConfig( DnsConfigDnsServersIpv6, 0, name, NULL, ipv6, &size ); - ok( !err, "got %d\n", err ); + ok( !err, "got %ld\n", err ); ipv6_count = ipv6->AddrCount; } size = 0; err = DnsQueryConfig( DnsConfigDnsServersUnspec, 0, name, NULL, NULL, &size ); - ok( !err, "got %d\n", err ); + ok( !err, "got %ld\n", err ); unspec = malloc( size ); err = DnsQueryConfig( DnsConfigDnsServersUnspec, 0, name, NULL, unspec, &size ); - ok( !err, "got %d\n", err ); + ok( !err, "got %ld\n", err ); - ok( unspec->AddrCount == ipv4->AddrCount + ipv6_count, "got %d vs %d + %d\n", + ok( unspec->AddrCount == ipv4->AddrCount + ipv6_count, "got %lu vs %lu + %lu\n", unspec->AddrCount, ipv4->AddrCount, ipv6_count ); free( ip4_array ); diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index c07c3400e78..20738de3618 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -202,58 +202,58 @@ static void test_DnsExtractRecordsFromMessage(void) ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec ); ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */, - "failed %u\n", ret ); + "failed %ld\n", ret ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty), &rec ); - ok( ret == DNS_ERROR_BAD_PACKET, "failed %u\n", ret ); + ok( ret == DNS_ERROR_BAD_PACKET, "failed %ld\n", ret ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty_answer, sizeof(msg_empty_answer), &rec ); - ok( ret == DNS_ERROR_BAD_PACKET, "failed %u\n", ret ); + ok( ret == DNS_ERROR_BAD_PACKET, "failed %ld\n", ret ); rec = (void *)0xdeadbeef; ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question, sizeof(msg_question), &rec ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); ok( !rec, "record %p\n", rec ); rec = (void *)0xdeadbeef; ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_winehq, sizeof(msg_winehq), &rec ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); ok( rec != NULL, "record not set\n" ); ok( !strcmp( rec->pName, "winehq.org" ), "wrong name %s\n", rec->pName ); ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section ); ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet ); ok( rec->wType == DNS_TYPE_A, "wrong type %u\n", rec->wType ); ok( rec->wDataLength == sizeof(DNS_A_DATA), "wrong len %u\n", rec->wDataLength ); - ok( rec->dwTtl == 0x04050607, "wrong ttl %x\n", rec->dwTtl ); - ok( rec->Data.A.IpAddress == 0x7c510404, "wrong addr %08x\n", rec->Data.A.IpAddress ); + ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl ); + ok( rec->Data.A.IpAddress == 0x7c510404, "wrong addr %#lx\n", rec->Data.A.IpAddress ); ok( !rec->pNext, "next record %p\n", rec->pNext ); DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); recW = (void *)0xdeadbeef; ret = DnsExtractRecordsFromMessage_W( (DNS_MESSAGE_BUFFER *)msg_winehq, sizeof(msg_winehq), &recW ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); ok( recW != NULL, "record not set\n" ); ok( !wcscmp( recW->pName, L"winehq.org" ), "wrong name %s\n", debugstr_w(recW->pName) ); DnsRecordListFree( (DNS_RECORD *)recW, DnsFreeRecordList ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_invchars, sizeof(msg_invchars), &rec ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); ok( !strcmp( rec->pName, "a$.b\\.c..\td" ), "wrong name %s\n", rec->pName ); DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_root, sizeof(msg_root), &rec ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); ok( !strcmp( rec->pName, "." ), "wrong name %s\n", rec->pName ); DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_label, sizeof(msg_label), &rec ); - ok( ret == DNS_ERROR_BAD_PACKET, "failed %u\n", ret ); + ok( ret == DNS_ERROR_BAD_PACKET, "failed %ld\n", ret ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_loop, sizeof(msg_loop), &rec ); - ok( ret == DNS_ERROR_BAD_PACKET, "failed %u\n", ret ); + ok( ret == DNS_ERROR_BAD_PACKET, "failed %ld\n", ret ); ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_types, sizeof(msg_types), &rec ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); r = rec; ok( r != NULL, "record not set\n" ); ok( !strcmp( r->pName, "winehq.org" ), "wrong name %s\n", r->pName ); @@ -271,15 +271,15 @@ static void test_DnsExtractRecordsFromMessage(void) ok( r != NULL, "record not set\n" ); ok( !strcmp( r->pName, "winehq.org" ), "wrong name %s\n", r->pName ); ok( r->wType == DNS_TYPE_AAAA, "wrong type %u\n", r->wType ); - ok( r->Data.AAAA.Ip6Address.IP6Dword[0] == 0x04030201, "wrong addr %x\n", + ok( r->Data.AAAA.Ip6Address.IP6Dword[0] == 0x04030201, "wrong addr %#lx\n", r->Data.AAAA.Ip6Address.IP6Dword[0] ); - ok( r->Data.AAAA.Ip6Address.IP6Dword[1] == 0x08070605, "wrong addr %x\n", + ok( r->Data.AAAA.Ip6Address.IP6Dword[1] == 0x08070605, "wrong addr %#lx\n", r->Data.AAAA.Ip6Address.IP6Dword[1] ); - ok( r->Data.AAAA.Ip6Address.IP6Dword[2] == 0x0c0b0a09, "wrong addr %x\n", + ok( r->Data.AAAA.Ip6Address.IP6Dword[2] == 0x0c0b0a09, "wrong addr %#lx\n", r->Data.AAAA.Ip6Address.IP6Dword[2] ); - ok( r->Data.AAAA.Ip6Address.IP6Dword[3] == 0x000f0e0d, "wrong addr %x\n", + ok( r->Data.AAAA.Ip6Address.IP6Dword[3] == 0x000f0e0d, "wrong addr %#lx\n", r->Data.AAAA.Ip6Address.IP6Dword[3] ); - ok( r->wDataLength == sizeof(DNS_AAAA_DATA), "wrong len %x\n", r->wDataLength ); + ok( r->wDataLength == sizeof(DNS_AAAA_DATA), "wrong len %u\n", r->wDataLength ); r = r->pNext; ok( r != NULL, "record not set\n" ); ok( !strcmp( r->pName, "winehq.org" ), "wrong name %s\n", r->pName ); @@ -296,7 +296,7 @@ static void test_DnsExtractRecordsFromMessage(void) ok( r != NULL, "record not set\n" ); ok( !strcmp( r->pName, "t.x" ), "wrong name %s\n", r->pName ); ok( r->wType == DNS_TYPE_TEXT, "wrong type %u\n", r->wType ); - ok( r->Data.TXT.dwStringCount == 3, "wrong count %u\n", r->Data.TXT.dwStringCount ); + ok( r->Data.TXT.dwStringCount == 3, "wrong count %lu\n", r->Data.TXT.dwStringCount ); ok( !strcmp( r->Data.TXT.pStringArray[0], "zy" ), "wrong string %s\n", r->Data.TXT.pStringArray[0] ); ok( !strcmp( r->Data.TXT.pStringArray[1], "" ), "wrong string %s\n", r->Data.TXT.pStringArray[1] ); ok( !strcmp( r->Data.TXT.pStringArray[2], "XY\xc3\xa9" ), "wrong string %s\n", r->Data.TXT.pStringArray[2] ); @@ -306,7 +306,7 @@ static void test_DnsExtractRecordsFromMessage(void) DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); ret = DnsExtractRecordsFromMessage_W( (DNS_MESSAGE_BUFFER *)msg_types, sizeof(msg_types), &recW ); - ok( !ret, "failed %u\n", ret ); + ok( !ret, "failed %ld\n", ret ); rW = recW; ok( rW != NULL, "record not set\n" ); ok( !wcscmp( rW->pName, L"winehq.org" ), "wrong name %s\n", debugstr_w(rW->pName) ); @@ -328,7 +328,7 @@ static void test_DnsExtractRecordsFromMessage(void) ok( r != NULL, "record not set\n" ); ok( !wcscmp( rW->pName, L"t.x" ), "wrong name %s\n", debugstr_w(rW->pName) ); ok( rW->wType == DNS_TYPE_TEXT, "wrong type %u\n", rW->wType ); - ok( rW->Data.TXT.dwStringCount == 3, "wrong count %u\n", rW->Data.TXT.dwStringCount ); + ok( rW->Data.TXT.dwStringCount == 3, "wrong count %lu\n", rW->Data.TXT.dwStringCount ); ok( !wcscmp( rW->Data.TXT.pStringArray[0], L"zy" ), "wrong string %s\n", debugstr_w(rW->Data.TXT.pStringArray[0]) ); ok( !wcscmp( rW->Data.TXT.pStringArray[1], L"" ), "wrong string %s\n", debugstr_w(rW->Data.TXT.pStringArray[1]) ); ok( !wcscmp( rW->Data.TXT.pStringArray[2], L"XY\x00e9" ), "wrong string %s\n", debugstr_w(rW->Data.TXT.pStringArray[2]) ); -- 2.30.2

1 0

[PATCH] bcrypt/tests: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 09 Feb '22

09 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/Makefile.in | 1 - dlls/bcrypt/tests/bcrypt.c | 1172 ++++++++++++++++----------------- 2 files changed, 586 insertions(+), 587 deletions(-) diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in index 70ce1a6a925..1bf7d2c48f1 100644 --- a/dlls/bcrypt/tests/Makefile.in +++ b/dlls/bcrypt/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = bcrypt.dll IMPORTS = bcrypt user32 advapi32 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0f9456fee07..46793018742 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -35,27 +35,27 @@ static void test_BCryptGenRandom(void) UCHAR buffer[256]; ret = BCryptGenRandom(NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx\n", ret); ret = BCryptGenRandom(NULL, buffer, 0, 0); - ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx\n", ret); ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), 0); - ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx\n", ret); ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); - ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ok(ret == STATUS_SUCCESS, "Expected success, got %#lx\n", ret); ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); - ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ok(ret == STATUS_SUCCESS, "Expected success, got %#lx\n", ret); ret = BCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); /* Zero sized buffer should work too */ ret = BCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); - ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ok(ret == STATUS_SUCCESS, "Expected success, got %#lx\n", ret); /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ memset(buffer, 0, 16); ret = BCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); - ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ok(ret == STATUS_SUCCESS, "Expected success, got %#lx\n", ret); ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } @@ -87,11 +87,11 @@ todo_wine RegCloseKey(hkey); ret = BCryptGetFipsAlgorithmMode(&enabled); - ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %#lx\n", ret); ok(enabled == expected, "expected result %d, got %d\n", expected, enabled); ret = BCryptGetFipsAlgorithmMode(NULL); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); } static void format_hash(const UCHAR *bytes, ULONG size, char *buf) @@ -113,32 +113,32 @@ static void _test_object_length(unsigned line, void *handle) len = size = 0xdeadbeef; status = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok_(__FILE__,line)(status == STATUS_INVALID_HANDLE, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(status == STATUS_INVALID_HANDLE, "BCryptGetProperty failed: %#lx\n", status); len = size = 0xdeadbeef; status = BCryptGetProperty(handle, NULL, (UCHAR *)&len, sizeof(len), &size, 0); - ok_(__FILE__,line)(status == STATUS_INVALID_PARAMETER, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(status == STATUS_INVALID_PARAMETER, "BCryptGetProperty failed: %#lx\n", status); len = size = 0xdeadbeef; status = BCryptGetProperty(handle, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); - ok_(__FILE__,line)(status == STATUS_INVALID_PARAMETER, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(status == STATUS_INVALID_PARAMETER, "BCryptGetProperty failed: %#lx\n", status); len = size = 0xdeadbeef; status = BCryptGetProperty(handle, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); - ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %#lx\n", status); + ok_(__FILE__,line)(size == sizeof(len), "got %lu\n", size); len = size = 0xdeadbeef; status = BCryptGetProperty(handle, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); - ok_(__FILE__,line)(status == STATUS_BUFFER_TOO_SMALL, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(len == 0xdeadbeef, "got %u\n", len); - ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); + ok_(__FILE__,line)(status == STATUS_BUFFER_TOO_SMALL, "BCryptGetProperty failed: %#lx\n", status); + ok_(__FILE__,line)(len == 0xdeadbeef, "got %lu\n", len); + ok_(__FILE__,line)(size == sizeof(len), "got %lu\n", size); len = size = 0xdeadbeef; status = BCryptGetProperty(handle, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %#lx\n", status); ok_(__FILE__,line)(len != 0xdeadbeef, "len not set\n"); - ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); + ok_(__FILE__,line)(size == sizeof(len), "got %lu\n", size); } #define test_hash_length(a,b) _test_hash_length(__LINE__,a,b) @@ -148,9 +148,9 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) NTSTATUS status; status = BCryptGetProperty(handle, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); - ok_(__FILE__,line)(len == exlen, "len = %u, expected %u\n", len, exlen); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %#lx\n", status); + ok_(__FILE__,line)(size == sizeof(len), "got %lu\n", size); + ok_(__FILE__,line)(len == exlen, "len = %lu, expected %lu\n", len, exlen); } #define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) @@ -162,8 +162,8 @@ static void _test_alg_name(unsigned line, void *handle, const WCHAR *exname) NTSTATUS status; status = BCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); - ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == (lstrlenW(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %#lx\n", status); + ok_(__FILE__,line)(size == (lstrlenW(exname) + 1) * sizeof(WCHAR), "got %lu\n", size); ok_(__FILE__,line)(!lstrcmpW(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(exname)); } @@ -189,7 +189,7 @@ static void test_hash(const struct hash_test *test) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); test_object_length(alg); @@ -199,122 +199,122 @@ static void test_hash(const struct hash_test *test) hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(hash != NULL, "hash not set\n"); ret = BCryptHashData(hash, NULL, 0, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); test_hash_length(hash, test->hash_size); test_alg_name(hash, test->alg); memset(hash_buf, 0, sizeof(hash_buf)); ret = BCryptFinishHash(hash, hash_buf, test->hash_size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( hash_buf, test->hash_size, str ); ok(!strcmp(str, test->hash), "got %s\n", str); ret = BCryptDestroyHash(hash); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, BCRYPT_HASH_REUSABLE_FLAG); - ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %#lx\n", ret); if (ret == STATUS_SUCCESS) { ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); memset(hash_buf, 0, sizeof(hash_buf)); ret = BCryptFinishHash(hash, hash_buf, test->hash_size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( hash_buf, test->hash_size, str ); ok(!strcmp(str, test->hash), "got %s\n", str); /* reuse it */ ret = BCryptHashData(hash, (UCHAR *)"tset", sizeof("tset"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); memset(hash_buf, 0, sizeof(hash_buf)); ret = BCryptFinishHash(hash, hash_buf, test->hash_size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( hash_buf, test->hash_size, str ); ok(!strcmp(str, test->hash2), "got %s\n", str); ret = BCryptDestroyHash(hash); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); hash = NULL; len = sizeof(buf_hmac); ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(hash != NULL, "hash not set\n"); ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); test_hash_length(hash, test->hash_size); test_alg_name(hash, test->alg); memset(hmac_hash, 0, sizeof(hmac_hash)); ret = BCryptFinishHash(hash, hmac_hash, test->hash_size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( hmac_hash, test->hash_size, str ); ok(!strcmp(str, test->hmac_hash), "got %s\n", str); ret = BCryptDestroyHash(hash); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); hash = NULL; len = sizeof(buf_hmac); ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), BCRYPT_HASH_REUSABLE_FLAG); - ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %#lx\n", ret); if (ret == STATUS_SUCCESS) { ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); memset(hmac_hash, 0, sizeof(hmac_hash)); ret = BCryptFinishHash(hash, hmac_hash, test->hash_size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( hmac_hash, test->hash_size, str ); ok(!strcmp(str, test->hmac_hash), "got %s\n", str); /* reuse it */ ret = BCryptHashData(hash, (UCHAR *)"tset", sizeof("tset"), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); memset(hmac_hash, 0, sizeof(hmac_hash)); ret = BCryptFinishHash(hash, hmac_hash, test->hash_size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( hmac_hash, test->hash_size, str ); ok(!strcmp(str, test->hmac_hash2), "got %s\n", str); ret = BCryptDestroyHash(hash); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } ret = BCryptDestroyHash(hash); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptDestroyHash(NULL); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static void test_hashes(void) @@ -397,7 +397,7 @@ static void test_BcryptHash(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 16); @@ -405,26 +405,26 @@ static void test_BcryptHash(void) memset(md5, 0, sizeof(md5)); ret = pBCryptHash(alg, NULL, 0, (UCHAR *)"test", sizeof("test"), md5, sizeof(md5)); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( md5, sizeof(md5), str ); ok(!strcmp(str, expected), "got %s\n", str); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); alg = NULL; memset(md5_hmac, 0, sizeof(md5_hmac)); ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); ret = pBCryptHash(alg, (UCHAR *)"key", sizeof("key"), (UCHAR *)"test", sizeof("test"), md5_hmac, sizeof(md5_hmac)); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash( md5_hmac, sizeof(md5_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } /* test vectors from RFC 6070 */ @@ -472,7 +472,7 @@ static void test_BcryptDeriveKeyPBKDF2(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 20); @@ -480,20 +480,20 @@ static void test_BcryptDeriveKeyPBKDF2(void) ret = BCryptDeriveKeyPBKDF2(alg, rfc6070[0].pwd, rfc6070[0].pwd_len, rfc6070[0].salt, rfc6070[0].salt_len, 0, buf, rfc6070[0].dk_len, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); for (i = 0; i < ARRAY_SIZE(rfc6070); i++) { memset(buf, 0, sizeof(buf)); ret = BCryptDeriveKeyPBKDF2(alg, rfc6070[i].pwd, rfc6070[i].pwd_len, rfc6070[i].salt, rfc6070[i].salt_len, rfc6070[i].iterations, buf, rfc6070[i].dk_len, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); format_hash(buf, rfc6070[i].dk_len, str); ok(!memcmp(str, rfc6070[i].dk, rfc6070[i].dk_len), "got %s\n", str); } ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static void test_rng(void) @@ -505,26 +505,26 @@ static void test_rng(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RNG_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); len = size = 0xdeadbeef; ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); test_alg_name(alg, L"RNG"); memset(buf, 0, 16); ret = BCryptGenRandom(alg, buf, 8, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(memcmp(buf, buf + 8, 8), "got zeroes\n"); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static void test_aes(void) @@ -537,62 +537,62 @@ static void test_aes(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_AES_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0; ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(len, "expected non-zero len\n"); - ok(size == sizeof(len), "got %u\n", size); + ok(size == sizeof(len), "got %lu\n", size); len = size = 0; ret = BCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 16, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(len == 16, "got %lu\n", len); + ok(size == sizeof(len), "got %lu\n", size); size = 0; ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 64, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 64, "got %lu\n", size); size = 0; ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 64, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 64, "got %lu\n", size); size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); - ok(size == 64, "got %u\n", size); + ok(size == 64, "got %lu\n", size); size = 0; memset(&key_lengths, 0, sizeof(key_lengths)); ret = BCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(key_lengths), "got %u\n", size); - ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); - ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); - ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(key_lengths), "got %lu\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %lu\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %lu\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %lu\n", key_lengths.dwIncrement); memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); ret = BCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); - ok(size == 64, "got %u\n", size); + ok(size == 64, "got %lu\n", size); test_alg_name(alg, L"AES"); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static void test_3des(void) @@ -605,55 +605,55 @@ static void test_3des(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_3DES_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0; ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(len, "expected non-zero len\n"); - ok(size == sizeof(len), "got %u\n", size); + ok(size == sizeof(len), "got %lu\n", size); len = size = 0; ret = BCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 8, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(len == 8, "got %lu\n", len); + ok(size == sizeof(len), "got %lu\n", size); size = 0; ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 64, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 64, "got %lu\n", size); size = 0; ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 64, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 64, "got %lu\n", size); size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); - ok(size == 64, "got %u\n", size); + ok(size == 64, "got %lu\n", size); size = 0; memset(&key_lengths, 0, sizeof(key_lengths)); ret = BCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(key_lengths), "got %u\n", size); - ok(key_lengths.dwMinLength == 192, "Expected 192, got %d\n", key_lengths.dwMinLength); - ok(key_lengths.dwMaxLength == 192, "Expected 192, got %d\n", key_lengths.dwMaxLength); - ok(key_lengths.dwIncrement == 0, "Expected 0, got %d\n", key_lengths.dwIncrement); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(key_lengths), "got %lu\n", size); + ok(key_lengths.dwMinLength == 192, "Expected 192, got %lu\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 192, "Expected 192, got %lu\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 0, "Expected 0, got %lu\n", key_lengths.dwIncrement); memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); ret = BCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); test_alg_name(alg, L"3DES"); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static void test_BCryptGenerateSymmetricKey(void) @@ -674,15 +674,15 @@ static void test_BCryptGenerateSymmetricKey(void) NTSTATUS ret; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); len = size = 0xdeadbeef; ret = BCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key = (void *)0xdeadbeef; ret = BCryptGenerateSymmetricKey(NULL, &key, NULL, 0, secret, sizeof(secret), 0); - ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); ok(key == (void *)0xdeadbeef, "got %p\n", key); key = NULL; @@ -690,80 +690,80 @@ static void test_BCryptGenerateSymmetricKey(void) key = (BCRYPT_KEY_HANDLE)0xdeadbeef; ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, 1, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ok(key == (HANDLE)0xdeadbeef, "got unexpected key %p.\n", key); key = (BCRYPT_KEY_HANDLE)0xdeadbeef; ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret) + 1, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ok(key == (HANDLE)0xdeadbeef, "got unexpected key %p.\n", key); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(key != NULL, "key not set\n"); ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); - ok(size == 64, "got %u\n", size); + ok(size == 64, "got %lu\n", size); ret = BCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_ECB, 0, 0); - ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %#lx\n", ret); if (ret == STATUS_SUCCESS) { size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_ECB), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); - ok(size == 64, "got %u\n", size); + ok(size == 64, "got %lu\n", size); } ret = BCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0); - ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %#lx\n", ret); size = 0xdeadbeef; ret = BCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(!size, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(!size, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); for (i = 0; i < 16; i++) - ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + ok(ciphertext[i] == expected[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected[i]); key2 = (void *)0xdeadbeef; ret = BCryptDuplicateKey(NULL, &key2, NULL, 0, 0); - ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); ok(key2 == (void *)0xdeadbeef, "got %p\n", key2); if (0) /* crashes on some Windows versions */ { ret = BCryptDuplicateKey(key, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); } key2 = (void *)0xdeadbeef; ret = BCryptDuplicateKey(key, &key2, NULL, 0, 0); - ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER), "got %08x\n", ret); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER), "got %#lx\n", ret); if (ret == STATUS_SUCCESS) { @@ -771,62 +771,62 @@ static void test_BCryptGenerateSymmetricKey(void) memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key2, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); for (i = 0; i < 16; i++) - ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + ok(ciphertext[i] == expected[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected[i]); ret = BCryptDestroyKey(key2); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } size = 0xdeadbeef; ret = BCryptDecrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(!size, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(!size, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext, 16, NULL, ivbuf, 16, plaintext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "wrong mode\n"); len = 0; size = 0; ret = BCryptGetProperty(key, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 16, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(len == 16, "got %lu\n", len); + ok(size == sizeof(len), "got %lu\n", size); size = 0; memset(&key_lengths, 0, sizeof(key_lengths)); ret = BCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(key_lengths), "got %u\n", size); - ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); - ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); - ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(key_lengths), "got %lu\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %lu\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %lu\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %lu\n", key_lengths.dwIncrement); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptCloseAlgorithmProvider(aes, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } #define RACE_TEST_COUNT 200 @@ -874,8 +874,8 @@ static DWORD WINAPI encrypt_race_thread(void *parameter) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); for (i = 0; i < 32; i++) @@ -953,7 +953,7 @@ static void test_BCryptEncrypt(void) NTSTATUS ret; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); /****************** * AES - CBC mode * @@ -962,37 +962,37 @@ static void test_BCryptEncrypt(void) len = 0xdeadbeef; size = sizeof(len); ret = BCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(key != NULL, "key not set\n"); /* input size is a multiple of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); for (i = 0; i < 16; i++) - ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + ok(ciphertext[i] == expected[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected[i]); /* NULL initialization vector */ size = 0; memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 16, NULL, NULL, 0, ciphertext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); todo_wine ok(!memcmp(ciphertext, expected8, sizeof(expected8)), "wrong data\n"); /* all zero initialization vector */ @@ -1000,103 +1000,103 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0, sizeof(ciphertext)); memset(ivbuf, 0, sizeof(ivbuf)); ret = BCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(ciphertext, expected9, sizeof(expected9)), "wrong data\n"); for (i = 0; i < 16; i++) - ok(ciphertext[i] == expected9[i], "%u: %02x != %02x\n", i, ciphertext[i], expected9[i]); + ok(ciphertext[i] == expected9[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected9[i]); /* input size is not a multiple of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data, 17, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); - ok(size == 17, "got %u\n", size); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %#lx\n", ret); + ok(size == 17, "got %lu\n", size); /* input size is not a multiple of block size, block padding set */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data, 17, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 17, NULL, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected2, sizeof(expected2)), "wrong data\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected2[i], "%u: %02x != %02x\n", i, ciphertext[i], expected2[i]); + ok(ciphertext[i] == expected2[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected2[i]); /* input size is a multiple of block size, block padding set */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); ok(!memcmp(ciphertext, expected3, sizeof(expected3)), "wrong data\n"); for (i = 0; i < 48; i++) - ok(ciphertext[i] == expected3[i], "%u: %02x != %02x\n", i, ciphertext[i], expected3[i]); + ok(ciphertext[i] == expected3[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected3[i]); /* output size too small */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 17, NULL, ivbuf, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); /* 256 bit key */ buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); /* Key generations succeeds if the key size exceeds maximum and uses maximum key length * from secret. */ ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256) + 1, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); ok(!memcmp(ciphertext, expected10, sizeof(expected10)), "wrong data\n"); for (i = 0; i < 48; i++) - ok(ciphertext[i] == expected10[i], "%u: %02x != %02x\n", i, ciphertext[i], expected10[i]); + ok(ciphertext[i] == expected10[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected10[i]); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); /****************** @@ -1105,38 +1105,38 @@ static void test_BCryptEncrypt(void) size = 0; ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(tag_length), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(tag_length), "got %lu\n", size); size = 0; memset(&tag_length, 0, sizeof(tag_length)); ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(tag_length), "got %u\n", size); - ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength); - ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength); - ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(tag_length), "got %lu\n", size); + ok(tag_length.dwMinLength == 12, "Expected 12, got %lu\n", tag_length.dwMinLength); + ok(tag_length.dwMaxLength == 16, "Expected 16, got %lu\n", tag_length.dwMaxLength); + ok(tag_length.dwIncrement == 1, "Expected 1, got %lu\n", tag_length.dwIncrement); len = 0xdeadbeef; size = sizeof(len); ret = BCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(key != NULL, "key not set\n"); ret = BCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); @@ -1152,28 +1152,28 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag[i]); /* NULL initialization vector */ size = 0; memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag[i]); /* all zero initialization vector */ size = 0; @@ -1181,14 +1181,14 @@ static void test_BCryptEncrypt(void) memset(tag, 0xff, sizeof(tag)); memset(ivbuf, 0, sizeof(ivbuf)); ret = BCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag[i]); /* input size is not multiple of block size */ size = 0; @@ -1196,14 +1196,14 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 24, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 24, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) - ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + ok(tag[i] == expected_tag2[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag2[i]); /* test with auth data */ auth_info.pbAuthData = auth_data; @@ -1214,40 +1214,40 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + ok(tag[i] == expected_tag3[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag3[i]); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(!size, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(!size, "got %lu\n", size); for (i = 0; i < 16; i++) - ok(tag[i] == 0xff, "%u: %02x != %02x\n", i, tag[i], 0xff); + ok(tag[i] == 0xff, "%lu: %02x != %02x\n", i, tag[i], 0xff); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, NULL, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(!size, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(!size, "got %lu\n", size); ok(!memcmp(tag, expected_tag4, sizeof(expected_tag4)), "wrong tag\n"); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag4[i], "%u: %02x != %02x\n", i, tag[i], expected_tag4[i]); + ok(tag[i] == expected_tag4[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag4[i]); /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); - todo_wine ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + todo_wine ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); /* race test */ @@ -1263,20 +1263,20 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = BCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); ok(!memcmp(tag, expected_tag3, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + ok(tag[i] == expected_tag3[i], "%lu: %02x != %02x\n", i, tag[i], expected_tag3[i]); } WaitForSingleObject(hthread, INFINITE); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); /****************** @@ -1284,94 +1284,94 @@ static void test_BCryptEncrypt(void) ******************/ ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); len = 0xdeadbeef; size = sizeof(len); ret = BCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); /* initialization vector is not allowed */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); /* input size is a multiple of block size */ size = 0; ret = BCryptEncrypt(key, data, 16, NULL, NULL, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); size = 0; memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 16, NULL, NULL, 16, ciphertext, 16, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(ciphertext, expected5, sizeof(expected5)), "wrong data\n"); for (i = 0; i < 16; i++) - ok(ciphertext[i] == expected5[i], "%u: %02x != %02x\n", i, ciphertext[i], expected5[i]); + ok(ciphertext[i] == expected5[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected5[i]); /* input size is not a multiple of block size */ size = 0; ret = BCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, 0); - ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); - ok(size == 17, "got %u\n", size); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %#lx\n", ret); + ok(size == 17, "got %lu\n", size); /* input size is not a multiple of block size, block padding set */ size = 0; ret = BCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(ciphertext, expected6, sizeof(expected6)), "wrong data\n"); for (i = 0; i < 32; i++) - ok(ciphertext[i] == expected6[i], "%u: %02x != %02x\n", i, ciphertext[i], expected6[i]); + ok(ciphertext[i] == expected6[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected6[i]); /* input size is a multiple of block size, block padding set */ size = 0; ret = BCryptEncrypt(key, data2, 32, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); size = 0; memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); ok(!memcmp(ciphertext, expected7, sizeof(expected7)), "wrong data\n"); for (i = 0; i < 48; i++) - ok(ciphertext[i] == expected7[i], "%u: %02x != %02x\n", i, ciphertext[i], expected7[i]); + ok(ciphertext[i] == expected7[i], "%lu: %02x != %02x\n", i, ciphertext[i], expected7[i]); /* output size too small */ size = 0; memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memset(ciphertext, 0, sizeof(ciphertext)); ret = BCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptCloseAlgorithmProvider(aes, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static void test_BCryptDecrypt(void) @@ -1425,16 +1425,16 @@ static void test_BCryptDecrypt(void) NTSTATUS ret; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; memset(&key_lengths, 0, sizeof(key_lengths)); ret = BCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(key_lengths), "got %u\n", size); - ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); - ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); - ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(key_lengths), "got %lu\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %lu\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %lu\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %lu\n", key_lengths.dwIncrement); /****************** * AES - CBC mode * @@ -1443,100 +1443,100 @@ static void test_BCryptDecrypt(void) len = 0xdeadbeef; size = sizeof(len); ret = BCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(key != NULL, "key not set\n"); /* input size is a multiple of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); /* test with padding smaller than block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext2, 32, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext2, 32, NULL, ivbuf, 16, plaintext, 17, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 17, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 17, "got %lu\n", size); ok(!memcmp(plaintext, expected2, sizeof(expected2)), "wrong data\n"); /* test with padding of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext3, 48, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext3, 48, NULL, ivbuf, 16, plaintext, 32, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* output size too small */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, plaintext, 31, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext2, 32, NULL, ivbuf, 16, plaintext, 15, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext2, 32, NULL, ivbuf, 16, plaintext, 16, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 17, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 17, "got %lu\n", size); size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext3, 48, NULL, ivbuf, 16, plaintext, 31, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); /* input size is not a multiple of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext, 17, NULL, ivbuf, 16, NULL, 0, &size, 0); - ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); - ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %#lx\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %lu\n", size); /* input size is not a multiple of block size, block padding set */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext, 17, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); - ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %#lx\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); /****************** @@ -1544,16 +1544,16 @@ static void test_BCryptDecrypt(void) ******************/ ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(key != NULL, "key not set\n"); ret = BCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_lengths, sizeof(tag_lengths), &size, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); @@ -1568,8 +1568,8 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with auth data */ @@ -1582,19 +1582,19 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = BCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); /****************** @@ -1602,114 +1602,114 @@ static void test_BCryptDecrypt(void) ******************/ ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); len = 0xdeadbeef; size = sizeof(len); ret = BCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = BCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); /* initialization vector is not allowed */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); ret = BCryptDecrypt(key, ciphertext5, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); /* input size is a multiple of block size */ size = 0; ret = BCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 32, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); /* test with padding smaller than block size */ size = 0; ret = BCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 17, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 17, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 17, "got %lu\n", size); ok(!memcmp(plaintext, expected2, sizeof(expected2)), "wrong data\n"); /* test with padding of block size */ size = 0; ret = BCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); size = 0; memset(plaintext, 0, sizeof(plaintext)); ret = BCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 32, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* output size too small */ size = 0; ret = BCryptDecrypt(key, ciphertext4, 32, NULL, NULL, 16, plaintext, 31, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; ret = BCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 15, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 32, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 32, "got %lu\n", size); size = 0; ret = BCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 16, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 17, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 17, "got %lu\n", size); size = 0; ret = BCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 31, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == 48, "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == 48, "got %lu\n", size); /* input size is not a multiple of block size */ size = 0; ret = BCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, 0); - ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); - ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %#lx\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %lu\n", size); /* input size is not a multiple of block size, block padding set */ size = 0; ret = BCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); - ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); - ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %#lx\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptDestroyKey(NULL); - ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(aes, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(aes, 0); - ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(NULL, 0); - ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); } static void test_key_import_export(void) @@ -1723,7 +1723,7 @@ static void test_key_import_export(void) ULONG size; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key_data1->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; key_data1->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; @@ -1732,7 +1732,7 @@ static void test_key_import_export(void) key = NULL; ret = BCryptImportKey(aes, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, buffer1, sizeof(buffer1), 0); - ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %#lx\n", ret); if (ret == STATUS_INVALID_PARAMETER) { win_skip("broken BCryptImportKey\n"); @@ -1742,40 +1742,40 @@ static void test_key_import_export(void) size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 0, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == sizeof(buffer2), "got %u\n", size); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); + ok(size == sizeof(buffer2), "got %lu\n", size); size = 0; memset(buffer2, 0xff, sizeof(buffer2)); ret = BCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, sizeof(buffer2), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(buffer2), "Got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(buffer2), "Got %lu\n", size); ok(!memcmp(buffer1, buffer2, sizeof(buffer1)), "Expected exported key to match imported key\n"); /* opaque blob */ size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buffer2, 0, &size, 0); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); ok(size > 0, "got zero\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); ret = BCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); key = NULL; ret = BCryptImportKey(aes, NULL, BCRYPT_OPAQUE_KEY_BLOB, &key, NULL, 0, buf, size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(key != NULL, "key not set\n"); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptDestroyKey(key); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(aes, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); } static BYTE eccPrivkey[] = @@ -1826,7 +1826,7 @@ static void test_ECDSA(void) status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); if (status) { - skip("Failed to open ECDSA provider: %08x, skipping test\n", status); + skip("Failed to open ECDSA provider: %#lx, skipping test\n", status); return; } @@ -1836,23 +1836,23 @@ static void test_ECDSA(void) ecckey->cbKey = 2; size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); - ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", status); ecckey->dwMagic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); - ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", status); ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); - ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); status = BCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); - ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", status); status = BCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); - ok(!status, "BCryptVerifySignature failed: %08x\n", status); + ok(!status, "BCryptVerifySignature failed: %#lx\n", status); BCryptDestroyKey(key); ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; @@ -1861,25 +1861,25 @@ static void test_ECDSA(void) ecckey->cbKey = 2; size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); - ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", status); ecckey->dwMagic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; ecckey->cbKey = 32; status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); - ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", status); ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; ecckey->cbKey = 32; status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); - ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); memset( buffer, 0, sizeof(buffer) ); status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ecckey = (BCRYPT_ECCKEY_BLOB *)buffer; - ok(ecckey->dwMagic == BCRYPT_ECDSA_PRIVATE_P256_MAGIC, "got %08x\n", ecckey->dwMagic); - ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); - ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %u\n", size); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PRIVATE_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %lu\n", size); BCryptDestroyKey(key); BCryptCloseAlgorithmProvider(alg, 0); @@ -1987,152 +1987,152 @@ static void test_RSA(void) ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) { - win_skip("Failed to open RSA provider: %08x, skipping test\n", ret); + win_skip("Failed to open RSA provider: %#lx, skipping test\n", ret); return; } schemes = size = 0; ret = BCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ok(schemes, "schemes not set\n"); - ok(size == sizeof(schemes), "got %u\n", size); + ok(size == sizeof(schemes), "got %lu\n", size); ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); - ok(!ret, "BCryptImportKeyPair failed: %08x\n", ret); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(!ret, "BCryptVerifySignature failed: %08x\n", ret); + ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret); ret = BCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); ret = BCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); pad.pszAlgId = BCRYPT_AES_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %#lx\n", ret); pad.pszAlgId = NULL; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "BCryptDestroyKey failed: %08x\n", ret); + ok(!ret, "BCryptDestroyKey failed: %#lx\n", ret); /* sign/verify with export/import round-trip */ ret = BCryptGenerateKeyPair(alg, &key, 512, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; memset(sig, 0, sizeof(sig)); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); /* export private key */ size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); rsablob = (BCRYPT_RSAKEY_BLOB *)buf; - ok(rsablob->Magic == BCRYPT_RSAPRIVATE_MAGIC, "got %08x\n", rsablob->Magic); - ok(rsablob->BitLength == 512, "got %u\n", rsablob->BitLength); - ok(rsablob->cbPublicExp == 3, "got %u\n", rsablob->cbPublicExp); - ok(rsablob->cbModulus == 64, "got %u\n", rsablob->cbModulus); - ok(rsablob->cbPrime1 == 32, "got %u\n", rsablob->cbPrime1); - ok(rsablob->cbPrime2 == 32, "got %u\n", rsablob->cbPrime2); + ok(rsablob->Magic == BCRYPT_RSAPRIVATE_MAGIC, "got %#lx\n", rsablob->Magic); + ok(rsablob->BitLength == 512, "got %lu\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %lu\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 64, "got %lu\n", rsablob->cbModulus); + ok(rsablob->cbPrime1 == 32, "got %lu\n", rsablob->cbPrime1); + ok(rsablob->cbPrime2 == 32, "got %lu\n", rsablob->cbPrime2); size2 = sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus + rsablob->cbPrime1 + rsablob->cbPrime2; - ok(size == size2, "got %u expected %u\n", size2, size); + ok(size == size2, "got %lu expected %lu\n", size2, size); HeapFree(GetProcessHeap(), 0, buf); size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_RSAFULLPRIVATE_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); ret = BCryptExportKey(key, NULL, BCRYPT_RSAFULLPRIVATE_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); rsablob = (BCRYPT_RSAKEY_BLOB *)buf; - ok(rsablob->Magic == BCRYPT_RSAFULLPRIVATE_MAGIC, "got %08x\n", rsablob->Magic); - ok(rsablob->BitLength == 512, "got %u\n", rsablob->BitLength); - ok(rsablob->cbPublicExp == 3, "got %u\n", rsablob->cbPublicExp); - ok(rsablob->cbModulus == 64, "got %u\n", rsablob->cbModulus); - ok(rsablob->cbPrime1 == 32, "got %u\n", rsablob->cbPrime1); - ok(rsablob->cbPrime2 == 32, "got %u\n", rsablob->cbPrime2); + ok(rsablob->Magic == BCRYPT_RSAFULLPRIVATE_MAGIC, "got %#lx\n", rsablob->Magic); + ok(rsablob->BitLength == 512, "got %lu\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %lu\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 64, "got %lu\n", rsablob->cbModulus); + ok(rsablob->cbPrime1 == 32, "got %lu\n", rsablob->cbPrime1); + ok(rsablob->cbPrime2 == 32, "got %lu\n", rsablob->cbPrime2); size2 = sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus * 2 + rsablob->cbPrime1 * 3 + rsablob->cbPrime2 * 2; - ok(size == size2, "got %u expected %u\n", size2, size); + ok(size == size2, "got %lu expected %lu\n", size2, size); HeapFree(GetProcessHeap(), 0, buf); /* export public key */ size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_RSAPUBLIC_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPUBLIC_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); rsablob = (BCRYPT_RSAKEY_BLOB *)buf; - ok(rsablob->Magic == BCRYPT_RSAPUBLIC_MAGIC, "got %08x\n", rsablob->Magic); - ok(rsablob->BitLength == 512, "got %u\n", rsablob->BitLength); - ok(rsablob->cbPublicExp == 3, "got %u\n", rsablob->cbPublicExp); - ok(rsablob->cbModulus == 64, "got %u\n", rsablob->cbModulus); - ok(!rsablob->cbPrime1, "got %u\n", rsablob->cbPrime1); - ok(!rsablob->cbPrime2, "got %u\n", rsablob->cbPrime2); - ok(size == sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus, "got %u\n", size); + ok(rsablob->Magic == BCRYPT_RSAPUBLIC_MAGIC, "got %#lx\n", rsablob->Magic); + ok(rsablob->BitLength == 512, "got %lu\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %lu\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 64, "got %lu\n", rsablob->cbModulus); + ok(!rsablob->cbPrime1, "got %lu\n", rsablob->cbPrime1); + ok(!rsablob->cbPrime2, "got %lu\n", rsablob->cbPrime2); + ok(size == sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus, "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, buf, size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); /* import/export private key */ ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; buf = HeapAlloc(GetProcessHeap(), 0, sizeof(rsaPrivateBlob)); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, sizeof(rsaPrivateBlob), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(rsaPrivateBlob), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(rsaPrivateBlob), "got %lu\n", size); ok(!memcmp(buf, rsaPrivateBlob, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); BCryptDestroyKey(key); /* import/export full private key */ ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAFULLPRIVATE_BLOB, &key, rsaFullPrivateBlob, sizeof(rsaFullPrivateBlob), 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; buf = HeapAlloc(GetProcessHeap(), 0, sizeof(rsaFullPrivateBlob)); ret = BCryptExportKey(key, NULL, BCRYPT_RSAFULLPRIVATE_BLOB, buf, sizeof(rsaFullPrivateBlob), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(rsaFullPrivateBlob), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(rsaFullPrivateBlob), "got %lu\n", size); ok(!memcmp(buf, rsaFullPrivateBlob, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); BCryptDestroyKey(key); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); } static void test_RSA_SIGN(void) @@ -2148,86 +2148,86 @@ static void test_RSA_SIGN(void) ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_SIGN_ALGORITHM, NULL, 0); if (ret) { - win_skip("Failed to open RSA_SIGN provider: %08x, skipping test\n", ret); + win_skip("Failed to open RSA_SIGN provider: %#lx, skipping test\n", ret); return; } ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); - ok(!ret, "BCryptImportKeyPair failed: %08x\n", ret); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(!ret, "BCryptVerifySignature failed: %08x\n", ret); + ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret); ret = BCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); ret = BCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %#lx\n", ret); pad.pszAlgId = BCRYPT_AES_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %#lx\n", ret); pad.pszAlgId = NULL; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); - ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "BCryptDestroyKey failed: %08x\n", ret); + ok(!ret, "BCryptDestroyKey failed: %#lx\n", ret); /* export private key */ ret = BCryptGenerateKeyPair(alg, &key, 512, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); rsablob = (BCRYPT_RSAKEY_BLOB *)buf; - ok(rsablob->Magic == BCRYPT_RSAPRIVATE_MAGIC, "got %08x\n", rsablob->Magic); - ok(rsablob->BitLength == 512, "got %u\n", rsablob->BitLength); - ok(rsablob->cbPublicExp == 3, "got %u\n", rsablob->cbPublicExp); - ok(rsablob->cbModulus == 64, "got %u\n", rsablob->cbModulus); - ok(rsablob->cbPrime1 == 32, "got %u\n", rsablob->cbPrime1); - ok(rsablob->cbPrime2 == 32, "got %u\n", rsablob->cbPrime2); + ok(rsablob->Magic == BCRYPT_RSAPRIVATE_MAGIC, "got %#lx\n", rsablob->Magic); + ok(rsablob->BitLength == 512, "got %lu\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %lu\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 64, "got %lu\n", rsablob->cbModulus); + ok(rsablob->cbPrime1 == 32, "got %lu\n", rsablob->cbPrime1); + ok(rsablob->cbPrime2 == 32, "got %lu\n", rsablob->cbPrime2); size2 = sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus + rsablob->cbPrime1 + rsablob->cbPrime2; - ok(size == size2, "got %u expected %u\n", size2, size); + ok(size == size2, "got %lu expected %lu\n", size2, size); HeapFree(GetProcessHeap(), 0, buf); size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_RSAFULLPRIVATE_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); ret = BCryptExportKey(key, NULL, BCRYPT_RSAFULLPRIVATE_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); rsablob = (BCRYPT_RSAKEY_BLOB *)buf; - ok(rsablob->Magic == BCRYPT_RSAFULLPRIVATE_MAGIC, "got %08x\n", rsablob->Magic); - ok(rsablob->BitLength == 512, "got %u\n", rsablob->BitLength); - ok(rsablob->cbPublicExp == 3, "got %u\n", rsablob->cbPublicExp); - ok(rsablob->cbModulus == 64, "got %u\n", rsablob->cbModulus); - ok(rsablob->cbPrime1 == 32, "got %u\n", rsablob->cbPrime1); - ok(rsablob->cbPrime2 == 32, "got %u\n", rsablob->cbPrime2); + ok(rsablob->Magic == BCRYPT_RSAFULLPRIVATE_MAGIC, "got %#lx\n", rsablob->Magic); + ok(rsablob->BitLength == 512, "got %lu\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %lu\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 64, "got %lu\n", rsablob->cbModulus); + ok(rsablob->cbPrime1 == 32, "got %lu\n", rsablob->cbPrime1); + ok(rsablob->cbPrime2 == 32, "got %lu\n", rsablob->cbPrime2); size2 = sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus * 2 + rsablob->cbPrime1 * 3 + rsablob->cbPrime2 * 2; - ok(size == size2, "got %u expected %u\n", size2, size); + ok(size == size2, "got %lu expected %lu\n", size2, size); HeapFree(GetProcessHeap(), 0, buf); BCryptDestroyKey(key); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "BCryptCloseAlgorithmProvider failed: %08x\n", ret); + ok(!ret, "BCryptCloseAlgorithmProvider failed: %#lx\n", ret); } static BYTE eccprivkey[] = @@ -2292,75 +2292,75 @@ static void test_ECDH(void) status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDH_P256_ALGORITHM, NULL, 0); if (status) { - skip("Failed to open BCRYPT_ECDH_P256_ALGORITHM provider %08x\n", status); + skip("Failed to open BCRYPT_ECDH_P256_ALGORITHM provider %#lx\n", status); return; } key = NULL; status = BCryptGenerateKeyPair(alg, &key, 256, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(key != NULL, "key not set\n"); status = BCryptFinalizeKeyPair(key, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); size = 0; status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, NULL, 0, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buf, size, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ecckey = (BCRYPT_ECCKEY_BLOB *)buf; - ok(ecckey->dwMagic == BCRYPT_ECDH_PUBLIC_P256_MAGIC, "got %08x\n", ecckey->dwMagic); - ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); - ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %u\n", size); + ok(ecckey->dwMagic == BCRYPT_ECDH_PUBLIC_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %lu\n", size); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, buf, size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); size = 0; status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, NULL, 0, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buf, size, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ecckey = (BCRYPT_ECCKEY_BLOB *)buf; - ok(ecckey->dwMagic == BCRYPT_ECDH_PRIVATE_P256_MAGIC, "got %08x\n", ecckey->dwMagic); - ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); - ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %u\n", size); + ok(ecckey->dwMagic == BCRYPT_ECDH_PRIVATE_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %lu\n", size); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &privkey, buf, size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); BCryptDestroyKey(pubkey); BCryptDestroyKey(privkey); BCryptDestroyKey(key); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &privkey, eccprivkey, sizeof(eccprivkey), 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); size = 0; status = BCryptExportKey(privkey, NULL, BCRYPT_ECCPRIVATE_BLOB, NULL, 0, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), 0, size); status = BCryptExportKey(privkey, NULL, BCRYPT_ECCPRIVATE_BLOB, buf, size, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); - ok(size == sizeof(eccprivkey), "got %u\n", size); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(size == sizeof(eccprivkey), "got %lu\n", size); ok(!memcmp(buf, eccprivkey, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, ecdh_pubkey, sizeof(ecdh_pubkey), 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptSecretAgreement(privkey, pubkey, &secret, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); if (status != STATUS_SUCCESS) { @@ -2376,53 +2376,53 @@ static void test_ECDH(void) goto raw_secret_end; } - todo_wine ok(status == STATUS_SUCCESS, "got %08x\n", status); + todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); if (status != STATUS_SUCCESS) { goto raw_secret_end; } - ok(size == 32, "size of secret key incorrect, got %u, expected 32\n", size); + ok(size == 32, "size of secret key incorrect, got %lu, expected 32\n", size); buf = HeapAlloc(GetProcessHeap(), 0, size); status = BCryptDeriveKey(secret, BCRYPT_KDF_RAW_SECRET, NULL, buf, size, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(!(memcmp(ecdh_secret, buf, size)), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); raw_secret_end: status = BCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); - todo_wine ok (status == STATUS_SUCCESS, "got %08x\n", status); + todo_wine ok (status == STATUS_SUCCESS, "got %#lx\n", status); if (status != STATUS_SUCCESS) { goto derive_end; } - ok (size == 20, "got %u\n", size); + ok (size == 20, "got %lu\n", size); buf = HeapAlloc(GetProcessHeap(), 0, size); status = BCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, buf, size, &size, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(!(memcmp(hashed_secret, buf, size)), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); /* ulVersion is not verified */ hash_params.ulVersion = 0xdeadbeef; status = BCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); - ok (status == STATUS_SUCCESS, "got %08x\n", status); + ok (status == STATUS_SUCCESS, "got %#lx\n", status); hash_params.ulVersion = BCRYPTBUFFER_VERSION; hash_param_buffers[0].pvBuffer = (void*) L"INVALID"; hash_param_buffers[0].cbBuffer = sizeof(L"INVALID"); status = BCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); - ok (status == STATUS_NOT_SUPPORTED || broken (status == STATUS_NOT_FOUND) /* < win8 */, "got %08x\n", status); + ok (status == STATUS_NOT_SUPPORTED || broken (status == STATUS_NOT_FOUND) /* < win8 */, "got %#lx\n", status); hash_param_buffers[0].pvBuffer = (void*) BCRYPT_RNG_ALGORITHM; hash_param_buffers[0].cbBuffer = sizeof(BCRYPT_RNG_ALGORITHM); status = BCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); - ok (status == STATUS_NOT_SUPPORTED, "got %08x\n", status); + ok (status == STATUS_NOT_SUPPORTED, "got %#lx\n", status); derive_end: @@ -2440,7 +2440,7 @@ static void test_BCryptEnumContextFunctions(void) buffer = NULL; status = BCryptEnumContextFunctions( CRYPT_LOCAL, L"SSL", NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); - todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); + todo_wine ok( status == STATUS_SUCCESS, "got %#lx\n", status); if (status == STATUS_SUCCESS) BCryptFreeBuffer( buffer ); } @@ -2482,94 +2482,94 @@ static void test_BCryptSignHash(void) ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) { - win_skip("failed to open RSA provider: %08x\n", ret); + win_skip("failed to open RSA provider: %#lx\n", ret); return; } /* public key */ ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsapublic, sizeof(rsapublic), 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); len = 0; pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptSignHash(key, &pad, NULL, 0, NULL, 0, &len, BCRYPT_PAD_PKCS1); - ok(!ret, "got %08x\n", ret); - ok(len == 256, "got %u\n", len); + ok(!ret, "got %#lx\n", ret); + ok(len == 256, "got %lu\n", len); /* test len return when only output is NULL, as described in BCryptSignHash doc */ ret = BCryptSignHash(key, &pad, hash, sizeof(hash), NULL, 0, &len, BCRYPT_PAD_PKCS1); - ok(!ret, "got %08x\n", ret); - ok(len == 256, "got %u\n", len); + ok(!ret, "got %#lx\n", ret); + ok(len == 256, "got %lu\n", len); len = 0; ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); - ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptGenerateKeyPair(alg, &key, 512, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); len = 0; memset(sig, 0, sizeof(sig)); /* inference of padding info on RSA not supported */ ret = BCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, 0, &len, BCRYPT_PAD_PKCS1); - ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", ret); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); - ok(!ret, "got %08x\n", ret); - ok(len == 64, "got %u\n", len); + ok(!ret, "got %#lx\n", ret); + ok(len == 64, "got %lu\n", len); ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); /* ECDSA */ ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); if (ret) { - win_skip("failed to open ECDSA provider: %08x\n", ret); + win_skip("failed to open ECDSA provider: %#lx\n", ret); return; } ret = BCryptGenerateKeyPair(alg, &key, 256, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); memset(sig, 0, sizeof(sig)); len = 0; /* automatically detects padding info */ ret = BCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); - ok (!ret, "got %08x\n", ret); - ok (len == 64, "got %u\n", len); + ok (!ret, "got %#lx\n", ret); + ok (len == 64, "got %lu\n", len); ret = BCryptVerifySignature(key, NULL, hash, sizeof(hash), sig, len, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); /* mismatch info (SHA-1 != SHA-256) */ ret = BCryptSignHash(key, &pad, hash_sha256, sizeof(hash_sha256), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); - ok (ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok (ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); } static void test_BCryptEnumAlgorithms(void) @@ -2579,23 +2579,23 @@ static void test_BCryptEnumAlgorithms(void) ULONG count; ret = BCryptEnumAlgorithms(0, NULL, NULL, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptEnumAlgorithms(0, &count, NULL, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptEnumAlgorithms(0, NULL, &list, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ret = BCryptEnumAlgorithms(~0u, &count, &list, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); count = 0; list = NULL; ret = BCryptEnumAlgorithms(0, &count, &list, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ok(list != NULL, "NULL list\n"); - ok(count, "got %u\n", count); + ok(count, "got %lu\n", count); BCryptFreeBuffer( list ); } @@ -2615,11 +2615,11 @@ static void test_aes_vector(void) NTSTATUS ret; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_AES_ALGORITHM, NULL, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); size = sizeof(BCRYPT_CHAIN_MODE_CBC); ret = BCryptSetProperty(alg, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, size, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); blob->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; blob->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; @@ -2627,7 +2627,7 @@ static void test_aes_vector(void) memcpy(data + sizeof(*blob), secret, sizeof(secret)); size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + sizeof(secret); ret = BCryptImportKey(alg, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, data, size, 0); - ok(!ret || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); + ok(!ret || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %#lx\n", ret); if (ret == STATUS_INVALID_PARAMETER) { win_skip("broken BCryptImportKey\n"); @@ -2639,16 +2639,16 @@ static void test_aes_vector(void) size = 0; memset(output, 0, sizeof(output)); ret = BCryptEncrypt(key, input, sizeof(input), NULL, iv, sizeof(iv), output, sizeof(output), &size, 0); - ok(!ret, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(!ret, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(output, expect, sizeof(expect)), "wrong cipher text\n"); /* same initialization vector */ size = 0; memset(output, 0, sizeof(output)); ret = BCryptEncrypt(key, input, sizeof(input), NULL, iv, sizeof(iv), output, sizeof(output), &size, 0); - ok(!ret, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(!ret, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); ok(!memcmp(output, expect2, sizeof(expect2)), "wrong cipher text\n"); /* different initialization vector */ @@ -2656,15 +2656,15 @@ static void test_aes_vector(void) size = 0; memset(output, 0, sizeof(output)); ret = BCryptEncrypt(key, input, sizeof(input), NULL, iv, sizeof(iv), output, sizeof(output), &size, 0); - ok(!ret, "got %08x\n", ret); - ok(size == 16, "got %u\n", size); + ok(!ret, "got %#lx\n", ret); + ok(size == 16, "got %lu\n", size); todo_wine ok(!memcmp(output, expect3, sizeof(expect3)), "wrong cipher text\n"); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); } static void test_BcryptDeriveKeyCapi(void) @@ -2680,10 +2680,10 @@ static void test_BcryptDeriveKeyCapi(void) NTSTATUS ret; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, NULL, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); - ok(!ret || broken(ret == STATUS_INVALID_PARAMETER) /* win2k8 */, "got %08x\n", ret); + ok(!ret || broken(ret == STATUS_INVALID_PARAMETER) /* win2k8 */, "got %#lx\n", ret); if (ret == STATUS_INVALID_PARAMETER) { win_skip( "broken BCryptCreateHash\n" ); @@ -2691,66 +2691,66 @@ static void test_BcryptDeriveKeyCapi(void) } ret = BCryptDeriveKeyCapi(NULL, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER || ret == STATUS_INVALID_HANDLE /* win7 */, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || ret == STATUS_INVALID_HANDLE /* win7 */, "got %#lx\n", ret); ret = BCryptDeriveKeyCapi(hash, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %#lx\n", ret); ret = BCryptDestroyHash(hash); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptDeriveKeyCapi(hash, NULL, key, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %#lx\n", ret); ret = BCryptDestroyHash(hash); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); memset(key, 0, sizeof(key)); ret = BCryptDeriveKeyCapi(hash, NULL, key, 41, 0); - ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %#lx\n", ret); if (!ret) ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); ret = BCryptDestroyHash(hash); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); memset(key, 0, sizeof(key)); ret = BCryptDeriveKeyCapi(hash, NULL, key, 20, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); ret = BCryptDeriveKeyCapi(hash, NULL, key, 20, 0); - todo_wine ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + todo_wine ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); ret = BCryptHashData(hash, NULL, 0, 0); - todo_wine ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + todo_wine ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); ret = BCryptDestroyHash(hash); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptHashData(hash, (UCHAR *)"test", 4, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); /* padding */ memset(key, 0, sizeof(key)); ret = BCryptDeriveKeyCapi(hash, NULL, key, 40, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ok(!memcmp(key, expect2, sizeof(expect2) - 1), "wrong key data\n"); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); } static UCHAR dsaHash[] = @@ -2813,78 +2813,78 @@ static void test_DSA(void) BYTE *buf; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_DSA_ALGORITHM, NULL, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); - ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); ret = BCryptImportKeyPair(alg, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptVerifySignature(key, NULL, dsaHash, sizeof(dsaHash), dsaSignature, sizeof(dsaSignature), 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); /* sign/verify with export/import round-trip */ ret = BCryptGenerateKeyPair(alg, &key, 512, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); len = 0; memset(sig, 0, sizeof(sig)); ret = BCryptSignHash(key, NULL, dsaHash, sizeof(dsaHash), sig, sizeof(sig), &len, 0); - ok(!ret, "got %08x\n", ret); - ok(len == 40, "got %u\n", len); + ok(!ret, "got %#lx\n", ret); + ok(len == 40, "got %lu\n", len); size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_DSA_PUBLIC_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); ret = BCryptExportKey(key, NULL, BCRYPT_DSA_PUBLIC_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); dsablob = (BCRYPT_DSA_KEY_BLOB *)buf; - ok(dsablob->dwMagic == BCRYPT_DSA_PUBLIC_MAGIC, "got %08x\n", dsablob->dwMagic); - ok(dsablob->cbKey == 64, "got %u\n", dsablob->cbKey); - ok(size == sizeof(*dsablob) + dsablob->cbKey * 3, "got %u\n", size); + ok(dsablob->dwMagic == BCRYPT_DSA_PUBLIC_MAGIC, "got %#lx\n", dsablob->dwMagic); + ok(dsablob->cbKey == 64, "got %lu\n", dsablob->cbKey); + ok(size == sizeof(*dsablob) + dsablob->cbKey * 3, "got %lu\n", size); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptImportKeyPair(alg, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key, buf, size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptVerifySignature(key, NULL, dsaHash, sizeof(dsaHash), sig, len, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptImportKeyPair(alg, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, &key, dssKey, sizeof(dssKey), 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); size = 0; ret = BCryptExportKey(key, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, NULL, 0, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size, "size not set\n"); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); ret = BCryptExportKey(key, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, buf, size, &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(size == sizeof(dssKey), "got %u expected %u\n", size, sizeof(dssKey)); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(dssKey), "got %lu expected %Iu\n", size, sizeof(dssKey)); ok(!memcmp(dssKey, buf, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); ret = BCryptDestroyKey(key); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = BCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "got %08x\n", ret); + ok(!ret, "got %#lx\n", ret); } static void test_SecretAgreement(void) @@ -2898,63 +2898,63 @@ static void test_SecretAgreement(void) status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDH_P256_ALGORITHM, NULL, 0); if (status) { - skip("Failed to open BCRYPT_ECDH_P256_ALGORITHM provider %08x\n", status); + skip("Failed to open BCRYPT_ECDH_P256_ALGORITHM provider %#lx\n", status); return; } key = NULL; status = BCryptGenerateKeyPair(alg, &key, 256, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); ok(key != NULL, "key not set\n"); status = BCryptFinalizeKeyPair(key, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptSecretAgreement(NULL, key, &secret, 0); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptSecretAgreement(key, NULL, &secret, 0); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptSecretAgreement(key, key, NULL, 0); - ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status); status = BCryptSecretAgreement(key, key, &secret, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptDeriveKey(NULL, L"HASH", NULL, NULL, 0, &size, 0); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptDeriveKey(key, L"HASH", NULL, NULL, 0, &size, 0); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptDeriveKey(secret, NULL, NULL, NULL, 0, &size, 0); - ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status); status = BCryptDeriveKey(secret, L"HASH", NULL, NULL, 0, &size, 0); todo_wine - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptDestroyHash(secret); - ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status); status = BCryptDestroyKey(secret); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptDestroySecret(NULL); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptDestroySecret(alg); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %#lx\n", status); status = BCryptDestroySecret(secret); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptDestroyKey(key); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptCloseAlgorithmProvider(alg, 0); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); } START_TEST(bcrypt) -- 2.30.2

1 0

[PATCH] evr/tests: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov 09 Feb '22

09 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/Makefile.in | 1 - dlls/evr/tests/evr.c | 1291 ++++++++++++++++++------------------ 2 files changed, 647 insertions(+), 645 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index b8980a3f397..c5db2226ebc 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = evr.dll IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index acbb2b1869a..ea67ff5b584 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -80,7 +80,7 @@ static IBaseFilter *create_evr(void) IBaseFilter *filter = NULL; HRESULT hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return filter; } @@ -90,7 +90,7 @@ static IFilterGraph2 *create_graph(void) HRESULT hr; hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); - ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + ok(hr == S_OK, "Failed to create FilterGraph: %#lx\n", hr); return ret; } @@ -100,7 +100,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %ld, expected %ld.\n", rc, ref); } static ULONG get_refcount(void *iface) @@ -157,69 +157,69 @@ static void test_aggregation(void) filter = (IBaseFilter *)0xdeadbeef; hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!filter, "Got interface %p.\n", filter); hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); ref = IUnknown_AddRef(unk); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); ref = IUnknown_Release(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); IUnknown_Release(unk2); hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); IBaseFilter_Release(filter); ref = IUnknown_Release(unk); - ok(!ref, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(!ref, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); /* Default presenter. */ presenter = (void *)0xdeadbeef; hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok(!presenter, "Got interface %p.\n", presenter); hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); IUnknown_Release(unk); } @@ -228,15 +228,15 @@ static void test_aggregation(void) presenter = (void *)0xdeadbeef; hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&mixer); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok(!mixer, "Got interface %p.\n", mixer); hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); IUnknown_Release(unk); } @@ -251,7 +251,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -266,7 +266,7 @@ static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID expected_hr = supported ? S_OK : E_NOINTERFACE; hr = MFGetService(iface, service, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -295,7 +295,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVideoWindow, FALSE); ref = IBaseFilter_Release(filter); - ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(!ref, "Got unexpected refcount %ld.\n", ref); } static void test_enum_pins(void) @@ -307,85 +307,85 @@ static void test_enum_pins(void) HRESULT hr; ref = get_refcount(filter); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); hr = IBaseFilter_EnumPins(filter, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); hr = IBaseFilter_EnumPins(filter, &enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ref = get_refcount(filter); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); hr = IEnumPins_Next(enum1, 1, NULL, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ref = get_refcount(filter); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pins[0]); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); IPin_Release(pins[0]); ref = get_refcount(filter); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 1, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 1, "Got count %lu.\n", count); IPin_Release(pins[0]); hr = IEnumPins_Next(enum1, 1, pins, &count); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - ok(!count, "Got count %u.\n", count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, &count); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - ok(count == 1, "Got count %u.\n", count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(count == 1, "Got count %lu.\n", count); IPin_Release(pins[0]); hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Clone(enum1, &enum2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Skip(enum1, 2); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Skip(enum1, 1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Skip(enum1, 1); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum2, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IPin_Release(pins[0]); IEnumPins_Release(enum2); IEnumPins_Release(enum1); ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static void test_find_pin(void) @@ -397,19 +397,19 @@ static void test_find_pin(void) ULONG ref; hr = IBaseFilter_EnumPins(filter, &enum_pins); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IBaseFilter_FindPin(filter, sink_id, &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); IPin_Release(pin2); IPin_Release(pin); IEnumPins_Release(enum_pins); ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static void test_pin_info(void) @@ -423,38 +423,38 @@ static void test_pin_info(void) IPin *pin; hr = IBaseFilter_FindPin(filter, sink_id, &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ref = get_refcount(filter); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); hr = IPin_QueryPinInfo(pin, &info); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); hr = IPin_QueryId(pin, &id); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, NULL); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); IPin_Release(pin); ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) @@ -468,14 +468,14 @@ static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG { if (code == expected_code) { - ok(param1 == expected1, "Got param1 %#lx.\n", param1); - ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ok(param1 == expected1, "Got param1 %#Ix.\n", param1); + ok(param2 == expected2, "Got param2 %#Ix.\n", param2); ret++; } IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); timeout = 0; } - ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(hr == E_ABORT, "Got hr %#lx.\n", hr); return ret; } @@ -496,49 +496,49 @@ static void test_unconnected_eos(void) ULONG ref; hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(!ret, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(!ret, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Run(control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(!ret, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Run(control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(!ret, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Run(control); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = check_ec_complete(eventsrc, 0); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); @@ -546,9 +546,9 @@ static void test_unconnected_eos(void) IMediaControl_Release(control); IMediaEvent_Release(eventsrc); ref = IFilterGraph2_Release(graph); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static IMFMediaType * create_video_type(const GUID *subtype) @@ -557,13 +557,13 @@ static IMFMediaType * create_video_type(const GUID *subtype) HRESULT hr; hr = MFCreateMediaType(&video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(video_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(video_type, &MF_MT_SUBTYPE, subtype); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return video_type; } @@ -583,17 +583,18 @@ static void test_default_mixer(void) IMFTransform *transform; DXVA2_ValueRange range; DXVA2_Fixed32 dxva_value; - DWORD flags, value, count; + UINT32 count, value; COLORREF color; unsigned int i; DWORD ids[16]; IUnknown *unk; + DWORD flags; GUID *guids; HRESULT hr; IID iid; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); - ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default mixer, hr %#lx.\n", hr); check_interface(transform, &IID_IMFQualityAdvise, TRUE); check_interface(transform, &IID_IMFClockStateSink, TRUE); @@ -612,105 +613,105 @@ static void test_default_mixer(void) check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, FALSE); hr = MFGetService((IUnknown *)transform, &MR_VIDEO_RENDER_SERVICE, &IID_IUnknown, (void **)&unk); - ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(MFGetService((IUnknown *)transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, (void **)&mixer_control2))) { hr = IMFVideoMixerControl2_GetMixingPrefs(mixer_control2, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl2_GetMixingPrefs(mixer_control2, &flags); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!flags, "Unexpected flags %#x.\n", flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!flags, "Unexpected flags %#lx.\n", flags); IMFVideoMixerControl2_Release(mixer_control2); } hr = MFGetService((IUnknown *)transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); color = 1; hr = IMFVideoProcessor_GetBackgroundColor(processor, &color); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!color, "Unexpected color %#x.\n", color); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!color, "Unexpected color %#lx.\n", color); hr = IMFVideoProcessor_SetBackgroundColor(processor, 0x00121212); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetBackgroundColor(processor, &color); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(color == 0x121212, "Unexpected color %#x.\n", color); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(color == 0x121212, "Unexpected color %#lx.\n", color); hr = IMFVideoProcessor_GetFilteringRange(processor, DXVA2_DetailFilterChromaLevel, &range); todo_wine - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &dxva_value); todo_wine - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); todo_wine - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); IMFVideoProcessor_Release(processor); hr = IMFTransform_SetOutputBounds(transform, 100, 10); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetAttributes(transform, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetAttributes(transform, &attributes); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetAttributes(transform, &attributes2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(attributes == attributes2, "Unexpected attributes instance.\n"); IMFAttributes_Release(attributes2); hr = IMFTransform_QueryInterface(transform, &IID_IMFAttributes, (void **)&attributes2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(attributes != attributes2, "Unexpected attributes instance.\n"); hr = IMFAttributes_QueryInterface(attributes2, &IID_IMFTransform, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); hr = IMFAttributes_GetCount(attributes2, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected attribute count %u.\n", count); value = 0; hr = IMFAttributes_GetUINT32(attributes2, &MF_SA_D3D_AWARE, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == 1, "Unexpected value %d.\n", value); IMFAttributes_Release(attributes2); hr = IMFAttributes_GetCount(attributes, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected attribute count %u.\n", count); memset(&rect, 0, sizeof(rect)); hr = IMFAttributes_GetBlob(attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&rect, sizeof(rect), NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(rect.left == 0.0f && rect.top == 0.0f && rect.right == 1.0f && rect.bottom == 1.0f, "Unexpected zoom rect (%f, %f) - (%f, %f).\n", rect.left, rect.top, rect.right, rect.bottom); IMFAttributes_Release(attributes); hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualIID(&iid, &IID_IDirect3DDevice9), "Unexpected id %s.\n", wine_dbgstr_guid(&iid)); IMFVideoDeviceID_Release(deviceid); @@ -718,84 +719,84 @@ static void test_default_mixer(void) /* Stream configuration. */ input_count = output_count = 0; hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); - ok(hr == S_OK, "Failed to get stream count, hr %#x.\n", hr); - ok(input_count == 1 && output_count == 1, "Unexpected stream count %u/%u.\n", input_count, output_count); + ok(hr == S_OK, "Failed to get stream count, hr %#lx.\n", hr); + ok(input_count == 1 && output_count == 1, "Unexpected stream count %lu/%lu.\n", input_count, output_count); hr = IMFTransform_GetStreamLimits(transform, &input_min, &input_max, &output_min, &output_max); - ok(hr == S_OK, "Failed to get stream limits, hr %#x.\n", hr); - ok(input_min == 1 && input_max == 16 && output_min == 1 && output_max == 1, "Unexpected stream limits %u/%u, %u/%u.\n", + ok(hr == S_OK, "Failed to get stream limits, hr %#lx.\n", hr); + ok(input_min == 1 && input_max == 16 && output_min == 1 && output_max == 1, "Unexpected stream limits %lu/%lu, %lu/%lu.\n", input_min, input_max, output_min, output_max); hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 1, &output_info); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); memset(&input_info, 0xcc, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get input info, hr %#lx.\n", hr); memset(&output_info, 0xcc, sizeof(output_info)); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); - ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get input info, hr %#lx.\n", hr); ok(!(output_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)), - "Unexpected output flags %#x.\n", output_info.dwFlags); + "Unexpected output flags %#lx.\n", output_info.dwFlags); hr = IMFTransform_GetStreamIDs(transform, 1, &input_id, 1, &output_id); - ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get input info, hr %#lx.\n", hr); ok(input_id == 0 && output_id == 0, "Unexpected stream ids.\n"); hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 1, &attributes); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 0, &attributes); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_AddInputStreams(transform, 16, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_AddInputStreams(transform, 16, ids); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); memset(ids, 0, sizeof(ids)); hr = IMFTransform_AddInputStreams(transform, 15, ids); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(ids); ++i) ids[i] = i + 1; hr = IMFTransform_AddInputStreams(transform, 15, ids); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); input_count = output_count = 0; hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); - ok(hr == S_OK, "Failed to get stream count, hr %#x.\n", hr); - ok(input_count == 16 && output_count == 1, "Unexpected stream count %u/%u.\n", input_count, output_count); + ok(hr == S_OK, "Failed to get stream count, hr %#lx.\n", hr); + ok(input_count == 16 && output_count == 1, "Unexpected stream count %lu/%lu.\n", input_count, output_count); memset(&input_info, 0, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); - ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get input info, hr %#lx.\n", hr); ok((input_info.dwFlags & (MFT_INPUT_STREAM_REMOVABLE | MFT_INPUT_STREAM_OPTIONAL)) == - (MFT_INPUT_STREAM_REMOVABLE | MFT_INPUT_STREAM_OPTIONAL), "Unexpected flags %#x.\n", input_info.dwFlags); + (MFT_INPUT_STREAM_REMOVABLE | MFT_INPUT_STREAM_OPTIONAL), "Unexpected flags %#lx.\n", input_info.dwFlags); attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected count %u.\n", count); hr = IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected count %u.\n", count); ok(!!attributes, "Unexpected attributes.\n"); attributes2 = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(attributes == attributes2, "Unexpected instance.\n"); IMFAttributes_Release(attributes2); @@ -803,42 +804,43 @@ static void test_default_mixer(void) attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!attributes, "Unexpected attributes.\n"); IMFAttributes_Release(attributes); hr = IMFTransform_DeleteInputStream(transform, 0); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_DeleteInputStream(transform, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); input_count = output_count = 0; hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); - ok(hr == S_OK, "Failed to get stream count, hr %#x.\n", hr); - ok(input_count == 15 && output_count == 1, "Unexpected stream count %u/%u.\n", input_count, output_count); + ok(hr == S_OK, "Failed to get stream count, hr %#lx.\n", hr); + ok(input_count == 15 && output_count == 1, "Unexpected stream count %lu/%lu.\n", input_count, output_count); IMFTransform_Release(transform); hr = MFCreateVideoMixer(NULL, &IID_IMFTransform, &IID_IMFTransform, (void **)&transform); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = CoCreateInstance(&CLSID_MFVideoMixer9, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); - ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default mixer, hr %#lx.\n", hr); IMFTransform_Release(transform); } static void test_surface_sample(void) { IDirect3DSurface9 *backbuffer = NULL, *surface; + DWORD flags, buffer_count, length; IMFDesiredSample *desired_sample; IMFMediaBuffer *buffer, *buffer2; LONGLONG duration, time1, time2; IDirect3DSwapChain9 *swapchain; - DWORD flags, count, length; IDirect3DDevice9 *device; IMFSample *sample; IUnknown *unk; + UINT32 count; HWND window; HRESULT hr; BYTE *data; @@ -851,195 +853,195 @@ static void test_surface_sample(void) } hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); - ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetBackBuffer(swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(backbuffer != NULL, "The back buffer is NULL\n"); IDirect3DSwapChain9_Release(swapchain); hr = MFCreateVideoSampleFromSurface(NULL, &sample); - ok(hr == S_OK, "Failed to create surface sample, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create surface sample, hr %#lx.\n", hr); IMFSample_Release(sample); hr = MFCreateVideoSampleFromSurface((IUnknown *)backbuffer, &sample); - ok(hr == S_OK, "Failed to create surface sample, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create surface sample, hr %#lx.\n", hr); hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired_sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetCount(sample, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!count, "Unexpected attribute count %u.\n", count); hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, NULL, &time2); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); - ok(hr == MF_E_NOT_AVAILABLE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOT_AVAILABLE, "Unexpected hr %#lx.\n", hr); IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired_sample, 123, 456); time1 = time2 = 0; hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(time1 == 123 && time2 == 456, "Unexpected time values.\n"); IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired_sample, 0, 0); time1 = time2 = 1; hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(time1 == 0 && time2 == 0, "Unexpected time values.\n"); IMFDesiredSample_Clear(desired_sample); hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); - ok(hr == MF_E_NOT_AVAILABLE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOT_AVAILABLE, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetCount(sample, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!count, "Unexpected attribute count %u.\n", count); /* Attributes are cleared. */ hr = IMFSample_SetUnknown(sample, &MFSampleExtension_Token, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetCount(sample, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected attribute count %u.\n", count); hr = IMFSample_SetSampleTime(sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleTime(sample, &time1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleDuration(sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleDuration(sample, &duration); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleFlags(sample, 0x1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFDesiredSample_Clear(desired_sample); hr = IMFSample_GetCount(sample, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!count, "Unexpected attribute count %u.\n", count); hr = IMFSample_GetSampleTime(sample, &time1); - ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleDuration(sample, &duration); - ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleFlags(sample, &flags); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(flags == 0, "Unexpected flags %#x.\n", flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!flags, "Unexpected flags %#lx.\n", flags); IMFDesiredSample_Release(desired_sample); hr = IMFSample_GetCount(sample, &count); - ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get attribute count, hr %#lx.\n", hr); ok(!count, "Unexpected attribute count.\n"); - count = 0; - hr = IMFSample_GetBufferCount(sample, &count); - ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); - ok(count == 1, "Unexpected attribute count.\n"); + buffer_count = 0; + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#lx.\n", hr); + ok(buffer_count == 1, "Unexpected attribute count.\n"); hr = IMFSample_GetTotalLength(sample, &length); - ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); - ok(!length, "Unexpected length %u.\n", length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(!length, "Unexpected length %lu.\n", length); hr = IMFSample_GetSampleDuration(sample, &duration); - ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleTime(sample, &duration); - ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_GetMaxLength(buffer, &length); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); - ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); - ok(!length, "Unexpected length %u.\n", length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(!length, "Unexpected length %lu.\n", length); hr = IMFMediaBuffer_SetCurrentLength(buffer, 16); - ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); - ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); - ok(length == 16, "Unexpected length %u.\n", length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(length == 16, "Unexpected length %lu.\n", length); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IMFSample_AddBuffer(sample, buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFSample_GetBufferCount(sample, &count); - ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); - ok(count == 2, "Unexpected attribute count.\n"); + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#lx.\n", hr); + ok(buffer_count == 2, "Unexpected buffer count.\n"); hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFSample_CopyToBuffer(sample, buffer); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFSample_RemoveAllBuffers(sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFSample_GetBufferCount(sample, &count); - ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); - ok(!count, "Unexpected attribute count.\n"); + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#lx.\n", hr); + ok(!buffer_count, "Unexpected buffer count.\n"); hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(surface == backbuffer, "Unexpected instance.\n"); IDirect3DSurface9_Release(surface); hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IUnknown, (void **)&surface); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(surface == backbuffer, "Unexpected instance.\n"); IDirect3DSurface9_Release(surface); IMFMediaBuffer_Release(buffer); hr = IMFSample_GetSampleFlags(sample, &flags); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleFlags(sample, 0x123); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); flags = 0; hr = IMFSample_GetSampleFlags(sample, &flags); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(flags == 0x123, "Unexpected flags %#x.\n", flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(flags == 0x123, "Unexpected flags %#lx.\n", flags); IMFSample_Release(sample); @@ -1060,38 +1062,38 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType *video_type; IMFTransform *transform; MFVideoArea aperture; - DWORD index, count; + UINT count, token; IUnknown *unk; + DWORD index; HWND window; HRESULT hr; - UINT token; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); - ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default mixer, hr %#lx.\n", hr); hr = IMFTransform_GetInputAvailableType(transform, 0, 0, &media_type); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); /* Now try with device manager. */ @@ -1103,69 +1105,69 @@ static void test_default_mixer_type_negotiation(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Now manager is not initialized. */ hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* And now type description is incomplete. */ hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); video_type = create_video_type(&MFVideoFormat_RGB32); /* Partially initialized type. */ hr = IMFTransform_SetInputType(transform, 0, video_type, 0); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); /* Only required data - frame size and uncompressed marker. */ hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); memset(&aperture, 0, sizeof(aperture)); aperture.Area.cx = 100; aperture.Area.cy = 200; hr = IMFMediaType_SetBlob(video_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, video_type, MFT_SET_TYPE_TEST_ONLY); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == video_type, "Unexpected media type instance.\n"); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n"); IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); /* Modified after type was set. */ hr = IMFMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, (UINT64)56 << 32 | 55); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Check attributes on available output types. */ index = 0; @@ -1177,30 +1179,30 @@ static void test_default_mixer_type_negotiation(void) UINT32 value; hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualGUID(&major, &MFMediaType_Video), "Unexpected major type.\n"); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(frame_size == ((UINT64)100 << 32 | 200), "Unexpected frame size %s.\n", wine_dbgstr_longlong(frame_size)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); /* Ratio from input type */ hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ratio == ((UINT64)1 << 32 | 1), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); hr = IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); hr = IMFMediaType_GetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == 2, "Unexpected value %u.\n", value); IMFMediaType_Release(media_type); @@ -1208,10 +1210,10 @@ static void test_default_mixer_type_negotiation(void) ok(index > 1, "Unexpected number of available types.\n"); hr = IMFMediaType_DeleteItem(video_type, &MF_MT_FIXED_SIZE_SAMPLES); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); index = 0; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) @@ -1220,11 +1222,11 @@ static void test_default_mixer_type_negotiation(void) UINT64 ratio; hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ratio == ((UINT64)56 << 32 | 55), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == 1, "Unexpected value %u.\n", value); IMFMediaType_Release(media_type); @@ -1233,97 +1235,97 @@ static void test_default_mixer_type_negotiation(void) /* Cloned type is returned. */ hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type != media_type2, "Unexpected media type instance.\n"); IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); /* Minimal valid attribute set for output type. */ hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMediaType(&media_type2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &subtype); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 1, NULL, MFT_SET_TYPE_TEST_ONLY); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Candidate type have frame size set, mismatching size is accepted. */ hr = IMFMediaType_SetUINT64(media_type2, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); todo_wine - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == video_type, "Unexpected pointer.\n"); hr = IMFMediaType_QueryInterface(media_type, &IID_IMFVideoMediaType, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); todo_wine - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 1, media_type, 0); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) CoTaskMemFree(guids); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n"); IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); @@ -1356,10 +1358,10 @@ static void test_default_presenter(void) GUID iid; hr = MFCreateVideoPresenter(NULL, &IID_IMFVideoPresenter, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); check_interface(presenter, &IID_IQualProp, TRUE); check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE); @@ -1390,101 +1392,101 @@ static void test_default_presenter(void) /* Query arbitrary supported interface back from device manager wrapper. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IDirect3DDeviceManager9, (void **)&dm); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_QueryInterface(dm, &IID_IQualProp, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); hr = IDirect3DDeviceManager9_QueryInterface(dm, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk == unk2, "Unexpected interface.\n"); IUnknown_Release(unk2); IUnknown_Release(unk); IDirect3DDeviceManager9_Release(dm); hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_MIXER_SERVICE, &IID_IUnknown, (void **)&unk); - ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualIID(&iid, &IID_IDirect3DDevice9), "Unexpected id %s.\n", wine_dbgstr_guid(&iid)); IMFVideoDeviceID_Release(deviceid); hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); flags = 123; hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!flags, "Unexpected rendering flags %#x.\n", flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!flags, "Unexpected rendering flags %#lx.\n", flags); IMFVideoDisplayControl_Release(display_control); hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Video window */ hwnd = create_window(); ok(!!hwnd, "Failed to create a test window.\n"); hr = IMFVideoDisplayControl_GetVideoWindow(display_control, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hwnd2 = hwnd; hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, (HWND)0x1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hwnd2 = NULL; hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); /* Rate support. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); rate = 1.0f; hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(rate == 0.0f, "Unexpected rate %f.\n", rate); rate = 1.0f; hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(rate == 0.0f, "Unexpected rate %f.\n", rate); rate = 1.0f; hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(rate == 0.0f, "Unexpected rate %f.\n", rate); rate = 1.0f; hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(rate == 0.0f, "Unexpected rate %f.\n", rate); IMFRateSupport_Release(rate_support); @@ -1500,7 +1502,7 @@ static void test_MFCreateVideoMixerAndPresenter(void) HRESULT hr; hr = MFCreateVideoMixerAndPresenter(NULL, NULL, &IID_IUnknown, (void **)&mixer, &IID_IUnknown, (void **)&presenter); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(mixer); IUnknown_Release(presenter); @@ -1564,97 +1566,97 @@ static void test_MFCreateVideoSampleAllocator(void) BYTE *data; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = 10; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!count, "Unexpected count %d.\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!count, "Unexpected count %ld.\n", count); hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); - ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* It expects IMFVideoMediaType aka video major type. Exact return code is E_NOINTERFACE, likely coming from querying for IMFVideoMediaType. Does not seem valuable to match it. */ hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); /* Frame size is required. */ hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count == 1, "Unexpected count %d.\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 1, "Unexpected count %ld.\n", count); sample = NULL; hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); refcount = get_refcount(sample); hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); - ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#lx.\n", hr); /* Reinitialize with active sample. */ hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 4, video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(refcount == get_refcount(sample), "Unexpected refcount %lu.\n", get_refcount(sample)); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count == 4, "Unexpected count %d.\n", count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 4, "Unexpected count %ld.\n", count); check_interface(sample, &IID_IMFDesiredSample, TRUE); check_interface(sample, &IID_IMFTrackedSample, TRUE); hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(buffer, &IID_IMF2DBuffer, TRUE); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr); /* Device manager wasn't set, sample gets regular memory buffers. */ if (SUCCEEDED(hr)) { hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); IMFGetService_Release(gs); } @@ -1667,7 +1669,7 @@ static void test_MFCreateVideoSampleAllocator(void) IMFVideoSampleAllocator_Release(allocator); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); /* Using device manager */ @@ -1679,39 +1681,39 @@ static void test_MFCreateVideoSampleAllocator(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set a device, hr %#lx.\n", hr); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(sample, &IID_IMFTrackedSample, TRUE); check_interface(sample, &IID_IMFDesiredSample, TRUE); hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_service_interface(buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, TRUE); check_interface(buffer, &IID_IMF2DBuffer, TRUE); check_interface(buffer, &IID_IMF2DBuffer2, TRUE); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); @@ -1772,7 +1774,7 @@ static HRESULT WINAPI test_host_LookupService(IMFTopologyServiceLookup *iface, { struct test_host *host = impl_from_test_host(iface); - ok(*num_objects == 1, "Unexpected number of requested objects %u\n", *num_objects); + ok(*num_objects == 1, "Unexpected number of requested objects %lu\n", *num_objects); memset(objects, 0, *num_objects * sizeof(*objects)); @@ -1863,8 +1865,8 @@ static void test_presenter_video_position(void) struct test_host host; IMFTransform *mixer; RECT dst_rect; + UINT32 count; HRESULT hr; - DWORD count; HWND hwnd; hwnd = create_window(); @@ -1872,148 +1874,148 @@ static void test_presenter_video_position(void) /* Setting position without the mixer. */ hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); SetRect(&dst_rect, 0, 0, 10, 10); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); /* With the mixer. */ hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_test_host(&host, mixer, presenter); /* Clear default mixer attributes, then attach presenter. */ hr = IMFTransform_GetAttributes(mixer, &mixer_attributes); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_DeleteAllItems(mixer_attributes); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_GetCount(mixer_attributes, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected count %u.\n", count); memset(&src_rect, 0, sizeof(src_rect)); hr = IMFAttributes_GetBlob(mixer_attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&src_rect, sizeof(src_rect), NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); SetRect(&dst_rect, 1, 2, 3, 4); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); ok(dst_rect.left == 0 && dst_rect.right == 0 && dst_rect.top == 0 && dst_rect.bottom == 0, "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); /* Setting position requires a window. */ SetRect(&dst_rect, 0, 0, 10, 10); memset(&src_rect, 0, sizeof(src_rect)); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, &dst_rect); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SetRect(&dst_rect, 0, 0, 10, 10); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SetRect(&dst_rect, 1, 2, 3, 4); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(dst_rect.left == 0 && dst_rect.right == 10 && dst_rect.top == 0 && dst_rect.bottom == 10, "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); set_rect(&src_rect, 0.0f, 0.0f, 2.0f, 1.0f); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); set_rect(&src_rect, -0.1f, 0.0f, 0.9f, 1.0f); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Flipped source rectangle. */ set_rect(&src_rect, 0.5f, 0.0f, 0.4f, 1.0f); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); set_rect(&src_rect, 0.0f, 0.5f, 0.4f, 0.1f); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); set_rect(&src_rect, 0.1f, 0.2f, 0.8f, 0.9f); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Presenter updates mixer attribute. */ memset(&src_rect, 0, sizeof(src_rect)); hr = IMFAttributes_GetBlob(mixer_attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&src_rect, sizeof(src_rect), NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); SetRect(&dst_rect, 1, 2, 999, 1000); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SetRect(&dst_rect, 0, 1, 3, 4); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(dst_rect.left == 1 && dst_rect.right == 999 && dst_rect.top == 2 && dst_rect.bottom == 1000, "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); /* Flipped destination rectangle. */ SetRect(&dst_rect, 100, 1, 50, 1000); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); SetRect(&dst_rect, 1, 100, 100, 50); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); IMFVideoDisplayControl_Release(display_control); @@ -2038,86 +2040,86 @@ static void test_presenter_native_video_size(void) IDirect3DDeviceManager9 *dm; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); memset(&size, 0xcc, sizeof(size)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); memset(&ratio, 0xcc, sizeof(ratio)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, &ratio); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Configure mixer primary stream. */ hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)dm); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirect3DDeviceManager9_Release(dm); video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Native video size is cached on initialization. */ init_test_host(&host, mixer, presenter); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %lu x %lu.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, - "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); + "Unexpected ratio %lu x %lu.\n", ratio.cx, ratio.cy); /* Update input type. */ hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %lu x %lu.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, - "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); + "Unexpected ratio %lu x %lu.\n", ratio.cx, ratio.cy); /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(size.cx == 320 && size.cy == 240, "Unexpected size %lu x %lu.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, - "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); + "Unexpected ratio %lu x %lu.\n", ratio.cx, ratio.cy); IMFMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); @@ -2132,26 +2134,26 @@ static void test_presenter_ar_mode(void) DWORD mode; hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); mode = 0; hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mode == (MFVideoARMode_PreservePicture | MFVideoARMode_PreservePixel), "Unexpected mode %#x.\n", mode); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(mode == (MFVideoARMode_PreservePicture | MFVideoARMode_PreservePixel), "Unexpected mode %#lx.\n", mode); hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, 0x100); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_Mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); mode = 0; hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mode == MFVideoARMode_Mask, "Unexpected mode %#x.\n", mode); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(mode == MFVideoARMode_Mask, "Unexpected mode %#lx.\n", mode); IMFVideoDisplayControl_Release(display_control); } @@ -2169,73 +2171,73 @@ static void test_presenter_video_window(void) HWND window; hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = MFGetService((IUnknown *)display_control, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); hr = IDirect3DDeviceManager9_OpenDeviceHandle(dm, &hdevice); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(dm, hdevice, &d3d_device, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_GetCreationParameters(d3d_device, &device_params); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device_params.hFocusWindow == GetDesktopWindow(), "Unexpected window %p.\n", device_params.hFocusWindow); hr = IDirect3DDevice9_GetSwapChain(d3d_device, 0, &swapchain); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_params); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); ok(present_params.Windowed, "Unexpected windowed mode.\n"); ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); - ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#x.\n", present_params.Flags); + ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#lx.\n", present_params.Flags); ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(d3d_device); hr = IDirect3DDeviceManager9_UnlockDevice(dm, hdevice, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Setting window. */ hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &window); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!window, "Unexpected window %p.\n", window); window = create_window(); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Device is not recreated or reset on window change. */ hr = IDirect3DDeviceManager9_LockDevice(dm, hdevice, &d3d_device, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_GetSwapChain(d3d_device, 0, &swapchain); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_params); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); ok(present_params.Windowed, "Unexpected windowed mode.\n"); ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); - ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#x.\n", present_params.Flags); + ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#lx.\n", present_params.Flags); ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(d3d_device); hr = IDirect3DDeviceManager9_UnlockDevice(dm, hdevice, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, hdevice); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFVideoDisplayControl_Release(display_control); @@ -2254,31 +2256,31 @@ static void test_presenter_quality_control(void) HRESULT hr; hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); todo_wine - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); todo_wine - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); @@ -2287,31 +2289,31 @@ static void test_presenter_quality_control(void) todo_wine { mode = 1; hr = IMFQualityAdvise_GetDropMode(advise, &mode); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); level = 1; hr = IMFQualityAdvise_GetQualityLevel(advise, &level); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); - ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#lx.\n", hr); hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); - ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#lx.\n", hr); } IMFQualityAdvise_Release(advise); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&qual_prop); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IQualProp_get_FramesDrawn(qual_prop, NULL); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IQualProp_get_FramesDrawn(qual_prop, &frame_count); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); IQualProp_Release(qual_prop); @@ -2328,16 +2330,16 @@ static void get_output_aperture(IMFTransform *mixer, SIZE *frame_size, MFVideoAr memset(aperture, 0xcc, sizeof(*aperture)); hr = IMFTransform_GetOutputCurrentType(mixer, 0, &media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); frame_size->cx = size >> 32; frame_size->cy = size; hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)aperture, sizeof(*aperture), NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); } @@ -2367,74 +2369,74 @@ static void test_presenter_media_type(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); input_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, (UINT64)100 << 32 | 50); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(input_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_test_host(&host, mixer, presenter); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Set destination rectangle before mixer types are configured. */ SetRect(&dst, 0, 0, 101, 51); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(mixer, 0, input_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); get_output_aperture(mixer, &frame_size, &aperture); - ok(frame_size.cx == 101 && frame_size.cy == 51, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); - ok(aperture.Area.cx == 101 && aperture.Area.cy == 51, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); + ok(frame_size.cx == 101 && frame_size.cy == 51, "Unexpected frame size %lu x %lu.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 101 && aperture.Area.cy == 51, "Unexpected size %lu x %lu.\n", aperture.Area.cx, aperture.Area.cy); ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); SetRect(&dst, 1, 2, 200, 300); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); get_output_aperture(mixer, &frame_size, &aperture); - ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); - ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); + ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %lu x %lu.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %lu x %lu.\n", aperture.Area.cx, aperture.Area.cy); ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_None); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); get_output_aperture(mixer, &frame_size, &aperture); - ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); - ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); + ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %lu x %lu.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %lu x %lu.\n", aperture.Area.cx, aperture.Area.cy); ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); @@ -2466,80 +2468,80 @@ static void test_presenter_shutdown(void) ok(!!window, "Failed to create test window.\n"); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create default presenter, hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&qual_prop); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_GetCurrentMediaType(presenter, &media_type); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &size); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, &size, &size); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); SetRect(&rect, 0, 0, 10, 10); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &rect); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_None); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &window2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoDisplayControl_RepaintVideo(display_control); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IQualProp_get_FramesDrawn(qual_prop, NULL); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IQualProp_get_FramesDrawn(qual_prop, &frame_count); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IQualProp_Release(qual_prop); IMFVideoDeviceID_Release(deviceid); @@ -2559,52 +2561,52 @@ static void test_mixer_output_rectangle(void) HRESULT hr; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_GetStreamOutputRect(mixer_control, 0, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); hr = IMFVideoMixerControl_GetStreamOutputRect(mixer_control, 0, &rect); - ok(hr == S_OK, "Failed to get output rect, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output rect, hr %#lx.\n", hr); ok(rect.left == 0.0f && rect.top == 0.0f && rect.right == 1.0f && rect.bottom == 1.0f, "Unexpected rectangle.\n"); hr = IMFVideoMixerControl_GetStreamOutputRect(mixer_control, 1, &rect); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_GetStreamOutputRect(mixer_control, 1, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 1, &rect); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 1, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); /* Wrong bounds. */ set_rect(&rect, 0.0f, 0.0f, 1.1f, 1.0f); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 0, &rect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); set_rect(&rect, -0.1f, 0.0f, 0.5f, 1.0f); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 0, &rect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Flipped. */ set_rect(&rect, 1.0f, 0.0f, 0.0f, 1.0f); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 0, &rect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); set_rect(&rect, 0.0f, 1.0f, 1.0f, 0.5f); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 0, &rect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamOutputRect(mixer_control, 0, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); IMFVideoMixerControl_Release(mixer_control); IMFTransform_Release(mixer); @@ -2619,96 +2621,96 @@ static void test_mixer_zorder(void) HRESULT hr; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 0, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); value = 1; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 0, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!value, "Unexpected value %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!value, "Unexpected value %lu.\n", value); value = 1; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, &value); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 0, 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 1, 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Exceeds maximum stream number. */ hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 0, 20); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); value = 1; hr = IMFTransform_AddInputStreams(mixer, 1, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(value == 1, "Unexpected zorder %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 1, "Unexpected zorder %lu.\n", value); hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 1, 0); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 1, 2); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 0, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 2; hr = IMFTransform_AddInputStreams(mixer, 1, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 2, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(value == 2, "Unexpected zorder %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 2, "Unexpected zorder %lu.\n", value); hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 2, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 3; hr = IMFTransform_AddInputStreams(mixer, 1, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 3, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(value == 3, "Unexpected zorder %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 3, "Unexpected zorder %lu.\n", value); hr = IMFTransform_DeleteInputStream(mixer, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_DeleteInputStream(mixer, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_DeleteInputStream(mixer, 3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ids[0] = 2; ids[1] = 1; hr = IMFTransform_AddInputStreams(mixer, 2, ids); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(value == 2, "Unexpected zorder %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 2, "Unexpected zorder %lu.\n", value); value = 0; hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 2, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(value == 1, "Unexpected zorder %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 1, "Unexpected zorder %lu.\n", value); IMFVideoMixerControl_Release(mixer_control); IMFTransform_Release(mixer); @@ -2724,31 +2726,31 @@ static IDirect3DSurface9 * create_surface(IDirect3DDeviceManager9 *manager, unsi HRESULT hr; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXVideoAccelerationService_CreateSurface(service, width, height, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirectXVideoAccelerationService_Release(service); hr = IDirect3DDevice9_ColorFill(device, surface, NULL, D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirect3DDevice9_Release(device); hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return surface; } @@ -2762,18 +2764,18 @@ static DWORD get_surface_color(IDirect3DSurface9 *surface, unsigned int x, unsig HRESULT hr; hr = IDirect3DSurface9_GetDesc(surface, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(x < desc.Width && y < desc.Height, "Invalid coordinate.\n"); if (x >= desc.Width || y >= desc.Height) return 0; hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); row = (DWORD *)((char *)locked_rect.pBits + y * locked_rect.Pitch); color = row[x]; hr = IDirect3DSurface9_UnlockRect(surface); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return color; } @@ -2787,13 +2789,14 @@ static void test_mixer_samples(void) IMFDesiredSample *desired; IDirect3DDevice9 *device; IMFMediaType *video_type; - DWORD count, flags, color, status; + DWORD flags, color, status; IMFTransform *mixer; IMFSample *sample, *sample2; HWND window; UINT token; HRESULT hr; LONGLONG pts, duration; + UINT32 count; window = create_window(); if (!(device = create_device(window))) @@ -2803,217 +2806,217 @@ static void test_mixer_samples(void) } hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputStatus(mixer, 0, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputStatus(mixer, 1, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputStatus(mixer, 0, &status); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputStatus(mixer, 1, &status); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputStatus(mixer, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set a device, hr %#lx.\n", hr); hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputStatus(mixer, 0, &status); - ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(mixer, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); status = 0; hr = IMFTransform_GetInputStatus(mixer, 0, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#lx.\n", status); hr = IMFTransform_GetInputStatus(mixer, 1, &status); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); status = ~0u; hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!status, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!status, "Unexpected status %#lx.\n", status); IMFMediaType_Release(video_type); memset(buffers, 0, sizeof(buffers)); hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* It needs a sample with a backing surface. */ hr = MFCreateSample(&sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); buffers[0].pSample = sample; hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); surface = create_surface(manager, 64, 64); hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); buffers[0].pSample = sample; hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#lx.\n", hr); color = get_surface_color(surface, 0, 0); - ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#x.\n", color); + ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#lx.\n", color); /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); color = get_surface_color(surface, 0, 0); - ok(!color, "Unexpected color %#x.\n", color); + ok(!color, "Unexpected color %#lx.\n", color); hr = IMFVideoProcessor_SetBackgroundColor(processor, RGB(0, 0, 255)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); color = get_surface_color(surface, 0, 0); - ok(!color, "Unexpected color %#x.\n", color); + ok(!color, "Unexpected color %#lx.\n", color); hr = IMFTransform_ProcessOutput(mixer, 0, 2, buffers, &status); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); buffers[1].pSample = sample; hr = IMFTransform_ProcessOutput(mixer, 0, 2, buffers, &status); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); buffers[0].dwStreamID = 1; hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); IMFDesiredSample_Clear(desired); hr = IMFTransform_ProcessInput(mixer, 0, NULL, 0); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_ProcessInput(mixer, 5, NULL, 0); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); status = 0; hr = IMFTransform_GetInputStatus(mixer, 0, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#lx.\n", status); status = ~0u; hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!status, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!status, "Unexpected status %#lx.\n", status); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); status = ~0u; hr = IMFTransform_GetInputStatus(mixer, 0, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!status, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!status, "Unexpected status %#lx.\n", status); hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#lx.\n", status); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); - ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); /* ProcessOutput() sets sample time and duration. */ hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetUINT32(sample2, &IID_IMFSample, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleFlags(sample2, 0x123); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleTime(sample2, &pts); - ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleDuration(sample2, &duration); - ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleTime(sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleDuration(sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); memset(buffers, 0, sizeof(buffers)); buffers[0].pSample = sample2; hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_GetSampleTime(sample2, &pts); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!pts, "Unexpected sample time.\n"); hr = IMFSample_GetSampleDuration(sample2, &duration); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!duration, "Unexpected duration\n"); /* Flags are not copied. */ hr = IMFSample_GetSampleFlags(sample2, &flags); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(flags == 0x123, "Unexpected flags %#x.\n", flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(flags == 0x123, "Unexpected flags %#lx.\n", flags); /* Attributes are not removed. */ hr = IMFSample_GetCount(sample2, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "Unexpected attribute count %u.\n", count); hr = IMFSample_GetCount(sample, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!count, "Unexpected attribute count %u.\n", count); IMFSample_Release(sample2); hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_DRAIN, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); @@ -3093,39 +3096,39 @@ static void test_mixer_render(void) } hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); - ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a mixer, hr %#lx.\n", hr); hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set a device, hr %#lx.\n", hr); hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(mixer, 0, 0, &output_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_SetOutputType(mixer, 0, output_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(output_type); IMFMediaType_Release(video_type); @@ -3134,41 +3137,41 @@ static void test_mixer_render(void) ok(!!surface, "Failed to create input surface.\n"); hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(sample, 1); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(sample, 2); hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#lx.\n", status); /* FLUSH/END_STREAMING releases input */ hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(sample, 1); hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!status, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!status, "Unexpected status %#lx.\n", status); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(sample, 2); hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#lx.\n", status); hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_FLUSH, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(sample, 1); hr = IMFTransform_GetOutputStatus(mixer, &status); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!status, "Unexpected status %#x.\n", status); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!status, "Unexpected status %#lx.\n", status); IMFSample_Release(sample); IDirect3DSurface9_Release(surface); @@ -3190,7 +3193,7 @@ START_TEST(evr) if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter))) { - win_skip("Failed to create default presenter, hr %#x. Skipping tests.\n", hr); + win_skip("Failed to create default presenter, hr %#lx. Skipping tests.\n", hr); CoUninitialize(); return; } -- 2.34.1

1 0

[PATCH 7/7] comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill text background for group boxes.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 13 ++++++++++++- dlls/comctl32/tests/misc.c | 3 +-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1349e10c4c0..2ce12252460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2914,10 +2914,20 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; TEXTMETRICW textMetric; + HBRUSH brush; + HWND parent; + HRESULT hr; LONG style; int part; - HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); + /* DrawThemeParentBackground() is used for filling content background. The brush from + * WM_CTLCOLORSTATIC is used for filling text background */ + parent = GetParent(infoPtr->hwnd); + if (!parent) + parent = infoPtr->hwnd; + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + + hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { font = CreateFontIndirectW(&lf); if (!font) @@ -2969,6 +2979,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SelectClipRgn(hDC, textRegion); DeleteObject(textRegion); } + FillRect(hDC, &textRect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, part, state); } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c3de9e68c5a..dc9648c1bf0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -848,7 +848,7 @@ static void test_themed_background(void) {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_3STATE, checkbox_seq}, {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq}, - {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, + {WC_BUTTONA, BS_GROUPBOX, groupbox_seq}, {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, @@ -962,7 +962,6 @@ static void test_themed_background(void) /* WM_CTLCOLORSTATIC is used to fill text background */ color = GetPixel(hdc, 10, 10); - todo_wine ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); } -- 2.32.0

1 0

[PATCH 5/7] comctl32/button: Use the brush from WM_CTLCOLORBTN to fill background for push buttons.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

The brush from WM_CTLCOLORBTN is used for filling background for push buttons after a DrawThemeParentBackground() call according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 7 +++++++ dlls/comctl32/tests/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 88b48a4a5c0..14b2200afed 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2729,6 +2729,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { RECT bgRect, labelRect, imageRect, textRect, focusRect; NMCUSTOMDRAW nmcd; + HBRUSH brush; LRESULT cdrf; HWND parent; @@ -2748,7 +2749,13 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + { DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + /* Tests show that the brush from WM_CTLCOLORBTN is used for filling background after a + * DrawThemeParentBackground() call */ + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + FillRect(hDC, &bgRect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 72674ea5942..09c5b3d6c40 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -841,15 +841,15 @@ static void test_themed_background(void) tests[] = { {ANIMATE_CLASSA, 0, empty_seq, TRUE}, - {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq, TRUE}, - {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq, TRUE}, + {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq}, + {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq}, {WC_BUTTONA, BS_CHECKBOX, checkbox_seq, TRUE}, {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq, TRUE}, {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_3STATE, checkbox_seq, TRUE}, {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq, TRUE}, {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, - {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq, TRUE}, + {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq}, -- 2.32.0

1 0

[PATCH 4/7] comctl32/trackbar: Always use brush from WM_CTLCOLORSTATIC to fill background.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

Fix the track bar of Mupen64-RR-Lua input window having black background. Mupen64-RR-Lua doesn't actually handle WM_ERASEBKGND even though it returns nonzero. And tests show that only WM_CTLCOLORSTATIC is sent when drawing themed trackbar background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/trackbar.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 3a1b5253b58..72674ea5942 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -883,7 +883,7 @@ static void test_themed_background(void) {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, {TOOLTIPS_CLASSA, 0, empty_seq}, - {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq, TRUE}, + {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6643752c043..f2cb2a07a8d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -899,6 +899,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) HBITMAP hOldBmp = 0, hOffScreenBmp = 0; NMCUSTOMDRAW nmcd; int gcdrf, icdrf; + HBRUSH brush; if (infoPtr->flags & TB_THUMBCHANGED) { TRACKBAR_UpdateThumb (infoPtr); @@ -943,14 +944,9 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) /* Erase background */ if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { - if (GetWindowTheme (infoPtr->hwndSelf)) { - DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); - } - else { - HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); - FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); - } + brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, (WPARAM)hdc, + (LPARAM)infoPtr->hwndSelf); + FillRect(hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); } -- 2.32.0

1 0

[PATCH 3/7] comctl32/tests: Add themed background tests.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

Add themed background tests to determine whether DrawThemeParentBackground() or WM_CTLCOLOR* are used to draw themed background for comctl32 classes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 327 +++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 4628e37bb7a..3a1b5253b58 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -46,6 +46,7 @@ static HMODULE hComctl32; enum seq_index { CHILD_SEQ_INDEX, + PARENT_SEQ_INDEX, NUM_MSG_SEQUENCES }; @@ -652,6 +653,331 @@ static void test_WM_SYSCOLORCHANGE(void) DestroyWindow(parent); } +static const struct message empty_seq[] = +{ + {0} +}; + +static const struct message wm_erasebkgnd_seq[] = +{ + {WM_ERASEBKGND, sent}, + {0} +}; + +static const struct message wm_ctlcolorstatic_seq[] = +{ + {WM_CTLCOLORSTATIC, sent}, + {0} +}; + +static const struct message drawthemeparentbackground_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent}, + {0} +}; + +static const struct message drawthemeparentbackground_optional_seq[] = +{ + {WM_ERASEBKGND, sent | optional}, + {WM_PRINTCLIENT, sent | optional}, + {0} +}; + +static const struct message pushbutton_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent}, + {WM_CTLCOLORBTN, sent}, + {0} +}; + +static const struct message defpushbutton_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent}, + {WM_CTLCOLORBTN, sent}, + {WM_ERASEBKGND, sent | optional}, + {WM_PRINTCLIENT, sent | optional}, + {WM_CTLCOLORBTN, sent | optional}, + {0} +}; + +static const struct message checkbox_seq[] = +{ + {WM_ERASEBKGND, sent | optional}, + {WM_PRINTCLIENT, sent | optional}, + {WM_CTLCOLORSTATIC, sent}, + {0} +}; + +static const struct message radiobutton_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent}, + {WM_CTLCOLORSTATIC, sent}, + {0} +}; + +static const struct message groupbox_seq[] = +{ + {WM_CTLCOLORSTATIC, sent}, + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent}, + {0} +}; + +static const struct message ownerdrawbutton_seq[] = +{ + {WM_CTLCOLORBTN, sent}, + {WM_CTLCOLORBTN, sent}, + {0} +}; + +static const struct message splitbutton_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent}, + /* Either WM_CTLCOLORSTATIC or WM_CTLCOLORBTN */ + {WM_CTLCOLORSTATIC, sent | optional}, + {WM_CTLCOLORBTN, sent | optional}, + /* BS_DEFSPLITBUTTON or BS_DEFCOMMANDLINK */ + {WM_ERASEBKGND, sent | optional}, + {WM_PRINTCLIENT, sent | optional}, + {WM_CTLCOLORSTATIC, sent | optional}, + {WM_CTLCOLORBTN, sent | optional}, + {0} +}; + +static const struct message combobox_seq[] = +{ + {WM_ERASEBKGND, sent | optional}, + {WM_PRINTCLIENT, sent | optional}, + {WM_CTLCOLOREDIT, sent}, + {WM_CTLCOLORLISTBOX, sent}, + {WM_CTLCOLORLISTBOX, sent | optional}, + {WM_CTLCOLOREDIT, sent | optional}, + {WM_CTLCOLOREDIT, sent | optional}, + {0} +}; + +static const struct message edit_seq[] = +{ + {WM_CTLCOLOREDIT, sent}, + {WM_CTLCOLOREDIT, sent | optional}, + {0} +}; + +static const struct message listbox_seq[] = +{ + {WM_CTLCOLORLISTBOX, sent}, + {WM_CTLCOLORLISTBOX, sent}, + {0} +}; + +static const struct message treeview_seq[] = +{ + {WM_CTLCOLOREDIT, sent | optional}, + {WM_CTLCOLOREDIT, sent | optional}, + {0} +}; + +static const struct message scrollbar_seq[] = +{ + {WM_CTLCOLORSCROLLBAR, sent}, + {WM_CTLCOLORSCROLLBAR, sent | optional}, + {0} +}; + +static LRESULT WINAPI test_themed_background_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + struct message msg = {0}; + HBRUSH brush; + RECT rect; + + if (message == WM_ERASEBKGND || message == WM_PRINTCLIENT || (message >= WM_CTLCOLORMSGBOX + && message <= WM_CTLCOLORSTATIC)) + { + msg.message = message; + msg.flags = sent; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + } + + if (message == WM_ERASEBKGND) + { + brush = CreateSolidBrush(RGB(255, 0, 0)); + GetClientRect(hwnd, &rect); + FillRect((HDC)wp, &rect, brush); + DeleteObject(brush); + return 1; + } + else if (message >= WM_CTLCOLORMSGBOX && message <= WM_CTLCOLORSTATIC) + { + return (LRESULT)GetStockObject(GRAY_BRUSH); + } + + return DefWindowProcA(hwnd, message, wp, lp); +} + +static void test_themed_background(void) +{ + DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); + DPI_AWARENESS_CONTEXT old_context = NULL; + BOOL (WINAPI *pIsThemeActive)(void); + HWND child, parent; + HMODULE uxtheme; + COLORREF color; + WNDCLASSA cls; + HDC hdc; + int i; + + static const struct test + { + const CHAR *class_name; + DWORD style; + const struct message *seq; + BOOL todo; + } + tests[] = + { + {ANIMATE_CLASSA, 0, empty_seq, TRUE}, + {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq, TRUE}, + {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq, TRUE}, + {WC_BUTTONA, BS_CHECKBOX, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq, TRUE}, + {WC_BUTTONA, BS_3STATE, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, + {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq, TRUE}, + {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, + {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, + {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq}, + {WC_BUTTONA, BS_SPLITBUTTON, splitbutton_seq}, + {WC_BUTTONA, BS_DEFSPLITBUTTON, splitbutton_seq}, + {WC_BUTTONA, BS_COMMANDLINK, splitbutton_seq}, + {WC_BUTTONA, BS_DEFCOMMANDLINK, splitbutton_seq}, + {WC_COMBOBOXA, 0, combobox_seq, TRUE}, + {WC_COMBOBOXEXA, 0, drawthemeparentbackground_optional_seq}, + {DATETIMEPICK_CLASSA, 0, drawthemeparentbackground_optional_seq, TRUE}, + {WC_EDITA, 0, edit_seq}, + {WC_HEADERA, 0, empty_seq}, + {HOTKEY_CLASSA, 0, empty_seq, TRUE}, + {WC_IPADDRESSA, 0, empty_seq}, + {WC_LISTBOXA, 0, listbox_seq, TRUE}, + {WC_LISTVIEWA, 0, empty_seq}, + {MONTHCAL_CLASSA, 0, empty_seq}, + {WC_NATIVEFONTCTLA, 0, empty_seq}, + {WC_PAGESCROLLERA, 0, wm_erasebkgnd_seq}, + {PROGRESS_CLASSA, 0, drawthemeparentbackground_optional_seq}, + {REBARCLASSNAMEA, 0, empty_seq}, + {WC_STATICA, SS_LEFT, wm_ctlcolorstatic_seq}, + {WC_STATICA, SS_ICON, wm_ctlcolorstatic_seq}, + {WC_STATICA, SS_BLACKRECT, wm_ctlcolorstatic_seq, TRUE}, + {WC_STATICA, SS_OWNERDRAW, wm_ctlcolorstatic_seq}, + {WC_STATICA, SS_BITMAP, wm_ctlcolorstatic_seq}, + {WC_STATICA, SS_ENHMETAFILE, wm_ctlcolorstatic_seq}, + {WC_STATICA, SS_ETCHEDHORZ, wm_ctlcolorstatic_seq, TRUE}, + {STATUSCLASSNAMEA, 0, empty_seq}, + {"SysLink", 0, wm_ctlcolorstatic_seq}, + {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, + {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, + {TOOLTIPS_CLASSA, 0, empty_seq}, + {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq, TRUE}, + {WC_TREEVIEWA, 0, treeview_seq}, + {UPDOWN_CLASSA, 0, empty_seq}, + {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, + {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq, TRUE}, + {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq, TRUE}, + }; + + uxtheme = LoadLibraryA("uxtheme.dll"); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + if (!pIsThemeActive()) + { + skip("Theming is inactive.\n"); + FreeLibrary(uxtheme); + return; + } + FreeLibrary(uxtheme); + + pSetThreadDpiAwarenessContext = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), + "SetThreadDpiAwarenessContext"); + if (pSetThreadDpiAwarenessContext) + pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + + memset(&cls, 0, sizeof(cls)); + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpfnWndProc = test_themed_background_proc; + cls.lpszClassName = "ParentClass"; + RegisterClassA(&cls); + + parent = CreateWindowA(cls.lpszClassName, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, + 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %u.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("%s %#x", tests[i].class_name, tests[i].style); + + child = CreateWindowA(tests[i].class_name, " ", WS_CHILD | WS_VISIBLE | tests[i].style, + 0, 0, 50, 50, parent, 0, 0, 0); + ok(child != NULL, "CreateWindowA failed, error %u.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + ok_sequence(sequences, PARENT_SEQ_INDEX, tests[i].seq, "paint background", tests[i].todo); + + /* For message sequences that contain both DrawThemeParentBackground() messages and + * WM_CTLCOLOR*, do a color test to check which is really in effect for controls that can be + * tested automatically. For WM_ERASEBKGND from DrawThemeParentBackground(), a red brush is + * used. For WM_CTLCOLOR*, a gray brush is returned. If there are only WM_CTLCOLOR* messages + * in the message sequence, then surely DrawThemeParentBackground() is not used. + * + * For tests that use pushbutton_seq and defpushbutton_seq, manual tests on XP show that + * a brush from WM_CTLCOLORBTN is used to fill background even after a successful + * DrawThemeParentBackground(). This behavior can be verified by returning a gray or hollow + * brush in test_themed_background_proc() when handling WM_CTLCOLORBTN. It can't be tested + * automatically here because stock Windows themes don't use transparent button bitmaps */ + if (tests[i].seq == radiobutton_seq || tests[i].seq == groupbox_seq) + { + hdc = GetDC(child); + + if (tests[i].seq == radiobutton_seq) + { + /* WM_CTLCOLORSTATIC is used to fill background */ + color = GetPixel(hdc, 40, 40); + todo_wine + ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); + } + else if (tests[i].seq == groupbox_seq) + { + /* DrawThemeParentBackground() is used to fill content background */ + color = GetPixel(hdc, 40, 40); + ok(color == 0xff, "Expected color %#x, got %#x.\n", 0xff, color); + + /* WM_CTLCOLORSTATIC is used to fill text background */ + color = GetPixel(hdc, 10, 10); + todo_wine + ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); + } + + ReleaseDC(child, hdc); + } + + DestroyWindow(child); + winetest_pop_context(); + } + + DestroyWindow(parent); + UnregisterClassA(cls.lpszClassName, GetModuleHandleA(0)); + if (pSetThreadDpiAwarenessContext) + pSetThreadDpiAwarenessContext(old_context); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -675,6 +1001,7 @@ START_TEST(misc) test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown(); + test_themed_background(); test_WM_THEMECHANGED(); test_WM_SYSCOLORCHANGE(); -- 2.32.0

1 0

[PATCH 2/7] uxtheme: Use tab background as dialog texture for more WM_CTLCOLOR* messages.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 3 +++ dlls/uxtheme/tests/system.c | 15 ++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 87c2b7d1c13..b91e20f0f33 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -149,6 +149,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); return TRUE; } + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: case WM_CTLCOLORSTATIC: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 77a12f3fa44..c70e6c27361 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1854,7 +1854,6 @@ static void test_EnableThemeDialogTexture(void) } else { - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); } @@ -1863,7 +1862,6 @@ static void test_EnableThemeDialogTexture(void) ok(old_mode != 0, "SetBkMode failed.\n"); SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that some WM_CTLCOLOR* messages change background color when dialog texture is on */ @@ -1879,24 +1877,18 @@ static void test_EnableThemeDialogTexture(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(brush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); /* Test that DefDlgProcA/W() are hooked for some WM_CTLCOLOR* messages */ brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); brush2 = (HBRUSH)DefDlgProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); ok(brush2 == brush, "Expected the same brush.\n"); @@ -1905,24 +1897,21 @@ static void test_EnableThemeDialogTexture(void) /* Test that DefWindowProcA/W() are also hooked for some WM_CTLCOLOR* messages */ brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); if (msg != WM_CTLCOLORDLG) { brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg == WM_CTLCOLORSTATIC) + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg == WM_CTLCOLORSTATIC) + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); } else { brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); } -- 2.32.0

1 0

[PATCH 1/7] uxtheme/tests: Test more WM_CTLCOLOR* messages for dialog theming.
by Zhiyi Zhang 09 Feb '22

09 Feb '22

Test that some WM_CTLCOLOR* other than WM_CTLCOLORSTATIC also use tab background as dialog texture. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 150 ++++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 56 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 980676f9e57..77a12f3fa44 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1617,6 +1617,7 @@ static void test_EnableThemeDialogTexture(void) LRESULT lr; POINT org; SIZE size; + UINT msg; BOOL ret; struct @@ -1822,74 +1823,111 @@ static void test_EnableThemeDialogTexture(void) GetSysColorBrush(COLOR_MENU), brush); handle_WM_CTLCOLORSTATIC = FALSE; - /* Test that WM_CTLCOLORSTATIC changes brush origin when dialog texture is on */ - ret = SetBrushOrgEx(child_hdc, 0, 0, NULL); - ok(ret, "SetBrushOrgEx failed, error %u.\n", GetLastError()); - SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); - - /* Test that WM_CTLCOLORSTATIC changes background mode when dialog texture is on */ - old_mode = SetBkMode(child_hdc, OPAQUE); - ok(old_mode != 0, "SetBkMode failed.\n"); - SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - mode = SetBkMode(child_hdc, old_mode); - ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); - - /* Test that WM_CTLCOLORSTATIC changes background color when dialog texture is on */ - old_color = SetBkColor(child_hdc, 0xaa5511); - ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); - SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - color = SetBkColor(child_hdc, old_color); - ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", - GetSysColor(COLOR_BTNFACE), color); - /* Test that dialog doesn't have theme handle opened for itself */ ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); - /* Test that the returned brush is a pattern brush created from the tab body */ - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - memset(&log_brush, 0, sizeof(log_brush)); - count = GetObjectA(brush, sizeof(log_brush), &log_brush); - ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, - log_brush.lbStyle); - - memset(&bmp, 0, sizeof(bmp)); - count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - theme = OpenThemeData(NULL, L"Tab"); ok(theme != NULL, "OpenThemeData failed.\n"); - size.cx = 0; size.cy = 0; hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); - CloseThemeData(theme); - /* Test that DefDlgProcA/W() are hooked for WM_CTLCOLORSTATIC */ - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - brush2 = (HBRUSH)DefDlgProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush2 == brush, "Expected the same brush.\n"); - brush2 = (HBRUSH)DefDlgProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush2 == brush, "Expected the same brush.\n"); + /* Test which WM_CTLCOLOR* message uses tab background as dialog texture */ + for (msg = WM_CTLCOLORMSGBOX; msg <= WM_CTLCOLORSTATIC; ++msg) + { + winetest_push_context("msg %#x", msg); - /* Test that DefWindowProcA/W() are also hooked for WM_CTLCOLORSTATIC */ - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - brush2 = (HBRUSH)DefWindowProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine - ok(brush2 == brush, "Expected the same brush.\n"); - brush2 = (HBRUSH)DefWindowProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine - ok(brush2 == brush, "Expected the same brush.\n"); + /* Test that some WM_CTLCOLOR* messages change brush origin when dialog texture is on */ + ret = SetBrushOrgEx(child_hdc, 0, 0, NULL); + ok(ret, "SetBrushOrgEx failed, error %u.\n", GetLastError()); + SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + /* WM_CTLCOLOREDIT, WM_CTLCOLORLISTBOX and WM_CTLCOLORSCROLLBAR don't use tab background */ + if (msg == WM_CTLCOLOREDIT || msg == WM_CTLCOLORLISTBOX || msg == WM_CTLCOLORSCROLLBAR) + { + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + winetest_pop_context(); + continue; + } + else + { + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); + } + + /* Test that some WM_CTLCOLOR* messages change background mode when dialog texture is on */ + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); + + /* Test that some WM_CTLCOLOR* messages change background color when dialog texture is on */ + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + + /* Test that the returned brush is a pattern brush created from the tab body */ + brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + memset(&log_brush, 0, sizeof(log_brush)); + count = GetObjectA(brush, sizeof(log_brush), &log_brush); + ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, + log_brush.lbStyle); + + memset(&bmp, 0, sizeof(bmp)); + count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); + + /* Test that DefDlgProcA/W() are hooked for some WM_CTLCOLOR* messages */ + brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + brush2 = (HBRUSH)DefDlgProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + brush2 = (HBRUSH)DefDlgProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + + /* Test that DefWindowProcA/W() are also hooked for some WM_CTLCOLOR* messages */ + brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + if (msg != WM_CTLCOLORDLG) + { + brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg == WM_CTLCOLORSTATIC) + ok(brush2 == brush, "Expected the same brush.\n"); + brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg == WM_CTLCOLORSTATIC) + ok(brush2 == brush, "Expected the same brush.\n"); + } + else + { + brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + } + + winetest_pop_context(); + } /* Test that DefWindowProcA/W() are not hooked for WM_ERASEBKGND. So the background is still * drawn with hbrBackground, which in this case, is GRAY_BRUSH. -- 2.32.0

1 0

[PATCH 01/25] programs/schtasks: enable compilation with long types
by Eric Pouech 09 Feb '22

09 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/schtasks/Makefile.in | 1 - programs/schtasks/schtasks.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in index 63afc93a876..6eb8d530425 100644 --- a/programs/schtasks/Makefile.in +++ b/programs/schtasks/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schtasks.exe IMPORTS = oleaut32 ole32 diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 340aeaa56fb..c9434801db8 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -40,14 +40,14 @@ static ITaskFolder *get_tasks_root_folder(void) V_VT(&empty) = VT_EMPTY; hres = ITaskService_Connect(service, empty, empty, empty, empty); if (FAILED(hres)) { - FIXME("Connect failed: %08x\n", hres); + FIXME("Connect failed: %08lx\n", hres); return NULL; } hres = ITaskService_GetFolder(service, NULL, &root); ITaskService_Release(service); if (FAILED(hres)) { - FIXME("GetFolder failed: %08x\n", hres); + FIXME("GetFolder failed: %08lx\n", hres); return NULL; } @@ -70,7 +70,7 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) SysFreeString(str); ITaskFolder_Release(root); if (FAILED(hres)) { - FIXME("GetTask failed: %08x\n", hres); + FIXME("GetTask failed: %08lx\n", hres); return NULL; } @@ -183,7 +183,7 @@ static int change_command(int argc, WCHAR *argv[]) hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); if (FAILED(hres)) { IRegisteredTask_Release(task); - FIXME("put_Enabled failed: %08x\n", hres); + FIXME("put_Enabled failed: %08lx\n", hres); return 1; } }

1 24

[PATCH 1/4] ddraw/tests: Skip a crashy test on WARP.
by Stefan Dösinger 09 Feb '22

09 Feb '22

ddraw1 doesn't draw, so presumably not affected. Can't find any crashes in the testbot history http://test.winehq.org/data/4364ff8d5c0387edd6fae142affe8e844b291518/win81_… http://test.winehq.org/data/d03984709d87d6eaa0e2e7746f0db5d8fdf81b5a/win150… I haven't found any examples of ddraw7 crashing in this test. Doesn't mean there aren't any. Let's wait and see. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 9 +++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 625776c652c..1285fa1b682 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1076,6 +1076,17 @@ static void test_coop_level_d3d_state(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw2 crashes in EndScene, and if it doesn't crash it fails with + * DDERR_SURFACELOST on WARP. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); @@ -1159,12 +1170,9 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); - if (hr == DD_OK) - { - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b8acb674e3..6ed12d980db 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1301,6 +1301,14 @@ static void test_coop_level_d3d_state(void) hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw4 occasionally crashes in GetRenderTarget. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + goto done; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); @@ -1349,6 +1357,7 @@ static void test_coop_level_d3d_state(void) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), "Got unexpected color 0x%08x.\n", color); +done: destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); -- 2.34.1

5 13

[PATCH] ole32: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov 09 Feb '22

09 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/antimoniker.c | 11 +-- dlls/ole32/bindctx.c | 10 +-- dlls/ole32/classmoniker.c | 18 ++-- dlls/ole32/clipboard.c | 44 ++++----- dlls/ole32/comcat.c | 6 +- dlls/ole32/compobj.c | 8 +- dlls/ole32/compositemoniker.c | 44 ++++----- dlls/ole32/datacache.c | 25 +++--- dlls/ole32/defaulthandler.c | 37 ++++---- dlls/ole32/filelockbytes.c | 12 +-- dlls/ole32/filemoniker.c | 6 +- dlls/ole32/git.c | 14 +-- dlls/ole32/itemmoniker.c | 18 ++-- dlls/ole32/memlockbytes.c | 6 +- dlls/ole32/moniker.c | 28 +++--- dlls/ole32/ole2.c | 52 +++++------ dlls/ole32/ole2stubs.c | 4 +- dlls/ole32/oleobj.c | 33 +++---- dlls/ole32/pointermoniker.c | 32 +++---- dlls/ole32/stg_prop.c | 104 +++++++++++----------- dlls/ole32/stg_stream.c | 26 +++--- dlls/ole32/storage32.c | 162 ++++++++++++++++------------------ dlls/ole32/usrmarshal.c | 89 +++++++++---------- 24 files changed, 375 insertions(+), 416 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index e0e4bc74c1f..340ffdbded2 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -2,7 +2,7 @@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase DELAYIMPORTS = oleaut32 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLE32_ +EXTRADEFS = -D_OLE32_ C_SRCS = \ antimoniker.c \ diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 28c4dd91ac5..2a7be8e75cc 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -122,7 +122,7 @@ static ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker *iface) AntiMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedIncrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -135,7 +135,7 @@ static ULONG WINAPI AntiMonikerImpl_Release(IMoniker *iface) AntiMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -261,14 +261,11 @@ AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef return E_NOTIMPL; } -/****************************************************************************** - * AntiMoniker_Reduce - ******************************************************************************/ static HRESULT WINAPI AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if (ppmkReduced==NULL) return E_POINTER; @@ -556,7 +553,7 @@ AntiMonikerROTDataImpl_GetComparisonData(IROTData *iface, BYTE *data, ULONG data { AntiMonikerImpl *moniker = impl_from_IROTData(iface); - TRACE("%p, %p, %u, %p.\n", iface, data, data_len, data_req); + TRACE("%p, %p, %lu, %p.\n", iface, data, data_len, data_req); *data_req = sizeof(CLSID) + sizeof(DWORD); if (data_len < *data_req) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 261c6b01c67..360464d13c5 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -118,7 +118,7 @@ static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) BindCtxImpl *context = impl_from_IBindCtx(iface); ULONG refcount = InterlockedDecrement(&context->ref); - TRACE("%p refcount %d.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -234,7 +234,7 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) if (pbindopts->cbStruct > sizeof(This->options)) { - WARN("invalid size %u.\n", pbindopts->cbStruct); + WARN("invalid size %lu.\n", pbindopts->cbStruct); return E_INVALIDARG; } memcpy(&This->options, pbindopts, pbindopts->cbStruct); @@ -492,7 +492,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, IBindCtx **bind_context) { BindCtxImpl *object; - TRACE("%#x, %p\n", reserved, bind_context); + TRACE("%#lx, %p.\n", reserved, bind_context); if (!bind_context) return E_INVALIDARG; @@ -500,7 +500,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, IBindCtx **bind_context) if (reserved) { - WARN("reserved should be 0, not 0x%x\n", reserved); + WARN("reserved should be 0, not %#lx.\n", reserved); return E_INVALIDARG; } @@ -539,7 +539,7 @@ HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID riid, LPVOID * pp HRESULT res; IBindCtx * pbc; - TRACE("(%p, %x, %s, %p)\n", pmk, grfOpt, debugstr_guid(riid), ppvResult); + TRACE("%p, %lx, %s, %p.\n", pmk, grfOpt, debugstr_guid(riid), ppvResult); res = CreateBindCtx(grfOpt, &pbc); if (SUCCEEDED(res)) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 8fe60c6ba71..6199a5a5182 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -133,7 +133,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) ClassMoniker *moniker = impl_from_IMoniker(iface); ULONG ref = InterlockedDecrement(&moniker->ref); - TRACE("%p refcount %d\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -190,7 +190,7 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) heap_free(moniker->data); if (!(moniker->data = heap_alloc(moniker->header.data_len))) { - WARN("Failed to allocate moniker data of size %u.\n", moniker->header.data_len); + WARN("Failed to allocate moniker data of size %lu.\n", moniker->header.data_len); moniker->header.data_len = 0; return E_OUTOFMEMORY; } @@ -278,16 +278,10 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); } -/****************************************************************************** - * ClassMoniker_Reduce - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface, - IBindCtx* pbc, - DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, - IMoniker** ppmkReduced) +static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface, IBindCtx *pbc, + DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced) { - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if (!ppmkReduced) return E_POINTER; @@ -547,7 +541,7 @@ static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface, { ClassMoniker *This = impl_from_IROTData(iface); - TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData); + TRACE("%p, %p, %lu, %p.\n", iface, pbData, cbMax, pcbData); *pcbData = 2*sizeof(CLSID); if (cbMax < *pcbData) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 1cad47a6a47..5d1be63a3f7 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -277,7 +277,7 @@ static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd) static inline const char *dump_fmtetc(FORMATETC *fmt) { if (!fmt) return "(null)"; - return wine_dbg_sprintf("cf %04x ptd %p aspect %x lindex %d tymed %x", + return wine_dbg_sprintf("cf %04x ptd %p aspect %lx lindex %ld tymed %lx", fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); } @@ -338,9 +338,11 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - TRACE("(%p)->(count=%u)\n",This, This->ref); + ULONG ref = InterlockedIncrement(&This->ref); - return InterlockedIncrement(&This->ref); + TRACE("%p, refcount %lu.\n", iface, ref); + + return ref; } /************************************************************************ @@ -351,11 +353,10 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - ULONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n",This, This->ref); + TRACE("%p, refcount %lu.\n", iface, ref); - ref = InterlockedDecrement(&This->ref); if (!ref) { TRACE("() - destroying IEnumFORMATETC(%p)\n",This); @@ -415,7 +416,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULONG celt) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - TRACE("(%p)->(num=%u)\n", This, celt); + TRACE("%p, %lu.\n", iface, celt); This->pos += celt; if (This->pos > This->data->count) @@ -650,7 +651,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) if (FAILED(hr = IDataObject_GetDataHere(theOleClipboard->src_data, fmt, &std))) { - WARN("() : IDataObject_GetDataHere failed to render clipboard data! (%x)\n", hr); + WARN("() : IDataObject_GetDataHere failed to render clipboard data! (%lx)\n", hr); GlobalFree(hStorage); return hr; } @@ -1025,7 +1026,7 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) } else { - FIXME("Unhandled tymed %x\n", fmt->tymed); + FIXME("Unhandled tymed %lx\n", fmt->tymed); hr = DV_E_FORMATETC; } @@ -1089,10 +1090,11 @@ static HRESULT WINAPI snapshot_QueryInterface(IDataObject *iface, static ULONG WINAPI snapshot_AddRef(IDataObject *iface) { snapshot *This = impl_from_IDataObject(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("%p, refcount %lu.\n", iface, ref); - return InterlockedIncrement(&This->ref); + return ref; } /************************************************************************ @@ -1101,11 +1103,9 @@ static ULONG WINAPI snapshot_AddRef(IDataObject *iface) static ULONG WINAPI snapshot_Release(IDataObject *iface) { snapshot *This = impl_from_IDataObject(iface); - ULONG ref; - - TRACE("(%p)->(count=%u)\n", This, This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 0) { @@ -1263,7 +1263,7 @@ static HRESULT get_priv_data(ole_priv_data **data) else TRACE("cf %04x\n", cf); } - TRACE("count %d\n", count); + TRACE("count %ld\n", count); size += count * sizeof(ret->entries[0]); /* There are holes in fmtetc so zero init */ @@ -1532,7 +1532,7 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, hr = get_stgmed_for_bitmap((HBITMAP)h, med); else { - FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed); + FIXME("Unhandled tymed - mask %lx req tymed %lx\n", mask, fmt->tymed); hr = E_FAIL; goto end; } @@ -1558,7 +1558,7 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt, if ( !fmt || !med ) return E_INVALIDARG; - TRACE("(%p, %p {%s}, %p (tymed %x)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed); + TRACE("%p, %p {%s}, %p (tymed %lx)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed); if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; @@ -1642,7 +1642,7 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt, break; } default: - FIXME("Unhandled tymed - supported %x req tymed %x\n", supported, med->tymed); + FIXME("Unhandled tymed - supported %x req tymed %lx\n", supported, med->tymed); hr = E_FAIL; goto end; } @@ -1710,7 +1710,7 @@ static HRESULT WINAPI snapshot_EnumFormatEtc(IDataObject *iface, DWORD dir, HRESULT hr; ole_priv_data *data = NULL; - TRACE("(%p, %x, %p)\n", iface, dir, enum_fmt); + TRACE("%p, %lx, %p.\n", iface, dir, enum_fmt); *enum_fmt = NULL; @@ -1737,7 +1737,7 @@ static HRESULT WINAPI snapshot_DAdvise(IDataObject *iface, FORMATETC *fmt, DWORD flags, IAdviseSink *sink, DWORD *conn) { - TRACE("(%p, %p, %x, %p, %p): not implemented\n", iface, fmt, flags, sink, conn); + TRACE("%p, %p, %lx, %p, %p.\n", iface, fmt, flags, sink, conn); return E_NOTIMPL; } @@ -1748,7 +1748,7 @@ static HRESULT WINAPI snapshot_DAdvise(IDataObject *iface, FORMATETC *fmt, */ static HRESULT WINAPI snapshot_DUnadvise(IDataObject* iface, DWORD conn) { - TRACE("(%p, %d): not implemented\n", iface, conn); + TRACE("%p, %ld.\n", iface, conn); return E_NOTIMPL; } diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 0b97b00d908..ad7e8a4b076 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -505,7 +505,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc( HKEY key; HRESULT res; - TRACE("CATID: %s LCID: %x\n",debugstr_guid(rcatid), lcid); + TRACE("CATID: %s LCID: %lx\n",debugstr_guid(rcatid), lcid); if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG; @@ -589,10 +589,10 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories( if (TRACE_ON(ole)) { ULONG count; - TRACE("CLSID: %s Implemented %u\n",debugstr_guid(rclsid),cImplemented); + TRACE("CLSID: %s Implemented %lu\n",debugstr_guid(rclsid),cImplemented); for (count = 0; count < cImplemented; ++count) TRACE(" %s\n",debugstr_guid(&rgcatidImpl[count])); - TRACE("Required %u\n",cRequired); + TRACE("Required %lu\n",cRequired); for (count = 0; count < cRequired; ++count) TRACE(" %s\n",debugstr_guid(&rgcatidReq[count])); } diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index aafc4cf19f8..8d2591c1211 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -373,7 +373,7 @@ static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) { MREImpl *This = impl_from_ISynchronize(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -382,7 +382,7 @@ static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface) { MREImpl *This = impl_from_ISynchronize(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if(!ref) { @@ -397,7 +397,7 @@ static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DW { MREImpl *This = impl_from_ISynchronize(iface); DWORD index; - TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds); + TRACE("%p, %#lx, %#lx.\n", iface, dwFlags, dwMilliseconds); return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index); } @@ -929,7 +929,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, reserved); + TRACE("%p, %#lx, %p.\n", hinstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a94e4734f45..84099cee6d6 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -147,7 +147,7 @@ static ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface) CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->ref); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); if (!refcount) { @@ -205,13 +205,13 @@ static HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker *iface, IStream *stream hr = IStream_Read(stream, &count, sizeof(DWORD), NULL); if (hr != S_OK) { - WARN("Failed to read component count, hr %#x.\n", hr); + WARN("Failed to read component count, hr %#lx.\n", hr); return hr; } if (count < 2) { - WARN("Unexpected component count %u.\n", count); + WARN("Unexpected component count %lu.\n", count); return E_UNEXPECTED; } @@ -222,7 +222,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker *iface, IStream *stream { if (FAILED(hr = OleLoadFromStream(stream, &IID_IMoniker, (void **)&m))) { - WARN("Failed to initialize component %u, hr %#x.\n", i, hr); + WARN("Failed to initialize component %lu, hr %#lx.\n", i, hr); IMoniker_Release(last); return hr; } @@ -416,7 +416,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc BOOL was_reduced; HRESULT hr; - TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, howfar, toleft, reduced); if (!pbc || !reduced) return E_INVALIDARG; @@ -1021,7 +1021,7 @@ static HRESULT composite_get_moniker_comparison_data(IMoniker *moniker, if (FAILED(hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rot_data))) { - WARN("Failed to get IROTData for component moniker, hr %#x.\n", hr); + WARN("Failed to get IROTData for component moniker, hr %#lx.\n", hr); return hr; } @@ -1038,7 +1038,7 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if HRESULT hr; ULONG len; - TRACE("%p, %p, %u, %p\n", iface, data, max_len, ret_len); + TRACE("%p, %p, %lu, %p\n", iface, data, max_len, ret_len); if (!moniker->comp_count) return E_UNEXPECTED; @@ -1052,7 +1052,7 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if *ret_len += len; else { - WARN("Failed to get comparison data length for left component, hr %#x.\n", hr); + WARN("Failed to get comparison data length for left component, hr %#lx.\n", hr); return hr; } @@ -1062,7 +1062,7 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if *ret_len += len; else { - WARN("Failed to get comparison data length for right component, hr %#x.\n", hr); + WARN("Failed to get comparison data length for right component, hr %#lx.\n", hr); return hr; } @@ -1074,14 +1074,14 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if max_len -= sizeof(CLSID); if (FAILED(hr = composite_get_moniker_comparison_data(moniker->left, data, max_len, &len))) { - WARN("Failed to get comparison data for left component, hr %#x.\n", hr); + WARN("Failed to get comparison data for left component, hr %#lx.\n", hr); return hr; } data += len; max_len -= len; if (FAILED(hr = composite_get_moniker_comparison_data(moniker->right, data, max_len, &len))) { - WARN("Failed to get comparison data for right component, hr %#x.\n", hr); + WARN("Failed to get comparison data for right component, hr %#lx.\n", hr); return hr; } @@ -1121,7 +1121,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_GetUnmarshalClass( { CompositeMonikerImpl *This = impl_from_IMarshal(iface); - TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv, + TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pCid); return IMoniker_GetClassID(&This->IMoniker_iface, pCid); @@ -1135,7 +1135,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_GetMarshalSizeMax( HRESULT hr; ULONG size; - TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv, + TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pSize); if (!moniker->comp_count) @@ -1166,19 +1166,19 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_MarshalInterface(IMarshal *ifa CompositeMonikerImpl *moniker = impl_from_IMarshal(iface); HRESULT hr; - TRACE("%p, %p, %s, %p, %x, %p, %#x\n", iface, stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, flags); + TRACE("%p, %p, %s, %p, %lx, %p, %#lx\n", iface, stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, flags); if (!moniker->comp_count) return E_UNEXPECTED; if (FAILED(hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker->left, dwDestContext, pvDestContext, flags))) { - WARN("Failed to marshal left component, hr %#x.\n", hr); + WARN("Failed to marshal left component, hr %#lx.\n", hr); return hr; } if (FAILED(hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker->right, dwDestContext, pvDestContext, flags))) - WARN("Failed to marshal right component, hr %#x.\n", hr); + WARN("Failed to marshal right component, hr %#lx.\n", hr); return hr; } @@ -1205,13 +1205,13 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_UnmarshalInterface(IMarshal *i if (FAILED(hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker->left))) { - WARN("Failed to unmarshal left moniker, hr %#x.\n", hr); + WARN("Failed to unmarshal left moniker, hr %#lx.\n", hr); return hr; } if (FAILED(hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker->right))) { - WARN("Failed to unmarshal right moniker, hr %#x.\n", hr); + WARN("Failed to unmarshal right moniker, hr %#lx.\n", hr); return hr; } @@ -1229,7 +1229,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_ReleaseMarshalData(IMarshal *i static HRESULT WINAPI CompositeMonikerMarshalImpl_DisconnectObject(IMarshal *iface, DWORD dwReserved) { - TRACE("(0x%x)\n", dwReserved); + TRACE("%#lx\n", dwReserved); /* can't disconnect a state-based marshal as nothing on server side to * disconnect from */ return S_OK; @@ -1286,7 +1286,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker *iface) ULONG refcount = InterlockedDecrement(&e->ref); unsigned int i; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1305,7 +1305,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count, EnumMonikerImpl *e = impl_from_IEnumMoniker(iface); unsigned int i; - TRACE("%p, %u, %p, %p.\n", iface, count, m, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, count, m, fetched); if (!m) return E_INVALIDARG; @@ -1329,7 +1329,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker *iface, ULONG count) { EnumMonikerImpl *e = impl_from_IEnumMoniker(iface); - TRACE("%p, %u.\n", iface, count); + TRACE("%p, %lu.\n", iface, count); if (!count) return S_OK; diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a536f829515..e6cea25aca6 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -215,7 +215,7 @@ static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface ) const char *debugstr_formatetc(const FORMATETC *formatetc) { - return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %d, lindex = %d, tymed = %d }", + return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %ld, lindex = %ld, tymed = %ld }", formatetc->cfFormat, formatetc->ptd, formatetc->dwAspect, formatetc->lindex, formatetc->tymed); } @@ -353,7 +353,7 @@ static HRESULT check_valid_formatetc( const FORMATETC *fmt ) return CACHE_S_FORMATETC_NOTSUPPORTED; else { - WARN("invalid clipformat/tymed combination: %d/%d\n", fmt->cfFormat, fmt->tymed); + WARN("invalid clipformat/tymed combination: %d/%ld\n", fmt->cfFormat, fmt->tymed); return DV_E_TYMED; } } @@ -427,7 +427,7 @@ static void DataCache_FireOnViewChange( DWORD aspect, LONG lindex) { - TRACE("(%p, %x, %d)\n", this, aspect, lindex); + TRACE("%p, %lx, %ld.\n", this, aspect, lindex); /* * The sink supplies a filter when it registers @@ -2018,7 +2018,7 @@ static HRESULT WINAPI DataCache_Draw( HRESULT hres; DataCacheEntry *cache_entry; - TRACE("(%p, %x, %d, %p, %p, %p, %p, %p, %p, %lx)\n", + TRACE("%p, %lx, %ld, %p, %p, %p, %p, %p, %p, %Ix.\n", iface, dwDrawAspect, lindex, @@ -2184,7 +2184,7 @@ static HRESULT WINAPI DataCache_SetAdvise( { DataCache *this = impl_from_IViewObject2(iface); - TRACE("(%p, %x, %x, %p)\n", iface, aspects, advf, pAdvSink); + TRACE("%p, %lx, %lx, %p.\n", iface, aspects, advf, pAdvSink); /* * A call to this function removes the previous sink @@ -2274,8 +2274,7 @@ static HRESULT WINAPI DataCache_GetExtent( HRESULT hres = E_FAIL; DataCacheEntry *cache_entry; - TRACE("(%p, %x, %d, %p, %p)\n", - iface, dwDrawAspect, lindex, ptd, lpsizel); + TRACE("%p, %lx, %ld, %p, %p.\n", iface, dwDrawAspect, lindex, ptd, lpsizel); if (lpsizel==NULL) return E_POINTER; @@ -2284,7 +2283,7 @@ static HRESULT WINAPI DataCache_GetExtent( lpsizel->cy = 0; if (lindex!=-1) - FIXME("Unimplemented flag lindex = %d\n", lindex); + FIXME("Unimplemented flag lindex = %ld\n", lindex); /* * Right now, we support only the callback from @@ -2445,7 +2444,7 @@ static HRESULT WINAPI DataCache_Cache( HRESULT hr; FORMATETC fmt_cpy; - TRACE("(%p, 0x%x, %p)\n", pformatetc, advf, pdwConnection); + TRACE("%p, %#lx, %p.\n", pformatetc, advf, pdwConnection); if (!pformatetc || !pdwConnection) return E_INVALIDARG; @@ -2496,7 +2495,7 @@ static HRESULT WINAPI DataCache_Uncache( DataCache *This = impl_from_IOleCache2(iface); DataCacheEntry *cache_entry; - TRACE("(%d)\n", dwConnection); + TRACE("%ld\n", dwConnection); LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) if (cache_entry->id == dwConnection) @@ -2505,7 +2504,7 @@ static HRESULT WINAPI DataCache_Uncache( return S_OK; } - WARN("no connection found for %d\n", dwConnection); + WARN("no connection found for %ld\n", dwConnection); return OLE_E_NOCONNECTION; } @@ -2626,7 +2625,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat int i, slots = 0; BOOL done_one = FALSE; - TRACE( "(%p %p %08x %p)\n", iface, data, mode, reserved ); + TRACE("%p, %p, %#lx, %p.\n", iface, data, mode, reserved ); LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) { @@ -2705,7 +2704,7 @@ static HRESULT WINAPI DataCache_DiscardCache( DataCacheEntry *cache_entry; HRESULT hr = S_OK; - TRACE("(%d)\n", dwDiscardOptions); + TRACE("%ld\n", dwDiscardOptions); if (dwDiscardOptions == DISCARDCACHE_SAVEIFDIRTY) hr = DataCache_Save(&This->IPersistStorage_iface, This->presentationStorage, TRUE); diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 81ffa1e6dbc..b69a054b572 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -519,7 +519,7 @@ static HRESULT WINAPI DefaultHandler_Close( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr; - TRACE("(%d)\n", dwSaveOption); + TRACE("%ld\n", dwSaveOption); if (!object_is_running(This)) return S_OK; @@ -548,7 +548,7 @@ static HRESULT WINAPI DefaultHandler_SetMoniker( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr = S_OK; - TRACE("(%p, %d, %p)\n", iface, dwWhichMoniker, pmk); + TRACE("%p, %ld, %p.\n", iface, dwWhichMoniker, pmk); if (object_is_running(This)) { @@ -576,8 +576,7 @@ static HRESULT WINAPI DefaultHandler_GetMoniker( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr; - TRACE("(%p, %d, %d, %p)\n", - iface, dwAssign, dwWhichMoniker, ppmk); + TRACE("%p, %ld, %ld, %p.\n", iface, dwAssign, dwWhichMoniker, ppmk); if (object_is_running(This)) { @@ -617,8 +616,7 @@ static HRESULT WINAPI DefaultHandler_InitFromData( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr = OLE_E_NOTRUNNING; - TRACE("(%p, %p, %d, %d)\n", - iface, pDataObject, fCreation, dwReserved); + TRACE("%p, %p, %d, %ld.\n", iface, pDataObject, fCreation, dwReserved); if (object_is_running(This)) { @@ -646,8 +644,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr = OLE_E_NOTRUNNING; - TRACE("(%p, %d, %p)\n", - iface, dwReserved, ppDataObject); + TRACE("%p, %ld, %p.\n", iface, dwReserved, ppDataObject); if (object_is_running(This)) { @@ -673,7 +670,7 @@ static HRESULT WINAPI DefaultHandler_DoVerb( IRunnableObject *pRunnableObj = &This->IRunnableObject_iface; HRESULT hr; - TRACE("(%d, %p, %p, %d, %p, %s)\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect)); + TRACE("%ld, %p, %p, %ld, %p, %s.\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect)); hr = IRunnableObject_Run(pRunnableObj, NULL); if (FAILED(hr)) return hr; @@ -809,7 +806,7 @@ static HRESULT WINAPI DefaultHandler_GetUserType( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr; - TRACE("(%p, %d, %p)\n", iface, dwFormOfType, pszUserType); + TRACE("%p, %ld, %p.\n", iface, dwFormOfType, pszUserType); if (object_is_running(This)) { start_object_call( This ); @@ -836,8 +833,7 @@ static HRESULT WINAPI DefaultHandler_SetExtent( DefaultHandler *This = impl_from_IOleObject(iface); HRESULT hr = OLE_E_NOTRUNNING; - TRACE("(%p, %x, (%d x %d))\n", iface, - dwDrawAspect, psizel->cx, psizel->cy); + TRACE("%p, %lx, (%ld x %ld))\n", iface, dwDrawAspect, psizel->cx, psizel->cy); if (object_is_running(This)) { @@ -868,7 +864,7 @@ static HRESULT WINAPI DefaultHandler_GetExtent( DefaultHandler *This = impl_from_IOleObject(iface); - TRACE("(%p, %x, %p)\n", iface, dwDrawAspect, psizel); + TRACE("%p, %lx, %p.\n", iface, dwDrawAspect, psizel); if (object_is_running(This)) { @@ -947,7 +943,7 @@ static HRESULT WINAPI DefaultHandler_Unadvise( { DefaultHandler *This = impl_from_IOleObject(iface); - TRACE("(%p, %d)\n", iface, dwConnection); + TRACE("%p, %ld.\n", iface, dwConnection); /* * If we don't have an advise holder yet, it means we don't have @@ -1003,7 +999,7 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus( HRESULT hres; DefaultHandler *This = impl_from_IOleObject(iface); - TRACE("(%p, %x, %p)\n", iface, dwAspect, pdwStatus); + TRACE("%p, %lx, %p.\n", iface, dwAspect, pdwStatus); if (object_is_running(This)) { @@ -1278,7 +1274,7 @@ static HRESULT WINAPI DefaultHandler_EnumFormatEtc( { DefaultHandler *This = impl_from_IDataObject(iface); - TRACE("(%p, %x, %p)\n", iface, dwDirection, ppenumFormatEtc); + TRACE("%p, %lx, %p.\n", iface, dwDirection, ppenumFormatEtc); return OleRegEnumFormatEtc(&This->clsid, dwDirection, ppenumFormatEtc); } @@ -1301,8 +1297,7 @@ static HRESULT WINAPI DefaultHandler_DAdvise( HRESULT hres = S_OK; DefaultHandler *This = impl_from_IDataObject(iface); - TRACE("(%p, %p, %d, %p, %p)\n", - iface, pformatetc, advf, pAdvSink, pdwConnection); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pformatetc, advf, pAdvSink, pdwConnection); /* Make sure we have a data advise holder before we start. */ if (!This->dataAdviseHolder) @@ -1341,7 +1336,7 @@ static HRESULT WINAPI DefaultHandler_DUnadvise( { DefaultHandler *This = impl_from_IDataObject(iface); - TRACE("(%p, %d)\n", iface, dwConnection); + TRACE("%p, %ld.\n", iface, dwConnection); /* * If we don't have a data advise holder yet, it means that @@ -2154,7 +2149,7 @@ static DefaultHandler* DefaultHandler_Construct( if (SUCCEEDED(hr)) This->object_state = object_state_running; if (FAILED(hr)) - WARN("object creation failed with error %08x\n", hr); + WARN("object creation failed with error %#lx\n", hr); } else { @@ -2241,7 +2236,7 @@ HRESULT WINAPI OleCreateEmbeddingHelper( DefaultHandler* newHandler = NULL; HRESULT hr = S_OK; - TRACE("(%s, %p, %08x, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, flags, pCF, debugstr_guid(riid), ppvObj); + TRACE("%s, %p, %#lx, %p, %s, %p.\n", debugstr_guid(clsid), pUnkOuter, flags, pCF, debugstr_guid(riid), ppvObj); if (!ppvObj) return E_POINTER; diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index e9699c01650..072314046a6 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -189,7 +189,7 @@ static HRESULT WINAPI FileLockBytesImpl_ReadAt( LARGE_INTEGER offset; ULONG cbRead; - TRACE("(%p)-> %i %p %i %p\n",This, ulOffset.u.LowPart, pv, cb, pcbRead); + TRACE("%p, %ld, %p, %lu, %p.\n", iface, ulOffset.u.LowPart, pv, cb, pcbRead); /* verify a sane environment */ if (!This) return E_FAIL; @@ -244,7 +244,7 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( LARGE_INTEGER offset; ULONG cbWritten; - TRACE("(%p)-> %i %p %i %p\n",This, ulOffset.u.LowPart, pv, cb, pcbWritten); + TRACE("%p, %ld, %p, %lu, %p.\n", iface, ulOffset.u.LowPart, pv, cb, pcbWritten); /* verify a sane environment */ if (!This) return E_FAIL; @@ -297,7 +297,7 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE HRESULT hr = S_OK; LARGE_INTEGER newpos; - TRACE("new size %u\n", newSize.u.LowPart); + TRACE("new size %lu\n", newSize.u.LowPart); newpos.QuadPart = newSize.QuadPart; if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) @@ -316,7 +316,7 @@ static HRESULT get_lock_error(void) case ERROR_ACCESS_DENIED: return STG_E_ACCESSDENIED; break; case ERROR_NOT_SUPPORTED: return STG_E_INVALIDFUNCTION; break; default: - FIXME("no mapping for error %d\n", GetLastError()); + FIXME("no mapping for error %ld\n", GetLastError()); return STG_E_INVALIDFUNCTION; } } @@ -328,7 +328,7 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, OVERLAPPED ol; DWORD lock_flags = LOCKFILE_FAIL_IMMEDIATELY; - TRACE("ofs %u count %u flags %x\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType); + TRACE("ofs %lu count %lu flags %lx\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType); if (dwLockType & LOCK_WRITE) return STG_E_INVALIDFUNCTION; @@ -351,7 +351,7 @@ static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, FileLockBytesImpl* This = impl_from_ILockBytes(iface); OVERLAPPED ol; - TRACE("ofs %u count %u flags %x\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType); + TRACE("ofs %lu count %lu flags %lx\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType); if (dwLockType & LOCK_WRITE) return STG_E_INVALIDFUNCTION; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 794b4507942..9b64d0e43e9 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -129,7 +129,7 @@ static ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface) FileMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG ref = InterlockedDecrement(&moniker->ref); - TRACE("(%p, refcount %d)\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -611,7 +611,7 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef static HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar, IMoniker **toleft, IMoniker **reduced) { - TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, howfar, toleft, reduced); if (!pbc || !reduced) return E_INVALIDARG; @@ -1233,7 +1233,7 @@ FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, int i; LPWSTR pszFileName; - TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData); + TRACE("%p, %p, %lu, %p.\n", iface, pbData, cbMax, pcbData); *pcbData = sizeof(CLSID) + len * sizeof(WCHAR); if (cbMax < *pcbData) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index fe6b5e58122..50848a2a020 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -95,7 +95,7 @@ static StdGITEntry* StdGlobalInterfaceTable_FindEntry(StdGlobalInterfaceTableImp { StdGITEntry* e; - TRACE("This=%p, cookie=0x%x\n", This, cookie); + TRACE("%p, %#lx.\n", This, cookie); LIST_FOR_EACH_ENTRY(e, &This->list, StdGITEntry, entry) { if (e->cookie == cookie) @@ -205,7 +205,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( LeaveCriticalSection(&git_section); - TRACE("Cookie is 0x%x\n", entry->cookie); + TRACE("Cookie is %#lx\n", entry->cookie); return S_OK; } @@ -217,7 +217,7 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( StdGITEntry* entry; HRESULT hr; - TRACE("iface=%p, dwCookie=0x%x\n", iface, dwCookie); + TRACE("%p, %#lx.\n", iface, dwCookie); EnterCriticalSection(&git_section); @@ -236,7 +236,7 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( hr = CoReleaseMarshalData(entry->stream); if (hr != S_OK) { - WARN("Failed to release marshal data, hr = 0x%08x\n", hr); + WARN("Failed to release marshal data, hr = %#lx\n", hr); return hr; } IStream_Release(entry->stream); @@ -255,13 +255,13 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( HRESULT hres; IStream *stream; - TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv); + TRACE("%#lx, %s, %p.\n", dwCookie, debugstr_guid(riid), ppv); EnterCriticalSection(&git_section); entry = StdGlobalInterfaceTable_FindEntry(This, dwCookie); if (entry == NULL) { - WARN("Entry for cookie 0x%x not found\n", dwCookie); + WARN("Entry for cookie %#lx not found\n", dwCookie); LeaveCriticalSection(&git_section); return E_INVALIDARG; } @@ -273,7 +273,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( LeaveCriticalSection(&git_section); if (hres != S_OK) { - WARN("Failed to clone stream with error 0x%08x\n", hres); + WARN("Failed to clone stream with error %#lx.\n", hres); return hres; } diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 1ab9c52dbfb..112a8db4b16 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -198,7 +198,7 @@ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) ItemMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -286,7 +286,7 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) if (str_len % sizeof(WCHAR)) { - WARN("Unexpected Unicode name length %d.\n", str_len); + WARN("Unexpected Unicode name length %ld.\n", str_len); hr = E_FAIL; goto end; } @@ -491,16 +491,10 @@ static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *p return hr; } -/****************************************************************************** - * ItemMoniker_Reduce - ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface, - IBindCtx* pbc, - DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, - IMoniker** ppmkReduced) +static HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, + DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if (ppmkReduced==NULL) return E_POINTER; @@ -864,7 +858,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_GetComparisonData(IROTData *iface, int delim_len, i; WCHAR *ptrW; - TRACE("(%p, %p, %u, %p)\n", iface, buffer, max_len, data_len); + TRACE("%p, %p, %lu, %p.\n", iface, buffer, max_len, data_len); delim_len = This->itemDelimiter && This->itemDelimiter[0] ? lstrlenW(This->itemDelimiter) : 0; *data_len = sizeof(CLSID) + sizeof(WCHAR) + (delim_len + name_len) * sizeof(WCHAR); diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 2d7d4572584..f974e4229eb 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -160,7 +160,7 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* iface, HGLOBAL* phglobal) /* It is not our lockbytes implementation, so use a more generic way */ hres = ILockBytes_Stat(iface,&stbuf,STATFLAG_NONAME); if (hres != S_OK) { - ERR("Cannot ILockBytes_Stat, %x\n",hres); + ERR("Cannot ILockBytes_Stat, %lx\n",hres); return hres; } TRACE("cbSize is %s\n", wine_dbgstr_longlong(stbuf.cbSize.QuadPart)); @@ -171,11 +171,11 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* iface, HGLOBAL* phglobal) hres = ILockBytes_ReadAt(iface, start, GlobalLock(*phglobal), stbuf.cbSize.u.LowPart, &xread); GlobalUnlock(*phglobal); if (hres != S_OK) { - FIXME("%p->ReadAt failed with %x\n",iface,hres); + FIXME("%p->ReadAt failed with %lx\n",iface,hres); return hres; } if (stbuf.cbSize.u.LowPart != xread) { - FIXME("Read size is not requested size %d vs %d?\n",stbuf.cbSize.u.LowPart, xread); + FIXME("Read size is not requested size %ld vs %ld?\n",stbuf.cbSize.u.LowPart, xread); } return S_OK; } diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index ac47f5528c8..09266a33aba 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -159,7 +159,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison IROTData_Release(pROTData); if (hr != S_OK) { - ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr); + ERR("Failed to copy comparison data into buffer, hr = %#lx\n", hr); HeapFree(GetProcessHeap(), 0, *moniker_data); return hr; } @@ -218,7 +218,7 @@ static HRESULT reduce_moniker(IMoniker *pmk, IBindCtx *pbc, IMoniker **pmkReduce } hr = IMoniker_Reduce(pmk, pbc, MKRREDUCE_ALL, NULL, pmkReduced); if (FAILED(hr)) - ERR("reducing moniker failed with error 0x%08x\n", hr); + ERR("reducing moniker failed with error %#lx.\n", hr); if (pbcNew) IBindCtx_Release(pbcNew); return hr; } @@ -288,11 +288,11 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD flags, IBindCtx *pbc; InterfaceData *moniker = NULL; - TRACE("%p, %#x, %p, %p, %p\n", This, flags, punkObject, pmkObjectName, pdwRegister); + TRACE("%p, %#lx, %p, %p, %p\n", iface, flags, punkObject, pmkObjectName, pdwRegister); if (flags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) { - ERR("Invalid flags: 0x%08x\n", flags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); + ERR("Invalid flags: %#lx\n", flags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); return E_INVALIDARG; } @@ -435,7 +435,7 @@ RunningObjectTableImpl_Revoke( IRunningObjectTable* iface, DWORD dwRegister) RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); struct rot_entry *rot_entry; - TRACE("(%p,%d)\n",This,dwRegister); + TRACE("%p, %ld.\n", iface, dwRegister); EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) @@ -568,7 +568,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, } } else - WARN("Moniker unavailable, IrotGetObject returned 0x%08x\n", hr); + WARN("Moniker unavailable, IrotGetObject returned %#lx\n", hr); HeapFree(GetProcessHeap(), 0, moniker_data); @@ -590,7 +590,7 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface, struct rot_entry *rot_entry; HRESULT hr = E_INVALIDARG; - TRACE("(%p,%d,%p)\n",This,dwRegister,pfiletime); + TRACE("%p, %ld, %p.\n", iface, dwRegister, pfiletime); EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) @@ -608,7 +608,7 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface, LeaveCriticalSection(&This->lock); done: - TRACE("-- 0x08%x\n", hr); + TRACE("-- %#lx\n", hr); return hr; } @@ -661,7 +661,7 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface, HeapFree(GetProcessHeap(), 0, moniker_data); - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx\n", hr); return hr; } @@ -717,7 +717,7 @@ static RunningObjectTableImpl rot = */ HRESULT WINAPI GetRunningObjectTable(DWORD reserved, IRunningObjectTable **ret) { - TRACE("%#x, %p\n", reserved, ret); + TRACE("%#lx, %p\n", reserved, ret); if (reserved!=0) return E_UNEXPECTED; @@ -1048,7 +1048,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IM EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); HRESULT hr = S_OK; - TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_list->size); + TRACE("%p, %lu, %p, %p.\n", iface, celt, rgelt, pceltFetched); /* retrieve the requested number of moniker from the current position */ for(i = 0; (This->pos < This->moniker_list->size) && (i < celt); i++) @@ -1270,7 +1270,7 @@ static HRESULT WINAPI MonikerMarshal_GetUnmarshalClass( { MonikerMarshal *This = impl_from_IMarshal(iface); - TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv, + TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pCid); return IMoniker_GetClassID(This->moniker, pCid); @@ -1284,7 +1284,7 @@ static HRESULT WINAPI MonikerMarshal_GetMarshalSizeMax( HRESULT hr; ULARGE_INTEGER size; - TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv, + TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pSize); hr = IMoniker_GetSizeMax(This->moniker, &size); @@ -1299,7 +1299,7 @@ static HRESULT WINAPI MonikerMarshal_MarshalInterface(LPMARSHAL iface, IStream * { MonikerMarshal *This = impl_from_IMarshal(iface); - TRACE("(%p, %s, %p, %x, %p, %x)\n", pStm, debugstr_guid(riid), pv, + TRACE("%p, %s, %p, %lx, %p, %lx.\n", pStm, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags); return IMoniker_Save(This->moniker, pStm, FALSE); diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index a2781e51d5b..ee6a0b69b06 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -253,9 +253,10 @@ void WINAPI DECLSPEC_HOTPATCH OleUninitialize(void) /****************************************************************************** * OleInitializeWOW [OLE32.@] */ -HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) { - FIXME("(0x%08x, 0x%08x),stub!\n",x, y); - return 0; +HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) +{ + FIXME("%#lx, %#lx stub!\n", x, y); + return 0; } /************************************************************* @@ -664,7 +665,7 @@ HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype) HRESULT hres; LONG ret; - TRACE("(%s, %u, %p)\n", debugstr_guid(clsid), form, usertype); + TRACE("%s, %lu, %p.\n", debugstr_guid(clsid), form, usertype); if (!usertype) return E_INVALIDARG; @@ -735,7 +736,7 @@ HRESULT WINAPI DoDragDrop ( HWND hwndTrackWindow; MSG msg; - TRACE("(%p, %p, %08x, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); + TRACE("%p, %p, %#lx, %p.\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); if (!pDataObject || !pDropSource || !pdwEffect) return E_INVALIDARG; @@ -844,7 +845,7 @@ HRESULT WINAPI OleRegGetMiscStatus( LONG result; HRESULT hr; - TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwAspect, pdwStatus); + TRACE("%s, %ld, %p.\n", debugstr_guid(clsid), dwAspect, pdwStatus); if (!pdwStatus) return E_INVALIDARG; @@ -934,7 +935,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); HRESULT hr = S_OK; - TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", iface, celt, rgelt, pceltFetched); if (pceltFetched) *pceltFetched = 0; @@ -954,14 +955,14 @@ static HRESULT WINAPI EnumOLEVERB_Next( } else if (res != ERROR_SUCCESS) { - ERR("RegEnumKeyW failed with error %d\n", res); + ERR("RegEnumKeyW failed with error %ld\n", res); hr = REGDB_E_READREGDB; break; } res = RegQueryValueW(This->hkeyVerb, wszSubKey, NULL, &cbData); if (res != ERROR_SUCCESS) { - ERR("RegQueryValueW failed with error %d\n", res); + ERR("RegQueryValueW failed with error %ld\n", res); hr = REGDB_E_READREGDB; break; } @@ -974,7 +975,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( res = RegQueryValueW(This->hkeyVerb, wszSubKey, pwszOLEVERB, &cbData); if (res != ERROR_SUCCESS) { - ERR("RegQueryValueW failed with error %d\n", res); + ERR("RegQueryValueW failed with error %ld\n", res); hr = REGDB_E_READREGDB; CoTaskMemFree(pwszOLEVERB); break; @@ -1020,7 +1021,7 @@ static HRESULT WINAPI EnumOLEVERB_Skip( { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); - TRACE("(%d)\n", celt); + TRACE("%p, %lu.\n", iface, celt); This->index += celt; return S_OK; @@ -1108,7 +1109,7 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum) else if (res == REGDB_E_KEYMISSING) ERR("no Verbs key for class %s\n", debugstr_guid(clsid)); else - ERR("failed to open Verbs key for CLSID %s with error %d\n", + ERR("failed to open Verbs key for CLSID %s with error %ld\n", debugstr_guid(clsid), res); return res; } @@ -1117,7 +1118,7 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum) NULL, NULL, NULL, NULL, NULL, NULL); if (res != ERROR_SUCCESS) { - ERR("failed to get subkey count with error %d\n", GetLastError()); + ERR("failed to get subkey count with error %ld\n", GetLastError()); return REGDB_E_READREGDB; } @@ -1602,7 +1603,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar OleMenuHookItem *pHookItem = NULL; WORD fuFlags; - TRACE("%i, %04lx, %08lx\n", code, wParam, lParam ); + TRACE("%i, %#Ix, %#Ix.\n", code, wParam, lParam ); /* Check if we're being asked to process the message */ if ( HC_ACTION != code ) @@ -1707,7 +1708,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara OleMenuHookItem *pHookItem = NULL; WORD wCode; - TRACE("%i, %04lx, %08lx\n", code, wParam, lParam ); + TRACE("%i, %#Ix, %#Ix.\n", code, wParam, lParam ); /* Check if we're being asked to process a messages */ if ( HC_ACTION != code ) @@ -1943,7 +1944,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l } TRACE_(accel)("hAccel=%p, cAccelEntries=%d," - "msg->hwnd=%p, msg->message=%04x, wParam=%08lx, lParam=%08lx\n", + "msg->hwnd=%p, msg->message=%04x, wParam=%#Ix, lParam=%#Ix\n", hAccel, cAccelEntries, lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam); for(i = 0; i < cAccelEntries; i++) @@ -1964,7 +1965,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l if(lpAccelTbl[i].fVirt & FVIRTKEY) { INT mask = 0; - TRACE_(accel)("found accel for virt_key %04lx (scan %04x)\n", + TRACE_(accel)("found accel for virt_key %Ix (scan %04x)\n", lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff); if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; @@ -2463,7 +2464,7 @@ HRESULT WINAPI OleCreate( IUnknown * pUnk = NULL; IOleObject *pOleObject = NULL; - TRACE("(%s, %s, %d, %p, %p, %p, %p)\n", debugstr_guid(rclsid), + TRACE("%s, %s, %ld, %p, %p, %p, %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), renderopt, pFormatEtc, pClientSite, pStg, ppvObj); hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, riid, (LPVOID*)&pUnk); @@ -2488,7 +2489,7 @@ HRESULT WINAPI OleCreate( { TRACE("trying to set stg %p\n", pStg); hres = IPersistStorage_InitNew(pPS, pStg); - TRACE("-- result 0x%08x\n", hres); + TRACE("-- result %#lx\n", hres); IPersistStorage_Release(pPS); } } @@ -2497,7 +2498,7 @@ HRESULT WINAPI OleCreate( { TRACE("trying to set clientsite %p\n", pClientSite); hres = IOleObject_SetClientSite(pOleObject, pClientSite); - TRACE("-- result 0x%08x\n", hres); + TRACE("-- result %#lx\n", hres); } if (pOleObject) @@ -2851,7 +2852,7 @@ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, HRESULT hr; UINT src_cf; - FIXME("(%p, %s, %08x, %08x, %d, %p, %p, %p, %p, %p, %p, %p): stub\n", + FIXME("%p, %s, %#lx, %#lx, %ld, %p, %p, %p, %p, %p, %p, %p: stub\n", data, debugstr_guid(iid), flags, renderopt, num_cache_fmts, adv_flags, cache_fmts, sink, conns, client_site, stg, obj); @@ -2884,7 +2885,7 @@ HRESULT WINAPI OleCreateFromData(IDataObject *data, REFIID iid, DWORD renderopt, HRESULT WINAPI OleCreateLinkFromData(IDataObject *data, REFIID iid, DWORD renderopt, FORMATETC *fmt, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + FIXME("%p, %s, %#lx, %p, %p, %p, %p: semi-stub\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); } @@ -2904,8 +2905,7 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, DWORD rend STGMEDIUM stgmedium; LPOLESTR ole_typename; - TRACE("(%p, %s, 0x%08x, %p, %p, %p, %p)\n", - data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); + TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); if (!obj || !stg) return E_INVALIDARG; @@ -3007,11 +3007,11 @@ HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFI IOleCache *cache = NULL; ULONG i; - TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), + TRACE("cls %s, %s, iid %s, flags %ld, render opts %ld, num fmts %ld, adv flags %p, fmts %p\n", debugstr_guid(clsid), debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); for (i = 0; i < num_fmts; i++) - TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); + TRACE("\t%ld: fmt %s adv flags %ld\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); hr = CreateFileMoniker( filename, &mon ); if (FAILED(hr)) return hr; diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 7fad171facd..0d8198480b1 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -37,7 +37,7 @@ HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj) { - FIXME("(%p,%p,%i,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj); + FIXME("%p, %p, %ld, %p, %p, %p, %p stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj); return E_NOTIMPL; } @@ -77,7 +77,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( DWORD dwDirection, LPENUMFORMATETC* ppenumFormatetc) { - FIXME("(%p, %d, %p), stub!\n", clsid, dwDirection, ppenumFormatetc); + FIXME("%p, %ld, %p stub!\n", clsid, dwDirection, ppenumFormatetc); return E_NOTIMPL; } diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 13a873655f5..464c4776b40 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -128,7 +128,7 @@ static HRESULT WINAPI EnumSTATDATA_Next(IEnumSTATDATA *iface, ULONG num, LPSTATD DWORD count = 0; HRESULT hr = S_OK; - TRACE("(%d, %p, %p)\n", num, data, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, num, data, fetched); while(num--) { @@ -153,7 +153,7 @@ static HRESULT WINAPI EnumSTATDATA_Skip(IEnumSTATDATA *iface, ULONG num) { EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); - TRACE("(%d)\n", num); + TRACE("%p, %lu.\n", iface, num); if(This->index + num >= This->num_of_elems) { @@ -309,7 +309,7 @@ static ULONG WINAPI OleAdviseHolderImpl_AddRef(IOleAdviseHolder *iface) OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref=%d)\n", This, ref - 1); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -320,9 +320,9 @@ static ULONG WINAPI OleAdviseHolderImpl_AddRef(IOleAdviseHolder *iface) static ULONG WINAPI OleAdviseHolderImpl_Release(IOleAdviseHolder *iface) { OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface); - ULONG ref; - TRACE("(%p)->(ref=%d)\n", This, This->ref); - ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 0) OleAdviseHolderImpl_Destructor(This); @@ -382,7 +382,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(IOleAdviseHolder *iface, OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface); DWORD index; - TRACE("(%p)->(%u)\n", This, dwConnection); + TRACE("%p, %lu.\n", iface, dwConnection); /* The connection number is 1 more than the index, see OleAdviseHolder_Advise */ index = dwConnection - 1; @@ -609,8 +609,9 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface(IDataAdviseHolder *iface, static ULONG WINAPI DataAdviseHolder_AddRef(IDataAdviseHolder *iface) { DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface); - TRACE("(%p) (ref=%d)\n", This, This->ref); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("%p, refcount %lu.\n", iface, ref); + return ref; } /************************************************************************ @@ -619,10 +620,10 @@ static ULONG WINAPI DataAdviseHolder_AddRef(IDataAdviseHolder *iface) static ULONG WINAPI DataAdviseHolder_Release(IDataAdviseHolder *iface) { DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface); - ULONG ref; - TRACE("(%p) (ref=%d)\n", This, This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p, refcount %lu.\n", iface, ref); - ref = InterlockedDecrement(&This->ref); if (ref==0) DataAdviseHolder_Destructor(This); return ref; @@ -641,8 +642,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise(IDataAdviseHolder *iface, STATDATA new_conn; DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface); - TRACE("(%p)->(%p, %p, %08x, %p, %p)\n", This, pDataObject, pFetc, advf, - pAdvise, pdwConnection); + TRACE("%p, %p, %p, %#lx, %p, %p.\n", iface, pDataObject, pFetc, advf, pAdvise, pdwConnection); if (pdwConnection==NULL) return E_POINTER; @@ -709,7 +709,8 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise(IDataAdviseHolder *iface, { DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface); DWORD index; - TRACE("(%p)->(%u)\n", This, dwConnection); + + TRACE("%p, %lu.\n", iface, dwConnection); /* The connection number is 1 more than the index, see DataAdviseHolder_Advise */ index = dwConnection - 1; @@ -756,7 +757,7 @@ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange(IDataAdviseHolder *iface IEnumSTATDATA *pEnum; HRESULT hr; - TRACE("(%p)->(%p, %08x, %08x)\n", iface, data_obj, dwReserved, advf); + TRACE("%p, %p, %#lx, %#lx.\n", iface, data_obj, dwReserved, advf); hr = IDataAdviseHolder_EnumAdvise(iface, &pEnum); if (SUCCEEDED(hr)) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index c95c835e9e3..0beab94c649 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -95,7 +95,7 @@ static ULONG WINAPI PointerMonikerImpl_AddRef(IMoniker *iface) PointerMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedIncrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -105,7 +105,7 @@ static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface) PointerMonikerImpl *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -230,7 +230,7 @@ static HRESULT WINAPI PointerMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if (ppmkReduced==NULL) return E_POINTER; @@ -509,7 +509,7 @@ static HRESULT WINAPI pointer_moniker_marshal_GetUnmarshalClass(IMarshal *iface, { PointerMonikerImpl *moniker = impl_from_IMarshal(iface); - TRACE("%p, %s, %p, %x, %p, %x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + TRACE("%p, %s, %p, %lx, %p, %lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, clsid); return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid); @@ -520,7 +520,7 @@ static HRESULT WINAPI pointer_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, { PointerMonikerImpl *moniker = impl_from_IMarshal(iface); - TRACE("%p, %s, %p, %d, %p, %#x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + TRACE("%p, %s, %p, %ld, %p, %#lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, size); return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); @@ -531,7 +531,7 @@ static HRESULT WINAPI pointer_moniker_marshal_MarshalInterface(IMarshal *iface, { PointerMonikerImpl *moniker = impl_from_IMarshal(iface); - TRACE("%p, %s, %p, %x, %p, %x.\n", stream, debugstr_guid(riid), pv, + TRACE("%p, %s, %p, %lx, %p, %lx.\n", stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags); return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, @@ -550,7 +550,7 @@ static HRESULT WINAPI pointer_moniker_marshal_UnmarshalInterface(IMarshal *iface hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object); if (FAILED(hr)) { - ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr); + ERR("Couldn't unmarshal moniker, hr = %#lx.\n", hr); return hr; } @@ -570,7 +570,7 @@ static HRESULT WINAPI pointer_moniker_marshal_ReleaseMarshalData(IMarshal *iface static HRESULT WINAPI pointer_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved) { - TRACE("%p, %#x.\n", iface, reserved); + TRACE("%p, %#lx.\n", iface, reserved); return S_OK; } @@ -699,7 +699,7 @@ static ULONG WINAPI ObjrefMonikerImpl_AddRef(IMoniker *iface) ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); ULONG refcount = InterlockedIncrement(&moniker->refcount); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); return refcount; } @@ -709,7 +709,7 @@ static ULONG WINAPI ObjrefMonikerImpl_Release(IMoniker *iface) ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->refcount); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); if (!refcount) { @@ -772,7 +772,7 @@ static HRESULT WINAPI ObjrefMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx static HRESULT WINAPI ObjrefMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar, IMoniker **left, IMoniker **reduced) { - FIXME("(%p,%p,%d,%p,%p): stub\n", iface, pbc, howfar, left, reduced); + FIXME("%p, %p, %ld, %p, %p: stub\n", iface, pbc, howfar, left, reduced); return E_NOTIMPL; } @@ -930,7 +930,7 @@ static HRESULT WINAPI objref_moniker_marshal_GetUnmarshalClass(IMarshal *iface, { ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); - TRACE("(%p,%s,%p,%08x,%p,%x,%p)\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + TRACE("%p, %s, %p, %#lx, %p, %#lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, clsid); return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid); @@ -941,7 +941,7 @@ static HRESULT WINAPI objref_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, { ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); - TRACE("(%p,%s,%p,%08x,%p,%08x,%p)\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + TRACE("%p, %s, %p, %#lx, %p, %#lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, size); return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); @@ -952,7 +952,7 @@ static HRESULT WINAPI objref_moniker_marshal_MarshalInterface(IMarshal *iface, I { ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); - TRACE("(%p,%s,%p,%08x,%p,%08x)\n", stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags); + TRACE("%p, %s, %p, %#lx, %p, %#lx\n", stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags); return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); } @@ -969,7 +969,7 @@ static HRESULT WINAPI objref_moniker_marshal_UnmarshalInterface(IMarshal *iface, hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object); if (FAILED(hr)) { - ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr); + ERR("Couldn't unmarshal moniker, hr = %#lx.\n", hr); return hr; } @@ -988,7 +988,7 @@ static HRESULT WINAPI objref_moniker_marshal_ReleaseMarshalData(IMarshal *iface, static HRESULT WINAPI objref_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved) { - TRACE("(%p,%08x)\n", iface, reserved); + TRACE("%p, %#lx.\n", iface, reserved); return S_OK; } diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index cd30dad8c99..28793d7cbd5 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -211,7 +211,7 @@ static ULONG WINAPI enum_stat_prop_stg_AddRef(IEnumSTATPROPSTG *iface) struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); LONG refcount = InterlockedIncrement(&penum->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -221,7 +221,7 @@ static ULONG WINAPI enum_stat_prop_stg_Release(IEnumSTATPROPSTG *iface) struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); LONG refcount = InterlockedDecrement(&penum->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -239,7 +239,7 @@ static HRESULT WINAPI enum_stat_prop_stg_Next(IEnumSTATPROPSTG *iface, ULONG cel ULONG count = 0; WCHAR *name; - TRACE("%p, %u, %p, %p.\n", iface, celt, ret, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, celt, ret, fetched); if (penum->current == ~0u) penum->current = 0; @@ -267,7 +267,7 @@ static HRESULT WINAPI enum_stat_prop_stg_Next(IEnumSTATPROPSTG *iface, ULONG cel static HRESULT WINAPI enum_stat_prop_stg_Skip(IEnumSTATPROPSTG *iface, ULONG celt) { - FIXME("%p, %u.\n", iface, celt); + FIXME("%p, %lu.\n", iface, celt); return S_OK; } @@ -486,7 +486,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple( HRESULT hr = S_OK; ULONG i; - TRACE("(%p, %d, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); + TRACE("%p, %lu, %p, %p\n", iface, cpspec, rgpspec, rgpropvar); if (!cpspec) return S_FALSE; @@ -613,7 +613,7 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, UI HeapFree(GetProcessHeap(), 0, wideStr_tmp); } } - TRACE("returning 0x%08x (%s)\n", hr, + TRACE("returning %#lx (%s)\n", hr, dstCP == CP_UNICODE ? debugstr_w((LPCWSTR)*dst) : debugstr_a(*dst)); return hr; } @@ -671,7 +671,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, case VT_VECTOR|VT_I1: This->format = 1; } - TRACE("Setting 0x%08x to type %d\n", propid, propvar->vt); + TRACE("Setting %#lx to type %d\n", propid, propvar->vt); if (prop) { PropVariantClear(prop); @@ -727,7 +727,7 @@ static HRESULT PropertyStorage_StoreNameWithId(PropertyStorage_impl *This, if (strlen(name) >= MAX_VERSION_0_PROP_NAME_LENGTH) This->format = 1; } - TRACE("Adding prop name %s, propid %d\n", + TRACE("Adding prop name %s, propid %ld\n", This->codePage == CP_UNICODE ? debugstr_w((LPCWSTR)name) : debugstr_a(name), id); dictionary_insert(This->name_to_propid, name, UlongToPtr(id)); @@ -750,7 +750,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple( HRESULT hr = S_OK; ULONG i; - TRACE("(%p, %d, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); + TRACE("%p, %lu, %p, %p.\n", iface, cpspec, rgpspec, rgpropvar); if (cpspec && (!rgpspec || !rgpropvar)) return E_INVALIDARG; @@ -849,7 +849,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeleteMultiple( ULONG i; HRESULT hr; - TRACE("(%p, %d, %p)\n", iface, cpspec, rgpspec); + TRACE("%p, %ld, %p.\n", iface, cpspec, rgpspec); if (cpspec && !rgpspec) return E_INVALIDARG; @@ -895,7 +895,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadPropertyNames( ULONG i; HRESULT hr = S_FALSE; - TRACE("(%p, %d, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName); + TRACE("%p, %ld, %p, %p.\n", iface, cpropid, rgpropid, rglpwstrName); if (cpropid && (!rgpropid || !rglpwstrName)) return E_INVALIDARG; @@ -935,7 +935,7 @@ static HRESULT WINAPI IPropertyStorage_fnWritePropertyNames( ULONG i; HRESULT hr; - TRACE("(%p, %d, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName); + TRACE("%p, %lu, %p, %p.\n", iface, cpropid, rgpropid, rglpwstrName); if (cpropid && (!rgpropid || !rglpwstrName)) return E_INVALIDARG; @@ -968,7 +968,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeletePropertyNames( ULONG i; HRESULT hr; - TRACE("(%p, %d, %p)\n", iface, cpropid, rgpropid); + TRACE("%p, %ld, %p.\n", iface, cpropid, rgpropid); if (cpropid && !rgpropid) return E_INVALIDARG; @@ -1003,7 +1003,7 @@ static HRESULT WINAPI IPropertyStorage_fnCommit( PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr; - TRACE("(%p, 0x%08x)\n", iface, grfCommitFlags); + TRACE("%p, %#lx.\n", iface, grfCommitFlags); if (!(This->grfMode & STGM_READWRITE)) return STG_E_ACCESSDENIED; @@ -1149,7 +1149,7 @@ static void PropertyStorage_PropNameDestroy(void *k, void *d, void *extra) static int PropertyStorage_PropCompare(const void *a, const void *b, void *extra) { - TRACE("(%u, %u)\n", PtrToUlong(a), PtrToUlong(b)); + TRACE("%lu, %lu.\n", PtrToUlong(a), PtrToUlong(b)); return PtrToUlong(a) - PtrToUlong(b); } @@ -1279,12 +1279,12 @@ static HRESULT propertystorage_read_scalar(PROPVARIANT *prop, const struct read_ case VT_INT: case VT_I4: hr = buffer_read_dword(buffer, offset, (DWORD *)&prop->lVal); - TRACE("Read long %d\n", prop->lVal); + TRACE("Read long %ld\n", prop->lVal); break; case VT_UINT: case VT_UI4: hr = buffer_read_dword(buffer, offset, &prop->ulVal); - TRACE("Read ulong %d\n", prop->ulVal); + TRACE("Read ulong %ld\n", prop->ulVal); break; case VT_I8: hr = buffer_read_uint64(buffer, offset, (ULARGE_INTEGER *)&prop->hVal); @@ -1398,7 +1398,7 @@ static HRESULT propertystorage_read_scalar(PROPVARIANT *prop, const struct read_ if (prop->blob.pBlobData) { hr = buffer_read_len(buffer, offset, prop->blob.pBlobData, count); - TRACE("Read blob value of size %d\n", count); + TRACE("Read blob value of size %ld\n", count); } else hr = STG_E_INSUFFICIENTMEMORY; @@ -1583,7 +1583,7 @@ static HRESULT PropertyStorage_ReadHeaderFromStream(IStream *stm, { if (count != sizeof(buf)) { - WARN("read only %d\n", count); + WARN("read only %ld\n", count); hr = STG_E_INVALIDHEADER; } else @@ -1600,7 +1600,7 @@ static HRESULT PropertyStorage_ReadHeaderFromStream(IStream *stm, &hdr->reserved); } } - TRACE("returning 0x%08x\n", hr); + TRACE("returning %#lx\n", hr); return hr; } @@ -1618,7 +1618,7 @@ static HRESULT PropertyStorage_ReadFmtIdOffsetFromStream(IStream *stm, { if (count != sizeof(buf)) { - WARN("read only %d\n", count); + WARN("read only %ld\n", count); hr = STG_E_INVALIDHEADER; } else @@ -1629,7 +1629,7 @@ static HRESULT PropertyStorage_ReadFmtIdOffsetFromStream(IStream *stm, &fmt->dwOffset); } } - TRACE("returning 0x%08x\n", hr); + TRACE("returning %#lx\n", hr); return hr; } @@ -1647,7 +1647,7 @@ static HRESULT PropertyStorage_ReadSectionHeaderFromStream(IStream *stm, { if (count != sizeof(buf)) { - WARN("read only %d\n", count); + WARN("read only %ld\n", count); hr = STG_E_INVALIDHEADER; } else @@ -1658,7 +1658,7 @@ static HRESULT PropertyStorage_ReadSectionHeaderFromStream(IStream *stm, cProperties), &hdr->cProperties); } } - TRACE("returning 0x%08x\n", hr); + TRACE("returning %#lx\n", hr); return hr; } @@ -1677,7 +1677,7 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, const if (FAILED(hr = buffer_read_dword(buffer, offset, &numEntries))) return hr; - TRACE("Reading %d entries:\n", numEntries); + TRACE("Reading %ld entries:\n", numEntries); offset += sizeof(DWORD); @@ -1697,7 +1697,7 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, const if (FAILED(hr = buffer_test_offset(buffer, offset, This->codePage == CP_UNICODE ? ALIGNED_LENGTH(cbEntry * sizeof(WCHAR), 3) : cbEntry))) { - WARN("Broken name length for entry %d.\n", i); + WARN("Broken name length for entry %ld.\n", i); return hr; } @@ -1709,11 +1709,11 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, const if (ch) { - WARN("Dictionary entry name %d is not null-terminated.\n", i); + WARN("Dictionary entry name %ld is not null-terminated.\n", i); return E_FAIL; } - TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? + TRACE("Reading entry with ID %#lx, %ld chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? debugstr_wn((WCHAR *)buffer->data, cbEntry) : debugstr_an((char *)buffer->data, cbEntry)); hr = PropertyStorage_StoreNameWithId(This, (char *)buffer->data + offset, This->codePage, propid); @@ -1796,8 +1796,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) goto end; if (fmtOffset.dwOffset > stat.cbSize.u.LowPart) { - WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset, - stat.cbSize.u.LowPart); + WARN("invalid offset %ld (stream length is %ld)\n", fmtOffset.dwOffset, stat.cbSize.u.LowPart); hr = STG_E_INVALIDHEADER; goto end; } @@ -1814,7 +1813,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) /* The section size includes the section header, so check it */ if (sectionHdr.cbSection < sizeof(PROPERTYSECTIONHEADER)) { - WARN("section header too small, got %d\n", sectionHdr.cbSection); + WARN("section header too small, got %ld\n", sectionHdr.cbSection); hr = STG_E_INVALIDHEADER; goto end; } @@ -1831,7 +1830,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) hr = IStream_Read(This->stm, read_buffer.data, read_buffer.size, &count); if (FAILED(hr)) goto end; - TRACE("Reading %d properties:\n", sectionHdr.cProperties); + TRACE("Reading %ld properties:\n", sectionHdr.cProperties); for (i = 0; SUCCEEDED(hr) && i < sectionHdr.cProperties; i++) { PROPERTYIDOFFSET *idOffset = (PROPERTYIDOFFSET *)(read_buffer.data + @@ -1853,7 +1852,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) * later. */ dictOffset = idOffset->dwOffset; - TRACE("Dictionary offset is %d\n", dictOffset); + TRACE("Dictionary offset is %ld\n", dictOffset); } else { @@ -1864,8 +1863,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) idOffset->dwOffset - sizeof(PROPERTYSECTIONHEADER), This->codePage, Allocate_CoTaskMemAlloc, NULL))) { - TRACE("Read property with ID 0x%08x, type %d\n", - idOffset->propid, prop.vt); + TRACE("Read property with ID %#lx, type %d\n", idOffset->propid, prop.vt); switch(idOffset->propid) { case PID_CODEPAGE: @@ -1901,7 +1899,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) } if (!This->locale) This->locale = LOCALE_SYSTEM_DEFAULT; - TRACE("Code page is %d, locale is %d\n", This->codePage, This->locale); + TRACE("Code page is %d, locale is %ld\n", This->codePage, This->locale); if (dictOffset) hr = PropertyStorage_ReadDictionary(This, &read_buffer, dictOffset - sizeof(PROPERTYSECTIONHEADER)); @@ -2088,7 +2086,7 @@ static HRESULT PropertyStorage_WriteDictionaryToStream( if (closure.bytesWritten % sizeof(DWORD)) { DWORD padding = sizeof(DWORD) - closure.bytesWritten % sizeof(DWORD); - TRACE("adding %d bytes of padding\n", padding); + TRACE("adding %ld bytes of padding\n", padding); *sectionOffset += padding; } @@ -2109,7 +2107,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, assert(var); assert(sectionOffset); - TRACE("%p, %d, 0x%08x, (%d), (%d)\n", This, propNum, propid, var->vt, + TRACE("%p, %ld, %#lx, %d, %ld.\n", This, propNum, propid, var->vt, *sectionOffset); seek.QuadPart = SECTIONHEADER_OFFSET + sizeof(PROPERTYSECTIONHEADER) + @@ -2288,7 +2286,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, if (bytesWritten % sizeof(DWORD)) { DWORD padding = sizeof(DWORD) - bytesWritten % sizeof(DWORD); - TRACE("adding %d bytes of padding\n", padding); + TRACE("adding %ld bytes of padding\n", padding); *sectionOffset += padding; } } @@ -2578,7 +2576,7 @@ static HRESULT PropertyStorage_ConstructEmpty(IStream *stm, else ps->codePage = CP_UNICODE; ps->locale = LOCALE_SYSTEM_DEFAULT; - TRACE("Code page is %d, locale is %d\n", ps->codePage, ps->locale); + TRACE("Code page is %d, locale is %ld\n", ps->codePage, ps->locale); *pps = &ps->IPropertyStorage_iface; TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; @@ -2626,7 +2624,7 @@ static ULONG WINAPI enum_stat_propset_stg_AddRef(IEnumSTATPROPSETSTG *iface) struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); LONG refcount = InterlockedIncrement(&psenum->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -2636,7 +2634,7 @@ static ULONG WINAPI enum_stat_propset_stg_Release(IEnumSTATPROPSETSTG *iface) struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); LONG refcount = InterlockedDecrement(&psenum->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -2653,7 +2651,7 @@ static HRESULT WINAPI enum_stat_propset_stg_Next(IEnumSTATPROPSETSTG *iface, ULO struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); ULONG count = 0; - TRACE("%p, %u, %p, %p.\n", iface, celt, ret, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, celt, ret, fetched); if (psenum->current == ~0u) psenum->current = 0; @@ -2669,7 +2667,7 @@ static HRESULT WINAPI enum_stat_propset_stg_Next(IEnumSTATPROPSETSTG *iface, ULO static HRESULT WINAPI enum_stat_propset_stg_Skip(IEnumSTATPROPSETSTG *iface, ULONG celt) { - FIXME("%p, %u.\n", iface, celt); + FIXME("%p, %lu.\n", iface, celt); return S_OK; } @@ -2840,7 +2838,7 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( IStream *stm = NULL; HRESULT r; - TRACE("%p %s %08x %08x %p\n", This, debugstr_guid(rfmtid), grfFlags, + TRACE("%p, %s %#lx, %#lx, %p.\n", This, debugstr_guid(rfmtid), grfFlags, grfMode, ppprstg); /* be picky */ @@ -2879,7 +2877,7 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( IStream_Release( stm ); end: - TRACE("returning 0x%08x\n", r); + TRACE("returning %#lx\n", r); return r; } @@ -2897,7 +2895,7 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; HRESULT r; - TRACE("%p %s %08x %p\n", This, debugstr_guid(rfmtid), grfMode, ppprstg); + TRACE("%p, %s, %#lx, %p.\n", This, debugstr_guid(rfmtid), grfMode, ppprstg); /* be picky */ if (grfMode != (STGM_READWRITE|STGM_SHARE_EXCLUSIVE) && @@ -2926,7 +2924,7 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( IStream_Release( stm ); end: - TRACE("returning 0x%08x\n", r); + TRACE("returning %#lx\n", r); return r; } @@ -3205,7 +3203,7 @@ SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *p USHORT CodePage, SERIALIZEDPROPERTYVALUE *pprop, ULONG *pcb, PROPID pid, BOOLEAN fReserved, ULONG *pcIndirect) { - FIXME("%p,%d,%p,%p,%d,%d,%p\n", pvar, CodePage, pprop, pcb, pid, fReserved, pcIndirect); + FIXME("%p, %d, %p, %p, %ld, %d, %p.\n", pvar, CodePage, pprop, pcb, pid, fReserved, pcIndirect); return NULL; } @@ -3217,7 +3215,7 @@ HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, IStream *stm; HRESULT r; - TRACE("%p %s %s %08x %d %p\n", unk, debugstr_guid(fmt), debugstr_guid(clsid), flags, reserved, prop_stg); + TRACE("%p, %s, %s, %#lx, %ld, %p.\n", unk, debugstr_guid(fmt), debugstr_guid(clsid), flags, reserved, prop_stg); if (!fmt || reserved) { @@ -3251,7 +3249,7 @@ HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, } end: - TRACE("returning 0x%08x\n", r); + TRACE("returning %#lx\n", r); return r; } @@ -3262,7 +3260,7 @@ HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, IStream *stm; HRESULT r; - TRACE("%p %s %08x %d %p\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); + TRACE("%p, %s, %#lx, %ld, %p.\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); if (!fmt || reserved) { @@ -3296,6 +3294,6 @@ HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, } end: - TRACE("returning 0x%08x\n", r); + TRACE("returning %#lx\n", r); return r; } diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 1a5f061250e..73fc1cc9480 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -136,8 +136,7 @@ static HRESULT WINAPI StgStreamImpl_Read( ULONG bytesReadBuffer; HRESULT res; - TRACE("(%p, %p, %d, %p)\n", - iface, pv, cb, pcbRead); + TRACE("%p, %p, %lu, %p.\n", iface, pv, cb, pcbRead); if (!This->parentStorage) { @@ -167,7 +166,7 @@ static HRESULT WINAPI StgStreamImpl_Read( This->currentPosition.QuadPart += *pcbRead; } - TRACE("<-- %08x\n", res); + TRACE("<-- %#lx\n", res); return res; } @@ -192,8 +191,7 @@ static HRESULT WINAPI StgStreamImpl_Write( ULONG bytesWritten = 0; HRESULT res; - TRACE("(%p, %p, %d, %p)\n", - iface, pv, cb, pcbWritten); + TRACE("%p, %p, %lu, %p.\n", iface, pv, cb, pcbWritten); /* * Do we have permission to write to this stream? @@ -204,7 +202,7 @@ static HRESULT WINAPI StgStreamImpl_Write( case STGM_READWRITE: break; default: - WARN("access denied by flags: 0x%x\n", STGM_ACCESS_MODE(This->grfMode)); + WARN("access denied by flags: %#lx\n", STGM_ACCESS_MODE(This->grfMode)); return STG_E_ACCESSDENIED; } @@ -250,7 +248,7 @@ static HRESULT WINAPI StgStreamImpl_Write( if (SUCCEEDED(res)) res = StorageBaseImpl_Flush(This->parentStorage); - TRACE("<-- %08x, written %u\n", res, *pcbWritten); + TRACE("<-- %#lx, written %lu\n", res, *pcbWritten); return res; } @@ -274,8 +272,7 @@ static HRESULT WINAPI StgStreamImpl_Seek( DirEntry currentEntry; HRESULT hr; - TRACE("(%p, %d, %d, %p)\n", - iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + TRACE("%p, %ld, %ld, %p.\n", iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition); /* * fail if the stream has no parent (as does windows) @@ -316,7 +313,7 @@ static HRESULT WINAPI StgStreamImpl_Seek( *plibNewPosition = currentEntry.size; break; default: - WARN("invalid dwOrigin %d\n", dwOrigin); + WARN("invalid dwOrigin %ld\n", dwOrigin); return STG_E_INVALIDFUNCTION; } @@ -345,7 +342,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( HRESULT hr; - TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart); + TRACE("%p, %ld.\n", iface, libNewSize.u.LowPart); if(!This->parentStorage) { @@ -358,7 +355,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( */ if (libNewSize.u.HighPart != 0) { - WARN("invalid value for libNewSize.u.HighPart %d\n", libNewSize.u.HighPart); + WARN("invalid value for libNewSize.u.HighPart %ld\n", libNewSize.u.HighPart); return STG_E_INVALIDFUNCTION; } @@ -400,8 +397,7 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( ULARGE_INTEGER totalBytesRead; ULARGE_INTEGER totalBytesWritten; - TRACE("(%p, %p, %d, %p, %p)\n", - iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); /* * Sanity check @@ -547,7 +543,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( DirEntry currentEntry; HRESULT hr; - TRACE("%p %p %d\n", This, pstatstg, grfStatFlag); + TRACE("%p, %p, %#lx.\n", This, pstatstg, grfStatFlag); /* * if stream has no parent, return STG_E_REVERTED diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1c1baa5ce08..fa7158bad1b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -292,7 +292,7 @@ static HRESULT validateSTGM(DWORD stgm) if (stgm&~STGM_KNOWN_FLAGS) { - ERR("unknown flags %08x\n", stgm); + ERR("unknown flags %#lx\n", stgm); return E_FAIL; } @@ -463,7 +463,7 @@ static ULONG WINAPI directwriterlock_Release(IDirectWriterLock *iface) static HRESULT WINAPI directwriterlock_WaitForWriteAccess(IDirectWriterLock *iface, DWORD timeout) { StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); - FIXME("(%p)->(%d): stub\n", This, timeout); + FIXME("%p, %ld: stub\n", This, timeout); return E_NOTIMPL; } @@ -995,7 +995,7 @@ static HRESULT IEnumSTATSTGImpl_GetNextRef( memcpy(This->name, result_name, sizeof(result_name)); } - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -1013,7 +1013,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( DirRef currentSearchNode; HRESULT hr=S_OK; - TRACE("%p,%u,%p,%p\n", iface, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", iface, celt, rgelt, pceltFetched); if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) ) return E_INVALIDARG; @@ -1073,7 +1073,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( if (SUCCEEDED(hr) && *pceltFetched != celt) hr = S_FALSE; - TRACE("<-- %08x (asked %u, got %u)\n", hr, celt, *pceltFetched); + TRACE("<-- %#lx (asked %lu, got %lu)\n", hr, celt, *pceltFetched); return hr; } @@ -1088,7 +1088,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( DirRef currentSearchNode; HRESULT hr=S_OK; - TRACE("%p,%u\n", iface, celt); + TRACE("%p, %lu.\n", iface, celt); if (This->parentStorage->reverted) { @@ -1109,7 +1109,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( if (SUCCEEDED(hr) && objectFetched != celt) return S_FALSE; - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -1282,7 +1282,7 @@ static ULONG WINAPI StorageBaseImpl_AddRef( StorageBaseImpl *This = impl_from_IStorage(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) AddRef to %d\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -1302,7 +1302,7 @@ static ULONG WINAPI StorageBaseImpl_Release( ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ReleaseRef to %d\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 0) { @@ -1447,7 +1447,7 @@ static HRESULT StorageBaseImpl_CopyChildEntryTo(StorageBaseImpl *This, hr = StorageBaseImpl_CopyChildEntryTo( This, data.rightChild, skip_storage, skip_stream, snbExclude, pstgDest ); - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -1455,7 +1455,7 @@ static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEnt { StgStreamImpl *strm; - TRACE("%p,%d\n", stg, streamEntry); + TRACE("%p, %ld.\n", stg, streamEntry); LIST_FOR_EACH_ENTRY(strm, &stg->strmHead, StgStreamImpl, StrmListEntry) { @@ -1472,7 +1472,7 @@ static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageE { StorageInternalImpl *childstg; - TRACE("%p,%d\n", stg, storageEntry); + TRACE("%p, %ld.\n", stg, storageEntry); LIST_FOR_EACH_ENTRY(childstg, &stg->storageHead, StorageInternalImpl, ParentListEntry) { @@ -1506,8 +1506,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( DirRef streamEntryRef; HRESULT res = STG_E_UNKNOWN; - TRACE("(%p, %s, %p, %x, %d, %p)\n", - iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm); + TRACE("%p, %s, %p, %#lx, %ld, %p.\n", iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm); if ( (pwcsName==NULL) || (ppstm==0) ) { @@ -1595,7 +1594,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( end: if (res == S_OK) TRACE("<-- IStream %p\n", *ppstm); - TRACE("<-- %08x\n", res); + TRACE("<-- %#lx\n", res); return res; } @@ -1622,9 +1621,8 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( DirRef storageEntryRef; HRESULT res = STG_E_UNKNOWN; - TRACE("(%p, %s, %p, %x, %p, %d, %p)\n", - iface, debugstr_w(pwcsName), pstgPriority, - grfMode, snbExclude, reserved, ppstg); + TRACE("%p, %s, %p, %#lx, %p, %ld, %p.\n", iface, debugstr_w(pwcsName), pstgPriority, + grfMode, snbExclude, reserved, ppstg); if ((pwcsName==NULL) || (ppstg==0) ) { @@ -1732,7 +1730,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( res = STG_E_FILENOTFOUND; end: - TRACE("<-- %08x\n", res); + TRACE("<-- %#lx\n", res); return res; } @@ -1754,8 +1752,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( StorageBaseImpl *This = impl_from_IStorage(iface); IEnumSTATSTGImpl* newEnum; - TRACE("(%p, %d, %p, %d, %p)\n", - iface, reserved1, reserved2, reserved3, ppenum); + TRACE("%p, %ld, %p, %ld, %p.\n", iface, reserved1, reserved2, reserved3, ppenum); if (!ppenum) return E_INVALIDARG; @@ -1792,8 +1789,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( DirEntry currentEntry; HRESULT res = STG_E_UNKNOWN; - TRACE("(%p, %p, %x)\n", - iface, pstatstg, grfStatFlag); + TRACE("%p, %p, %#lx.\n", iface, pstatstg, grfStatFlag); if (!pstatstg) { @@ -1827,9 +1823,9 @@ static HRESULT WINAPI StorageBaseImpl_Stat( end: if (res == S_OK) { - TRACE("<-- STATSTG: pwcsName: %s, type: %d, cbSize.Low/High: %d/%d, grfMode: %08x, grfLocksSupported: %d, grfStateBits: %08x\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.u.LowPart, pstatstg->cbSize.u.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits); + TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %#lx, grfLocksSupported: %ld, grfStateBits: %#lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.u.LowPart, pstatstg->cbSize.u.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits); } - TRACE("<-- %08x\n", res); + TRACE("<-- %#lx\n", res); return res; } @@ -1935,9 +1931,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( DirRef currentEntryRef, newStreamEntryRef; HRESULT hr; - TRACE("(%p, %s, %x, %d, %d, %p)\n", - iface, debugstr_w(pwcsName), grfMode, - reserved1, reserved2, ppstm); + TRACE("%p, %s, %#lx, %ld, %ld, %p.\n", iface, debugstr_w(pwcsName), grfMode, reserved1, reserved2, ppstm); if (ppstm == 0) return STG_E_INVALIDPOINTER; @@ -2130,9 +2124,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( DirRef newEntryRef; HRESULT hr; - TRACE("(%p, %s, %x, %d, %d, %p)\n", - iface, debugstr_w(pwcsName), grfMode, - reserved1, reserved2, ppstg); + TRACE("%p, %s, %#lx, %ld, %ld, %p.\n", iface, debugstr_w(pwcsName), grfMode, + reserved1, reserved2, ppstg); if (ppstg == 0) return STG_E_INVALIDPOINTER; @@ -2150,7 +2143,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( if ( FAILED( validateSTGM(grfMode) ) || (grfMode & STGM_DELETEONRELEASE) ) { - WARN("bad grfMode: 0x%x\n", grfMode); + WARN("bad grfMode: %#lx\n", grfMode); return STG_E_INVALIDFLAG; } @@ -2278,7 +2271,7 @@ static HRESULT StorageBaseImpl_CopyStorageEntryTo(StorageBaseImpl *This, hr = StorageBaseImpl_CopyChildEntryTo( This, data.dirRootEntry, skip_storage, skip_stream, snbExclude, pstgDest ); - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -2297,9 +2290,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( BOOL skip_storage = FALSE, skip_stream = FALSE; DWORD i; - TRACE("(%p, %d, %p, %p, %p)\n", - iface, ciidExclude, rgiidExclude, - snbExclude, pstgDest); + TRACE("%p, %ld, %p, %p, %p.\n", iface, ciidExclude, rgiidExclude, snbExclude, pstgDest); if ( pstgDest == 0 ) return STG_E_INVALIDPOINTER; @@ -2381,9 +2372,8 @@ static HRESULT WINAPI StorageBaseImpl_MoveElementTo( const OLECHAR *pwcsNewName,/* [string][in] */ DWORD grfFlags) /* [in] */ { - FIXME("(%p %s %p %s %u): stub\n", iface, - debugstr_w(pwcsName), pstgDest, - debugstr_w(pwcsNewName), grfFlags); + FIXME("%p, %s, %p, %s, %#lx: stub\n", iface, debugstr_w(pwcsName), pstgDest, + debugstr_w(pwcsNewName), grfFlags); return E_NOTIMPL; } @@ -2400,7 +2390,7 @@ static HRESULT WINAPI StorageBaseImpl_Commit( DWORD grfCommitFlags)/* [in] */ { StorageBaseImpl* This = impl_from_IStorage(iface); - TRACE("(%p %d)\n", iface, grfCommitFlags); + TRACE("%p, %#lx.\n", iface, grfCommitFlags); return StorageBaseImpl_Flush(This); } @@ -2435,7 +2425,7 @@ static HRESULT deleteStorageContents( HRESULT destroyHr = S_OK; StorageInternalImpl *stg, *stg2; - TRACE("%p,%d\n", parentStorage, indexToDelete); + TRACE("%p, %ld.\n", parentStorage, indexToDelete); /* Invalidate any open storage objects. */ LIST_FOR_EACH_ENTRY_SAFE(stg, stg2, &parentStorage->storageHead, StorageInternalImpl, ParentListEntry) @@ -2460,7 +2450,7 @@ static HRESULT deleteStorageContents( if (hr != S_OK) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -2471,7 +2461,7 @@ static HRESULT deleteStorageContents( if (FAILED(hr)) { IStorage_Release(childStorage); - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -2499,7 +2489,7 @@ static HRESULT deleteStorageContents( IStorage_Release(childStorage); IEnumSTATSTG_Release(elements); - TRACE("%08x\n", hr); + TRACE("%#lx\n", hr); return destroyHr; } @@ -2539,7 +2529,7 @@ static HRESULT deleteStreamContents( if (hr!=S_OK) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return(hr); } @@ -2550,7 +2540,7 @@ static HRESULT deleteStreamContents( if(hr != S_OK) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -2558,7 +2548,7 @@ static HRESULT deleteStreamContents( * Release the stream object. */ IStream_Release(pis); - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return S_OK; } @@ -2625,7 +2615,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (hr!=S_OK) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -2646,7 +2636,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (SUCCEEDED(hr)) hr = StorageBaseImpl_Flush(This); - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -2995,7 +2985,7 @@ static HRESULT StorageImpl_LoadFileHeader( This->smallBlockSize != DEF_SMALL_BLOCK_SIZE || This->smallBlockLimit != LIMIT_TO_USE_SMALL_BLOCK) { - FIXME("Broken OLE storage file? bigblock=0x%x, smallblock=0x%x, sblimit=0x%x\n", + FIXME("Broken OLE storage file? bigblock=%#lx, smallblock=%#lx, sblimit=%#lx\n", This->bigBlockSize, This->smallBlockSize, This->smallBlockLimit); hr = STG_E_INVALIDHEADER; } @@ -3676,7 +3666,7 @@ static BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( if (FAILED(resRead) || FAILED(resWrite)) { - ERR("conversion failed: resRead = 0x%08x, resWrite = 0x%08x\n", resRead, resWrite); + ERR("conversion failed: resRead = %#lx, resWrite = %#lx\n", resRead, resWrite); BlockChainStream_SetSize(bbTempChain, size); BlockChainStream_Destroy(bbTempChain); return NULL; @@ -3781,7 +3771,7 @@ static SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( if(FAILED(resRead) || FAILED(resWrite)) { - ERR("conversion failed: resRead = 0x%08x, resWrite = 0x%08x\n", resRead, resWrite); + ERR("conversion failed: resRead = %#lx, resWrite = %#lx\n", resRead, resWrite); SmallBlockChainStream_SetSize(sbTempChain, size); SmallBlockChainStream_Destroy(sbTempChain); return NULL; @@ -4010,8 +4000,7 @@ static HRESULT StorageImpl_GetNextBlockInChain( if(depotBlockCount >= This->bigBlockDepotCount) { - WARN("depotBlockCount %d, bigBlockDepotCount %d\n", depotBlockCount, - This->bigBlockDepotCount); + WARN("depotBlockCount %ld, bigBlockDepotCount %ld\n", depotBlockCount, This->bigBlockDepotCount); return STG_E_READFAULT; } @@ -5476,7 +5465,7 @@ static HRESULT WINAPI StorageInternalImpl_Commit( DWORD grfCommitFlags) /* [in] */ { StorageBaseImpl* This = impl_from_IStorage(iface); - TRACE("(%p,%x)\n", iface, grfCommitFlags); + TRACE("%p, %#lx.\n", iface, grfCommitFlags); return StorageBaseImpl_Flush(This); } @@ -5942,7 +5931,7 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( zero.QuadPart = 0; - TRACE("(%p,%x)\n", iface, grfCommitFlags); + TRACE("%p, %#lx.\n", iface, grfCommitFlags); /* Cannot commit a read-only transacted storage */ if ( STGM_ACCESS_MODE( This->base.openFlags ) == STGM_READ ) @@ -6059,7 +6048,7 @@ end: StorageBaseImpl_UnlockTransaction(This->transactedParent, TRUE); } - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6152,7 +6141,7 @@ static HRESULT TransactedSnapshotImpl_CreateDirEntry(StorageBaseImpl *base, *index = new_ref; - TRACE("%s l=%x r=%x d=%x <-- %x\n", debugstr_w(newData->name), newData->leftChild, newData->rightChild, newData->dirRootEntry, *index); + TRACE("%s l=%lx r=%lx d=%lx <-- %lx\n", debugstr_w(newData->name), newData->leftChild, newData->rightChild, newData->dirRootEntry, *index); return S_OK; } @@ -6163,12 +6152,12 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base, TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) base; HRESULT hr; - TRACE("%x %s l=%x r=%x d=%x\n", index, debugstr_w(data->name), data->leftChild, data->rightChild, data->dirRootEntry); + TRACE("%lx %s l=%lx r=%lx d=%lx\n", index, debugstr_w(data->name), data->leftChild, data->rightChild, data->dirRootEntry); hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6205,13 +6194,13 @@ static HRESULT TransactedSnapshotImpl_ReadDirEntry(StorageBaseImpl *base, hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } memcpy(data, &This->entries[index].data, sizeof(DirEntry)); - TRACE("%x %s l=%x r=%x d=%x\n", index, debugstr_w(data->name), data->leftChild, data->rightChild, data->dirRootEntry); + TRACE("%lx %s l=%lx r=%lx d=%lx\n", index, debugstr_w(data->name), data->leftChild, data->rightChild, data->dirRootEntry); return S_OK; } @@ -6271,14 +6260,14 @@ static HRESULT TransactedSnapshotImpl_StreamWriteAt(StorageBaseImpl *base, hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } hr = TransactedSnapshotImpl_MakeStreamDirty(This, index); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6290,7 +6279,7 @@ static HRESULT TransactedSnapshotImpl_StreamWriteAt(StorageBaseImpl *base, This->entries[index].data.size.QuadPart, offset.QuadPart + size); - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6303,7 +6292,7 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6346,7 +6335,7 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, if (SUCCEEDED(hr)) This->entries[index].data.size = newsize; - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6360,14 +6349,14 @@ static HRESULT TransactedSnapshotImpl_StreamLink(StorageBaseImpl *base, hr = TransactedSnapshotImpl_EnsureReadEntry(This, src); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } hr = TransactedSnapshotImpl_EnsureReadEntry(This, dst); if (FAILED(hr)) { - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6656,7 +6645,7 @@ static HRESULT WINAPI TransactedSharedImpl_Commit( HRESULT hr; ULONG transactionSig; - TRACE("(%p,%x)\n", iface, grfCommitFlags); + TRACE("%p, %#lx\n", iface, grfCommitFlags); /* Cannot commit a read-only transacted storage */ if ( STGM_ACCESS_MODE( This->base.openFlags ) == STGM_READ ) @@ -6724,7 +6713,7 @@ static HRESULT WINAPI TransactedSharedImpl_Commit( This->lastTransactionSig = transactionSig+1; } } - TRACE("<-- %08x\n", hr); + TRACE("<-- %#lx\n", hr); return hr; } @@ -6862,7 +6851,7 @@ static HRESULT Storage_ConstructTransacted(StorageBaseImpl *parentStorage, if (parentStorage->openFlags & fixme_flags) { fixme_flags &= ~parentStorage->openFlags; - FIXME("Unimplemented flags %x\n", parentStorage->openFlags); + FIXME("Unimplemented flags %lx\n", parentStorage->openFlags); } if (toplevel && !(parentStorage->openFlags & STGM_NOSNAPSHOT) && @@ -7590,7 +7579,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, HRESULT hr; BlockChainBlock *cachedBlock; - TRACE("(%p)-> %i %p %i %p\n",This, offset.u.LowPart, buffer, size, bytesRead); + TRACE("%p, %li, %p, %lu, %p.\n",This, offset.u.LowPart, buffer, size, bytesRead); /* * Find the first block in the stream that contains part of the buffer. @@ -8581,7 +8570,7 @@ static HRESULT create_storagefile( IStorage_Release(&newStorage->IStorage_iface); end: - TRACE("<-- %p r = %08x\n", *ppstgOpen, hr); + TRACE("<-- %p r = %#lx\n", *ppstgOpen, hr); return hr; } @@ -8613,9 +8602,7 @@ HRESULT WINAPI StgCreateDocfile( { STGOPTIONS stgoptions = {1, 0, 512}; - TRACE("(%s, %x, %d, %p)\n", - debugstr_w(pwcsName), grfMode, - reserved, ppstgOpen); + TRACE("%s, %#lx, %ld, %p.\n", debugstr_w(pwcsName), grfMode, reserved, ppstgOpen); if (ppstgOpen == 0) return STG_E_INVALIDPOINTER; @@ -8630,7 +8617,7 @@ HRESULT WINAPI StgCreateDocfile( */ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen) { - TRACE("(%s, %x, %x, %x, %p, %p, %p, %p)\n", debugstr_w(pwcsName), + TRACE("%s, %#lx, %#lx, %#lx, %p, %p, %p, %p.\n", debugstr_w(pwcsName), grfMode, stgfmt, grfAttrs, pStgOptions, reserved, riid, ppObjectOpen); if (stgfmt != STGFMT_FILE && grfAttrs != 0) @@ -8670,7 +8657,7 @@ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD st HRESULT WINAPI StgCreatePropSetStg(IStorage *pstg, DWORD reserved, IPropertySetStorage **propset) { - TRACE("(%p, 0x%x, %p)\n", pstg, reserved, propset); + TRACE("%p, %#lx, %p.\n", pstg, reserved, propset); if (reserved) return STG_E_INVALIDPARAMETER; @@ -8682,7 +8669,7 @@ HRESULT WINAPI StgCreatePropSetStg(IStorage *pstg, DWORD reserved, */ HRESULT WINAPI StgOpenStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen) { - TRACE("(%s, %x, %x, %x, %p, %p, %p, %p)\n", debugstr_w(pwcsName), + TRACE("%s, %#lx, %#lx, %#lx, %p, %p, %p, %p.\n", debugstr_w(pwcsName), grfMode, stgfmt, grfAttrs, pStgOptions, reserved, riid, ppObjectOpen); if (stgfmt != STGFMT_DOCFILE && grfAttrs != 0) @@ -8739,9 +8726,8 @@ HRESULT WINAPI StgOpenStorage( DWORD accessMode; LPWSTR temp_name = NULL; - TRACE("(%s, %p, %x, %p, %d, %p)\n", - debugstr_w(pwcsName), pstgPriority, grfMode, - snbExclude, reserved, ppstgOpen); + TRACE("%s, %p, %#lx, %p, %ld, %p.\n", debugstr_w(pwcsName), pstgPriority, grfMode, + snbExclude, reserved, ppstgOpen); if (pstgPriority) { @@ -8908,7 +8894,7 @@ HRESULT WINAPI StgOpenStorage( end: CoTaskMemFree(temp_name); if (pstgPriority) IStorage_Release(pstgPriority); - TRACE("<-- %08x, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL); + TRACE("<-- %#lx, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL); return hr; } @@ -9242,7 +9228,7 @@ static HRESULT STREAM_ReadString( IStream *stm, LPWSTR *string ) if( count != sizeof(len) ) return E_OUTOFMEMORY; - TRACE("%d bytes\n",len); + TRACE("%ld bytes\n",len); str = CoTaskMemAlloc( len ); if( !str ) @@ -9381,7 +9367,7 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp r = IStorage_OpenStream( pstg, L"\1CompObj", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if( FAILED ( r ) ) { - WARN("Failed to open stream r = %08x\n", r); + WARN("Failed to open stream r = %#lx\n", r); return r; } @@ -10576,7 +10562,7 @@ enum stream_1ole_flags { HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ) { - FIXME("%p %x %d %d %d %p %p stub\n", stg, cf, width, height, size, medium, olestream); + FIXME("%p, %x, %ld, %ld, %ld, %p, %p: stub\n", stg, cf, width, height, size, medium, olestream); return E_NOTIMPL; } @@ -10604,7 +10590,7 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) if (header[0] != version_magic) { - ERR("got wrong version magic for 1Ole stream, 0x%08x\n", header[0]); + ERR("got wrong version magic for 1Ole stream, %#lx.\n", header[0]); return E_FAIL; } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index c58053489be..9a8ab431ea0 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -106,7 +106,7 @@ ULONG __RPC_USER HMETAFILE_UserSize(ULONG *pFlags, ULONG StartingSize, HMETAFILE { ULONG size = StartingSize; - TRACE("(%s, %d, &%p\n", debugstr_user_flags(pFlags), StartingSize, *phmf); + TRACE("%s, %lu, &%p.\n", debugstr_user_flags(pFlags), StartingSize, *phmf); ALIGN_LENGTH(size, 3); @@ -302,7 +302,7 @@ void __RPC_USER HMETAFILE_UserFree(ULONG *pFlags, HMETAFILE *phmf) */ ULONG __RPC_USER HENHMETAFILE_UserSize(ULONG *pFlags, ULONG size, HENHMETAFILE *phEmf) { - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), size, *phEmf); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), size, *phEmf); ALIGN_LENGTH(size, 3); @@ -498,7 +498,7 @@ void __RPC_USER HENHMETAFILE_UserFree(ULONG *pFlags, HENHMETAFILE *phEmf) */ ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG size, HMETAFILEPICT *phMfp) { - TRACE("(%s, %d, &%p)\n", debugstr_user_flags(pFlags), size, *phMfp); + TRACE("%s, %lu, &%p.\n", debugstr_user_flags(pFlags), size, *phMfp); ALIGN_LENGTH(size, 3); @@ -721,7 +721,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM { ULONG size = StartingSize; - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, pStgMedium); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, pStgMedium); ALIGN_LENGTH(size, 3); @@ -961,7 +961,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char pBuffer += sizeof(DWORD); if (*(DWORD *)pBuffer != 0) { - ERR("invalid offset %d\n", *(DWORD *)pBuffer); + ERR("invalid offset %ld\n", *(DWORD *)pBuffer); RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; } @@ -970,14 +970,13 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char pBuffer += sizeof(DWORD); if (conformance != variance) { - ERR("conformance (%d) and variance (%d) should be equal\n", - conformance, variance); + ERR("conformance (%ld) and variance (%ld) should be equal\n", conformance, variance); RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; } if (conformance > 0x7fffffff) { - ERR("conformance 0x%x too large\n", conformance); + ERR("conformance %#lx too large\n", conformance); RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; } @@ -1141,7 +1140,7 @@ ULONG __RPC_USER SNB_UserSize(ULONG *pFlags, ULONG StartingSize, SNB *pSnb) { ULONG size = StartingSize; - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, pSnb); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, pSnb); ALIGN_LENGTH(size, 3); @@ -1305,7 +1304,7 @@ HRESULT CALLBACK IEnumUnknown_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumUnknown_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -1317,7 +1316,7 @@ HRESULT __RPC_STUB IEnumUnknown_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumUnknown_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt; @@ -1363,7 +1362,7 @@ HRESULT CALLBACK IEnumMoniker_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumMoniker_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -1375,7 +1374,7 @@ HRESULT __RPC_STUB IEnumMoniker_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumMoniker_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt; @@ -1449,7 +1448,7 @@ HRESULT CALLBACK IEnumString_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumString_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -1461,7 +1460,7 @@ HRESULT __RPC_STUB IEnumString_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumString_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt; @@ -1477,7 +1476,7 @@ HRESULT CALLBACK ISequentialStream_Read_Proxy( ULONG read; HRESULT hr; - TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbRead); + TRACE("%p, %p, %lu, %p.\n", This, pv, cb, pcbRead); hr = ISequentialStream_RemoteRead_Proxy(This, pv, cb, &read); if(pcbRead) *pcbRead = read; @@ -1491,7 +1490,7 @@ HRESULT __RPC_STUB ISequentialStream_Read_Stub( ULONG cb, ULONG *pcbRead) { - TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbRead); + TRACE("%p, %p, %lu, %p.\n", This, pv, cb, pcbRead); return ISequentialStream_Read(This, pv, cb, pcbRead); } @@ -1504,7 +1503,7 @@ HRESULT CALLBACK ISequentialStream_Write_Proxy( ULONG written; HRESULT hr; - TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + TRACE("%p, %p, %lu, %p.\n", This, pv, cb, pcbWritten); hr = ISequentialStream_RemoteWrite_Proxy(This, pv, cb, &written); if(pcbWritten) *pcbWritten = written; @@ -1518,7 +1517,7 @@ HRESULT __RPC_STUB ISequentialStream_Write_Stub( ULONG cb, ULONG *pcbWritten) { - TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + TRACE("%p, %p, %lu, %p.\n", This, pv, cb, pcbWritten); return ISequentialStream_Write(This, pv, cb, pcbWritten); } @@ -1531,7 +1530,7 @@ HRESULT CALLBACK IStream_Seek_Proxy( ULARGE_INTEGER newpos; HRESULT hr; - TRACE("(%p)->(%s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + TRACE("%p, %s, %ld, %p.\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); hr = IStream_RemoteSeek_Proxy(This, dlibMove, dwOrigin, &newpos); if(plibNewPosition) *plibNewPosition = newpos; @@ -1545,7 +1544,7 @@ HRESULT __RPC_STUB IStream_Seek_Stub( DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - TRACE("(%p)->(%s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + TRACE("%p, %s, %ld, %p.\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); return IStream_Seek(This, dlibMove, dwOrigin, plibNewPosition); } @@ -1587,7 +1586,7 @@ HRESULT CALLBACK IEnumSTATSTG_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumSTATSTG_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -1599,7 +1598,7 @@ HRESULT __RPC_STUB IEnumSTATSTG_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumSTATSTG_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt; @@ -1614,7 +1613,7 @@ HRESULT CALLBACK IStorage_OpenStream_Proxy( DWORD reserved2, IStream **ppstm) { - TRACE("(%p)->(%s, %p, %08x, %d %p)\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm); + TRACE("%p, %s, %p, %#lx, %ld, %p.\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm); if(reserved1) WARN("reserved1 %p\n", reserved1); return IStorage_RemoteOpenStream_Proxy(This, pwcsName, 0, NULL, grfMode, reserved2, ppstm); @@ -1629,8 +1628,8 @@ HRESULT __RPC_STUB IStorage_OpenStream_Stub( DWORD reserved2, IStream **ppstm) { - TRACE("(%p)->(%s, %d, %p, %08x, %d %p)\n", This, debugstr_w(pwcsName), cbReserved1, reserved1, grfMode, reserved2, ppstm); - if(cbReserved1 || reserved1) WARN("cbReserved1 %d reserved1 %p\n", cbReserved1, reserved1); + TRACE("%p, %s, %ld, %p, %#lx, %ld, %p.\n", This, debugstr_w(pwcsName), cbReserved1, reserved1, grfMode, reserved2, ppstm); + if(cbReserved1 || reserved1) WARN("cbReserved1 %ld reserved1 %p\n", cbReserved1, reserved1); return IStorage_OpenStream(This, pwcsName, NULL, grfMode, reserved2, ppstm); } @@ -1642,7 +1641,7 @@ HRESULT CALLBACK IStorage_EnumElements_Proxy( DWORD reserved3, IEnumSTATSTG **ppenum) { - TRACE("(%p)->(%d, %p, %d, %p)\n", This, reserved1, reserved2, reserved3, ppenum); + TRACE("%p, %ld, %p, %ld, %p.\n", This, reserved1, reserved2, reserved3, ppenum); if(reserved2) WARN("reserved2 %p\n", reserved2); return IStorage_RemoteEnumElements_Proxy(This, reserved1, 0, NULL, reserved3, ppenum); @@ -1656,8 +1655,8 @@ HRESULT __RPC_STUB IStorage_EnumElements_Stub( DWORD reserved3, IEnumSTATSTG **ppenum) { - TRACE("(%p)->(%d, %d, %p, %d, %p)\n", This, reserved1, cbReserved2, reserved2, reserved3, ppenum); - if(cbReserved2 || reserved2) WARN("cbReserved2 %d reserved2 %p\n", cbReserved2, reserved2); + TRACE("%p, %ld, %ld, %p, %ld, %p.\n", This, reserved1, cbReserved2, reserved2, reserved3, ppenum); + if(cbReserved2 || reserved2) WARN("cbReserved2 %ld reserved2 %p\n", cbReserved2, reserved2); return IStorage_EnumElements(This, reserved1, NULL, reserved3, ppenum); } @@ -1672,7 +1671,7 @@ HRESULT CALLBACK ILockBytes_ReadAt_Proxy( ULONG read; HRESULT hr; - TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbRead); + TRACE("%p, %s, %p, %lu, %p.\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbRead); hr = ILockBytes_RemoteReadAt_Proxy(This, ulOffset, pv, cb, &read); if(pcbRead) *pcbRead = read; @@ -1687,7 +1686,7 @@ HRESULT __RPC_STUB ILockBytes_ReadAt_Stub( ULONG cb, ULONG *pcbRead) { - TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbRead); + TRACE("%p, %s, %p, %lu, %p.\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbRead); return ILockBytes_ReadAt(This, ulOffset, pv, cb, pcbRead); } @@ -1701,7 +1700,7 @@ HRESULT CALLBACK ILockBytes_WriteAt_Proxy( ULONG written; HRESULT hr; - TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + TRACE("%p, %s, %p, %lu, %p.\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); hr = ILockBytes_RemoteWriteAt_Proxy(This, ulOffset, pv, cb, &written); if(pcbWritten) *pcbWritten = written; @@ -1716,7 +1715,7 @@ HRESULT __RPC_STUB ILockBytes_WriteAt_Stub( ULONG cb, ULONG *pcbWritten) { - TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + TRACE("%p, %s, %p, %lu, %p.\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); return ILockBytes_WriteAt(This, ulOffset, pv, cb, pcbWritten); } @@ -1729,7 +1728,7 @@ HRESULT CALLBACK IFillLockBytes_FillAppend_Proxy( ULONG written; HRESULT hr; - TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + TRACE("%p, %p, %lu, %p.\n", This, pv, cb, pcbWritten); hr = IFillLockBytes_RemoteFillAppend_Proxy(This, pv, cb, &written); if(pcbWritten) *pcbWritten = written; @@ -1743,7 +1742,7 @@ HRESULT __RPC_STUB IFillLockBytes_FillAppend_Stub( ULONG cb, ULONG *pcbWritten) { - TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + TRACE("%p, %p, %lu, %p.\n", This, pv, cb, pcbWritten); return IFillLockBytes_FillAppend(This, pv, cb, pcbWritten); } @@ -1757,7 +1756,7 @@ HRESULT CALLBACK IFillLockBytes_FillAt_Proxy( ULONG written; HRESULT hr; - TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + TRACE("%p, %s, %p, %lu, %p.\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); hr = IFillLockBytes_RemoteFillAt_Proxy(This, ulOffset, pv, cb, &written); if(pcbWritten) *pcbWritten = written; @@ -1772,7 +1771,7 @@ HRESULT __RPC_STUB IFillLockBytes_FillAt_Stub( ULONG cb, ULONG *pcbWritten) { - TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + TRACE("%p, %s, %p, %ld, %p.\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); return IFillLockBytes_FillAt(This, ulOffset, pv, cb, pcbWritten); } @@ -1807,7 +1806,7 @@ HRESULT CALLBACK IEnumSTATDATA_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %ld, %p, %p.\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumSTATDATA_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -1819,7 +1818,7 @@ HRESULT __RPC_STUB IEnumSTATDATA_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumSTATDATA_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt; @@ -1850,7 +1849,7 @@ void CALLBACK IAdviseSink_OnViewChange_Proxy( DWORD dwAspect, LONG lindex) { - TRACE("(%p)->(%d, %d)\n", This, dwAspect, lindex); + TRACE("%p, %ld, %ld.\n", This, dwAspect, lindex); IAdviseSink_RemoteOnViewChange_Proxy(This, dwAspect, lindex); } @@ -1859,7 +1858,7 @@ HRESULT __RPC_STUB IAdviseSink_OnViewChange_Stub( DWORD dwAspect, LONG lindex) { - TRACE("(%p)->(%d, %d)\n", This, dwAspect, lindex); + TRACE("%p, %ld, %ld.\n", This, dwAspect, lindex); IAdviseSink_OnViewChange(This, dwAspect, lindex); return S_OK; } @@ -2054,7 +2053,7 @@ HRESULT CALLBACK IOleCache2_UpdateCache_Proxy( DWORD grfUpdf, LPVOID pReserved) { - TRACE("(%p, %p, 0x%08x, %p)\n", This, pDataObject, grfUpdf, pReserved); + TRACE("%p, %p, %#lx, %p.\n", This, pDataObject, grfUpdf, pReserved); return IOleCache2_RemoteUpdateCache_Proxy(This, pDataObject, grfUpdf, (LONG_PTR)pReserved); } @@ -2064,7 +2063,7 @@ HRESULT __RPC_STUB IOleCache2_UpdateCache_Stub( DWORD grfUpdf, LONG_PTR pReserved) { - TRACE("(%p, %p, 0x%08x, %li)\n", This, pDataObject, grfUpdf, pReserved); + TRACE("%p, %p, %#lx, %Id.\n", This, pDataObject, grfUpdf, pReserved); return IOleCache2_UpdateCache(This, pDataObject, grfUpdf, (void*)pReserved); } @@ -2075,7 +2074,7 @@ HRESULT CALLBACK IEnumOLEVERB_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumOLEVERB_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -2087,7 +2086,7 @@ HRESULT __RPC_STUB IEnumOLEVERB_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p, %lu, %p, %p.\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumOLEVERB_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt; -- 2.34.1

2 1

[PATCH] xolehlp: Build without -DWINE_NO_LONG_TYPES.
by Alistair Leslie-Hughes 09 Feb '22

09 Feb '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xolehlp/Makefile.in | 1 - dlls/xolehlp/xolehlp.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index c2bebe884fe..f39cd90f0b9 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xolehlp.dll IMPORTS = uuid diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index d3355c1c34e..e61f4b35fc8 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -68,7 +68,7 @@ static ULONG WINAPI ResourceManager_AddRef(IResourceManager *iface) ResourceManager *This = impl_from_IResourceManager(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -78,7 +78,7 @@ static ULONG WINAPI ResourceManager_Release(IResourceManager *iface) ResourceManager *This = impl_from_IResourceManager(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -98,7 +98,7 @@ static HRESULT WINAPI ResourceManager_Enlist(IResourceManager *iface, static HRESULT WINAPI ResourceManager_Reenlist(IResourceManager *iface, byte *pPrepInfo,ULONG cbPrepInfo,DWORD lTimeout,XACTSTAT *pXactStat) { - FIXME("(%p, %p, %u, %u, %p): stub\n", iface, pPrepInfo, cbPrepInfo, lTimeout, pXactStat); + FIXME("(%p, %p, %lu, %lu, %p): stub\n", iface, pPrepInfo, cbPrepInfo, lTimeout, pXactStat); return E_NOTIMPL; } static HRESULT WINAPI ResourceManager_ReenlistmentComplete(IResourceManager *iface) @@ -186,7 +186,7 @@ static ULONG WINAPI TransactionOptions_AddRef(ITransactionOptions *iface) TransactionOptions *This = impl_from_ITransactionOptions(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -196,7 +196,7 @@ static ULONG WINAPI TransactionOptions_Release(ITransactionOptions *iface) TransactionOptions *This = impl_from_ITransactionOptions(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -211,7 +211,7 @@ static HRESULT WINAPI TransactionOptions_SetOptions(ITransactionOptions *iface, TransactionOptions *This = impl_from_ITransactionOptions(iface); if (!pOptions) return E_INVALIDARG; - TRACE("(%p, %u, %s)\n", iface, pOptions->ulTimeout, debugstr_a(pOptions->szDescription)); + TRACE("(%p, %lu, %s)\n", iface, pOptions->ulTimeout, debugstr_a(pOptions->szDescription)); This->opts = *pOptions; return S_OK; } @@ -295,7 +295,7 @@ static ULONG WINAPI Transaction_AddRef(ITransaction *iface) Transaction *This = impl_from_ITransaction(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -305,7 +305,7 @@ static ULONG WINAPI Transaction_Release(ITransaction *iface) Transaction *This = impl_from_ITransaction(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -317,7 +317,7 @@ static ULONG WINAPI Transaction_Release(ITransaction *iface) static HRESULT WINAPI Transaction_Commit(ITransaction *iface, BOOL fRetaining, DWORD grfTC, DWORD grfRM) { - FIXME("(%p, %d, %08x, %08x): stub\n", iface, fRetaining, grfTC, grfRM); + FIXME("(%p, %d, %08lx, %08lx): stub\n", iface, fRetaining, grfTC, grfRM); return E_NOTIMPL; } static HRESULT WINAPI Transaction_Abort(ITransaction *iface, @@ -425,7 +425,7 @@ static ULONG WINAPI TransactionDispenser_AddRef(ITransactionDispenser *iface) TransactionManager *This = impl_from_ITransactionDispenser(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -435,7 +435,7 @@ static ULONG WINAPI TransactionDispenser_Release(ITransactionDispenser *iface) TransactionManager *This = impl_from_ITransactionDispenser(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -460,7 +460,7 @@ static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispense ITransactionOptions *pOptions, ITransaction **ppTransaction) { - FIXME("(%p, %p, %08x, %08x, %p, %p): semi-stub\n", iface, punkOuter, + FIXME("(%p, %p, %08lx, %08lx, %p, %p): semi-stub\n", iface, punkOuter, isoLevel, isoFlags, pOptions, ppTransaction); if (!ppTransaction) return E_INVALIDARG; @@ -556,7 +556,7 @@ static HRESULT WINAPI TransactionImportWhereabouts_GetWhereaboutsSize(ITransacti static HRESULT WINAPI TransactionImportWhereabouts_GetWhereabouts(ITransactionImportWhereabouts *iface, ULONG cbWhereabouts, BYTE *rgbWhereabouts,ULONG *pcbUsed) { - FIXME("(%p, %u, %p, %p): stub returning fake value\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); + FIXME("(%p, %lu, %p, %p): stub returning fake value\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); if (!rgbWhereabouts || !pcbUsed) return E_INVALIDARG; *rgbWhereabouts = 0; @@ -597,7 +597,7 @@ static ULONG WINAPI TransactionImport_Release(ITransactionImport *iface) static HRESULT WINAPI TransactionImport_Import(ITransactionImport *iface, ULONG cbTransactionCookie, byte *rgbTransactionCookie, IID *piid, void **ppvTransaction) { - FIXME("(%p, %u, %p, %s, %p): stub\n", iface, cbTransactionCookie, rgbTransactionCookie, debugstr_guid(piid), ppvTransaction); + FIXME("(%p, %lu, %p, %s, %p): stub\n", iface, cbTransactionCookie, rgbTransactionCookie, debugstr_guid(piid), ppvTransaction); if (!rgbTransactionCookie || !piid || !ppvTransaction) return E_INVALIDARG; return E_NOTIMPL; @@ -653,7 +653,7 @@ static BOOL is_local_machineW( const WCHAR *server ) HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) { - TRACE("(%s, %s, %s, %d, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), + TRACE("(%s, %s, %s, %ld, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), debugstr_guid(riid), dwReserved1, wcbReserved2, pvReserved2, ppv); if (!is_local_machineA(host)) @@ -667,7 +667,7 @@ HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { - TRACE("(%s, %s, %s, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), + TRACE("(%s, %s, %s, %ld, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), debugstr_guid(riid), options, config, ppv); if (!is_local_machineA(host)) @@ -681,7 +681,7 @@ HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid HRESULT CDECL DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { - TRACE("(%s, %s, %s, %d, %p, %p)\n", debugstr_w(host), debugstr_w(tm_name), + TRACE("(%s, %s, %s, %ld, %p, %p)\n", debugstr_w(host), debugstr_w(tm_name), debugstr_guid(riid), options, config, ppv); if (!is_local_machineW(host)) -- 2.34.1

1 0

[PATCH 1/4] qasf: Build without -DWINE_NO_LONG_TYPES.
by Zebediah Figura 09 Feb '22

09 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qasf/Makefile.in | 1 - dlls/qasf/dmowrapper.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index d82abfeea7d..ee8fd0451e1 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 54581b48bee..95e12e860ae 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -86,7 +86,7 @@ static HRESULT WINAPI buffer_SetLength(IMediaBuffer *iface, DWORD len) { struct buffer *buffer = impl_from_IMediaBuffer(iface); - TRACE("iface %p, len %u.\n", iface, len); + TRACE("iface %p, len %lu.\n", iface, len); return IMediaSample_SetActualDataLength(buffer->sample, len); } @@ -216,7 +216,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator, &filter->sources[i].buffer.sample, NULL, NULL, 0))) { - ERR("Failed to get sample, hr %#x.\n", hr); + ERR("Failed to get sample, hr %#lx.\n", hr); goto out; } buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; @@ -263,7 +263,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) { if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) { - WARN("Downstream sink returned %#x.\n", hr); + WARN("Downstream sink returned %#lx.\n", hr); goto out; } IMediaSample_SetActualDataLength(sample, 0); @@ -300,7 +300,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed { if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) { - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); goto out; } @@ -324,7 +324,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed if (FAILED(hr = IMediaObject_ProcessInput(dmo, index, &filter->input_buffer.IMediaBuffer_iface, flags, start, stop - start))) { - ERR("ProcessInput() failed, hr %#x.\n", hr); + ERR("ProcessInput() failed, hr %#lx.\n", hr); goto out; } @@ -346,11 +346,11 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); process_output(filter, dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr); for (i = 0; i < filter->source_count; ++i) { @@ -372,7 +372,7 @@ static HRESULT dmo_wrapper_end_flush(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr); for (i = 0; i < filter->source_count; ++i) { -- 2.34.1

2 4

[PATCH] winex11.drv: Change fullscreen state even when processing events.
by Esme Povirk 09 Feb '22

09 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52532 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/winex11.drv/window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..7e5b17288bf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2536,7 +2536,10 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags else { if (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED)) set_wm_hints( data ); - if (!event_type) update_net_wm_states( data ); + if (!event_type || + (!(swp_flags & (SWP_NOMOVE|SWP_NOSIZE)) && + (is_window_rect_full_screen( &old_whole_rect ) != is_window_rect_full_screen( &data->whole_rect )))) + update_net_wm_states( data ); } } -- 2.30.2

2 1

[RFC PATCH v5 0/5] Fix sock_recv reordering issue (#52401): unknown_status + wineserver call approach
by Jinoh Kang 09 Feb '22

09 Feb '22

<preamble> This is my forth attempt to tackle the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Basically, the old process of sock_recv is: 1. Perform the I/O synchronously. 2. Report the result back to the server, or queue up the request in the server. 3. If blocking, wait for I/O to complete. The new process of sock_recv would be: 1. Queue up the request in the server. 2. Perform the I/O synchronously. 3. Report the result back to the server, 4. If blocking, wait for I/O to complete. Everything except the actual I/O requires communicating with wineserver. My goal here is to fix the issue without introducing extra calls to wineserver. (However, if it turns out that this goal is not of utmost significance, then this patch serie can be easily modified so that it issues separate server calls.) The previous approaches are listed here: - Add a new select type called SELECT_SIGNAL_WAIT_ASYNC [3]. Zebediah has pointed out [4] that it is not very elegant to (ab-)use the synchronization machinery for communicating the async result. - Use APC_ASYNC_IO to perform the synchronous I/O [5]. This ended up with a total of 11 patches, and turned out to be rather too complicated for a simple task. - Add a new wineserver call, and use "add_queue" hook to save a round trip to the server [6]. </preamble> Each of the above turned out to be either too intrusive, complicated, or hard to verify. Per suggestion by Zebediah [7], this is my (hopefully) last approach: keep the new wineserver call, but keep out the implicit STATUS_PENDING transition from "add_queue"; also, (re-)use the "unknown_status" field. Changelog: - v1 -> v2: fix async queue hang on synchronous failure - v2 -> v3: rewrite handling of pending/failed asyncs. - v3 -> v4: don't set IOSB on synchronous failure, make more robust [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html [3] https://www.winehq.org/pipermail/wine-devel/2022-January/204695.html [4] https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html [5] https://www.winehq.org/pipermail/wine-devel/2022-January/205168.html [6] https://www.winehq.org/pipermail/wine-devel/2022-January/205193.html [7] https://www.winehq.org/pipermail/wine-devel/2022-January/205738.html Jinoh Kang (5): server: Allow calling async_handoff() with status code STATUS_ALERTED. server: Add a new server request "set_async_direct_result." server: Attempt to complete I/O request immediately in recv_socket. ntdll: Don't call try_recv before server call in sock_recv. server: Replace redundant recv_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 36 +++++++++-------- dlls/ntdll/unix/sync.c | 26 ++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ws2_32/tests/sock.c | 8 ++-- server/async.c | 72 ++++++++++++++++++++++++++++++++++ server/protocol.def | 14 ++++++- server/sock.c | 39 ++++++++++++------ 7 files changed, 160 insertions(+), 36 deletions(-) -- 2.34.1

3 7

[PATCH 1/5] wined3d: Use the chunk allocator for GL indirect draw buffers.
by Zebediah Figura 09 Feb '22

09 Feb '22

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/context_gl.c | 258 +++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 110 ++++++++++++++ dlls/wined3d/wined3d_private.h | 66 ++++++--- 4 files changed, 390 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5511a70a8ff..e903c67b56a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4283,6 +4283,7 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) struct wined3d_device_gl *device_gl = wined3d_device_gl(device); wined3d_device_cleanup(&device_gl->d); + heap_free(device_gl->retired_blocks); heap_free(device_gl); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 3a83027522a..9b8a887bd92 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2618,6 +2618,37 @@ static void wined3d_context_gl_poll_fences(struct wined3d_context_gl *context_gl } } +static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *context_gl) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + struct wined3d_retired_block_gl *r, *blocks; + SIZE_T count, i = 0; + uint64_t id; + + wined3d_context_gl_poll_fences(context_gl); + id = device_gl->completed_fence_id; + + blocks = device_gl->retired_blocks; + count = device_gl->retired_block_count; + while (i < count) + { + r = &blocks[i]; + + if (r->fence_id > id) + { + ++i; + continue; + } + + wined3d_allocator_block_free(r->block); + if (i != --count) + *r = blocks[count]; + else + ++i; + } + device_gl->retired_block_count = count; +} + void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl, uint64_t id) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); @@ -2635,7 +2666,7 @@ void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl if ((ret = wined3d_fence_wait(context_gl->submitted.fences[i].fence, &device_gl->d)) != WINED3D_FENCE_OK) ERR("Failed to wait for command fence with id 0x%s, ret %#x.\n", wine_dbgstr_longlong(id), ret); - wined3d_context_gl_poll_fences(context_gl); + wined3d_context_gl_cleanup_resources(context_gl); return; } @@ -2665,7 +2696,133 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ device_gl->completed_fence_id = 0; device_gl->current_fence_id = 1; } - wined3d_context_gl_poll_fences(context_gl); + wined3d_context_gl_cleanup_resources(context_gl); +} + +static void wined3d_context_gl_destroy_allocator_block(struct wined3d_context_gl *context_gl, + struct wined3d_allocator_block *block, uint64_t fence_id) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + struct wined3d_retired_block_gl *r; + + if (device_gl->completed_fence_id > fence_id) + { + wined3d_allocator_block_free(block); + TRACE("Freed block %p.\n", block); + return; + } + + if (!wined3d_array_reserve((void **)&device_gl->retired_blocks, + &device_gl->retired_blocks_size, device_gl->retired_block_count + 1, + sizeof(*device_gl->retired_blocks))) + { + ERR("Leaking block %p.\n", block); + return; + } + + r = &device_gl->retired_blocks[device_gl->retired_block_count++]; + r->block = block; + r->fence_id = fence_id; +} + +/* We always have buffer storage here. */ +GLuint wined3d_context_gl_allocate_vram_chunk_buffer(struct wined3d_context_gl *context_gl, + unsigned int pool, size_t size) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + GLbitfield flags; + GLuint id = 0; + + TRACE("context_gl %p, pool %u, size %zu.\n", context_gl, pool, size); + + GL_EXTCALL(glGenBuffers(1, &id)); + if (!id) + { + checkGLcall("buffer object creation"); + return 0; + } + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, id); + + flags = wined3d_device_gl_get_memory_type_flags(pool) | GL_DYNAMIC_STORAGE_BIT; + if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + GL_EXTCALL(glBufferStorage(GL_PIXEL_UNPACK_BUFFER, size, NULL, flags)); + + checkGLcall("buffer object creation"); + + TRACE("Created buffer object %u.\n", id); + + return id; +} + +static struct wined3d_allocator_block *wined3d_context_gl_allocate_memory(struct wined3d_context_gl *context_gl, + unsigned int memory_type, GLsizeiptr size, GLuint *id) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + struct wined3d_allocator *allocator = &device_gl->allocator; + struct wined3d_allocator_block *block; + + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) + { + *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + return NULL; + } + + if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) + { + *id = 0; + return NULL; + } + + *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; + + return block; +} + +static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *chunk_gl, + struct wined3d_context_gl *context_gl) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("chunk %p, gl_buffer %u, map_ptr %p.\n", chunk_gl, chunk_gl->gl_buffer, chunk_gl->c.map_ptr); + + if (!chunk_gl->c.map_ptr) + { + unsigned int flags = wined3d_device_gl_get_memory_type_flags(chunk_gl->memory_type) & ~GL_CLIENT_STORAGE_BIT; + + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + if (!(flags & GL_MAP_READ_BIT)) + flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (flags & GL_MAP_WRITE_BIT) + flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + chunk_gl->c.map_ptr = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, + 0, WINED3D_ALLOCATOR_CHUNK_SIZE, flags)); + if (!chunk_gl->c.map_ptr) + { + ERR("Failed to map chunk memory.\n"); + return NULL; + } + } + + ++chunk_gl->c.map_count; + + return chunk_gl->c.map_ptr; +} + +static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl *chunk_gl, + struct wined3d_context_gl *context_gl) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("chunk_gl %p, context_gl %p.\n", chunk_gl, context_gl); + + if (!--chunk_gl->c.map_count && !wined3d_map_persistent()) + { + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + chunk_gl->c.map_ptr = NULL; + } } static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) @@ -2708,6 +2865,15 @@ map: if (bo->b.map_ptr) return bo->b.map_ptr; + if (bo->memory) + { + struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk); + + if (!(map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) + ERR("Failed to map chunk.\n"); + return map_ptr; + } + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); @@ -2766,7 +2932,12 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context return; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - GL_EXTCALL(glUnmapBuffer(bo->binding)); + + if (bo->memory) + wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); + else + GL_EXTCALL(glUnmapBuffer(bo->binding)); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Unmap buffer object"); } @@ -2920,7 +3091,23 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct TRACE("context_gl %p, bo %p.\n", context_gl, bo); + if (bo->memory) + { + if (bo->b.map_ptr) + wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); + wined3d_context_gl_destroy_allocator_block(context_gl, bo->memory, bo->command_fence_id); + bo->id = 0; + return; + } + + if (bo->b.map_ptr) + { + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); + GL_EXTCALL(glUnmapBuffer(bo->binding)); + } + TRACE("Destroying GL buffer %u.\n", bo->id); + GL_EXTCALL(glDeleteBuffers(1, &bo->id)); checkGLcall("buffer object destruction"); bo->id = 0; @@ -2929,42 +3116,61 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) { + unsigned int memory_type_idx = wined3d_device_gl_find_memory_type(flags); const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_allocator_block *memory = NULL; + GLsizeiptr buffer_offset = 0; GLuint id = 0; TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", context_gl, size, binding, usage, coherent, flags, bo); - GL_EXTCALL(glGenBuffers(1, &id)); - if (!id) - { - checkGLcall("buffer object creation"); - return false; - } - wined3d_context_gl_bind_bo(context_gl, binding, id); - - if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - { - GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); - } - if (gl_info->supported[ARB_BUFFER_STORAGE]) { - if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) - flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + switch (binding) + { + case GL_DRAW_INDIRECT_BUFFER: + if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) + buffer_offset = memory->offset; + break; + + default: + WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); + id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); + break; + } + + if (!id) + { + WARN("Failed to allocate buffer.\n"); + return false; + } } else { - GL_EXTCALL(glBufferData(binding, size, NULL, usage)); - } + GL_EXTCALL(glGenBuffers(1, &id)); + if (!id) + { + checkGLcall("buffer object creation"); + return false; + } + wined3d_context_gl_bind_bo(context_gl, binding, id); - wined3d_context_gl_bind_bo(context_gl, binding, 0); - checkGLcall("buffer object creation"); + if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + } + + GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + + wined3d_context_gl_bind_bo(context_gl, binding, 0); + checkGLcall("buffer object creation"); + } TRACE("Created buffer object %u.\n", id); bo->id = id; + bo->memory = memory; bo->size = size; bo->binding = binding; bo->usage = usage; @@ -2972,8 +3178,8 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->b.coherent = coherent; list_init(&bo->b.users); bo->command_fence_id = 0; - bo->b.memory_offset = 0; - bo->b.buffer_offset = 0; + bo->b.buffer_offset = buffer_offset; + bo->b.memory_offset = bo->b.buffer_offset; bo->b.map_ptr = NULL; return true; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa456d3e702..09be992dd2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -955,6 +955,101 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } +static struct wined3d_allocator_chunk *wined3d_allocator_gl_create_chunk(struct wined3d_allocator *allocator, + struct wined3d_context *context, unsigned int memory_type, size_t chunk_size) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_allocator_chunk_gl *chunk_gl; + + TRACE("allocator %p, context %p, memory_type %u, chunk_size %zu.\n", allocator, context, memory_type, chunk_size); + + if (!(chunk_gl = heap_alloc(sizeof(*chunk_gl)))) + return NULL; + + if (!wined3d_allocator_chunk_init(&chunk_gl->c, allocator)) + { + heap_free(chunk_gl); + return NULL; + } + + chunk_gl->memory_type = memory_type; + if (!(chunk_gl->gl_buffer = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, chunk_size))) + { + wined3d_allocator_chunk_cleanup(&chunk_gl->c); + heap_free(chunk_gl); + return NULL; + } + list_add_head(&allocator->pools[memory_type].chunks, &chunk_gl->c.entry); + + return &chunk_gl->c; +} + +static void wined3d_allocator_gl_destroy_chunk(struct wined3d_allocator_chunk *chunk) +{ + struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(chunk); + const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; + struct wined3d_device_gl *device_gl; + + TRACE("chunk %p.\n", chunk); + + device_gl = CONTAINING_RECORD(chunk_gl->c.allocator, struct wined3d_device_gl, allocator); + context_gl = wined3d_context_gl(context_acquire(&device_gl->d, NULL, 0)); + gl_info = context_gl->gl_info; + + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + if (chunk_gl->c.map_ptr) + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + GL_EXTCALL(glDeleteBuffers(1, &chunk_gl->gl_buffer)); + TRACE("Freed buffer %u.\n", chunk_gl->gl_buffer); + wined3d_allocator_chunk_cleanup(&chunk_gl->c); + heap_free(chunk_gl); + + context_release(&context_gl->c); +} + +static const struct wined3d_allocator_ops wined3d_allocator_gl_ops = +{ + .allocator_create_chunk = wined3d_allocator_gl_create_chunk, + .allocator_destroy_chunk = wined3d_allocator_gl_destroy_chunk, +}; + +static const struct +{ + GLbitfield flags; +} +gl_memory_types[] = +{ + {0}, + {GL_MAP_READ_BIT}, + {GL_MAP_WRITE_BIT}, + {GL_MAP_READ_BIT | GL_MAP_WRITE_BIT}, + + {GL_CLIENT_STORAGE_BIT}, + {GL_CLIENT_STORAGE_BIT | GL_MAP_READ_BIT}, + {GL_CLIENT_STORAGE_BIT | GL_MAP_WRITE_BIT}, + {GL_CLIENT_STORAGE_BIT | GL_MAP_READ_BIT | GL_MAP_WRITE_BIT}, +}; + +unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(gl_memory_types); ++i) + { + if (gl_memory_types[i].flags == flags) + return i; + } + + assert(0); + return 0; +} + +GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) +{ + return gl_memory_types[memory_type_idx].flags; +} + void wined3d_device_gl_delete_opengl_contexts_cs(void *object) { struct wined3d_device_gl *device_gl = object; @@ -978,6 +1073,12 @@ void wined3d_device_gl_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); + + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, + wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + wined3d_allocator_cleanup(&device_gl->allocator); + context_release(context); while (device->context_count) @@ -1010,10 +1111,18 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) return; } + if (!wined3d_allocator_init(&device_gl->allocator, ARRAY_SIZE(gl_memory_types), &wined3d_allocator_gl_ops)) + { + WARN("Failed to initialise allocator.\n"); + context_release(context); + return; + } + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { ERR("Failed to allocate shader private data, hr %#x.\n", hr); + wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); return; } @@ -1022,6 +1131,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) { ERR("Failed to create CPU blitter.\n"); device->shader_backend->shader_free_private(device, NULL); + wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b3a13024f9..ef1062ec9b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1617,6 +1617,9 @@ struct wined3d_bo_gl struct wined3d_bo b; GLuint id; + + struct wined3d_allocator_block *memory; + GLsizeiptr size; GLenum binding; GLenum usage; @@ -2355,6 +2358,8 @@ void wined3d_context_gl_alloc_so_statistics_query(struct wined3d_context_gl *con struct wined3d_so_statistics_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_timestamp_query(struct wined3d_context_gl *context_gl, struct wined3d_timestamp_query *query) DECLSPEC_HIDDEN; +GLuint wined3d_context_gl_allocate_vram_chunk_buffer(struct wined3d_context_gl *context_gl, + unsigned int pool, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, @@ -3956,25 +3961,6 @@ static inline struct wined3d_device_no3d *wined3d_device_no3d(struct wined3d_dev return CONTAINING_RECORD(device, struct wined3d_device_no3d, d); } -struct wined3d_device_gl -{ - struct wined3d_device d; - - /* Textures for when no other textures are bound. */ - struct wined3d_dummy_textures dummy_textures; - - uint64_t completed_fence_id; - uint64_t current_fence_id; -}; - -static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) -{ - return CONTAINING_RECORD(device, struct wined3d_device_gl, d); -} - -void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; -void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; - struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; @@ -4021,6 +4007,18 @@ void wined3d_allocator_chunk_cleanup(struct wined3d_allocator_chunk *chunk) DECL bool wined3d_allocator_chunk_init(struct wined3d_allocator_chunk *chunk, struct wined3d_allocator *allocator) DECLSPEC_HIDDEN; +struct wined3d_allocator_chunk_gl +{ + struct wined3d_allocator_chunk c; + unsigned int memory_type; + GLuint gl_buffer; +}; + +static inline struct wined3d_allocator_chunk_gl *wined3d_allocator_chunk_gl(struct wined3d_allocator_chunk *chunk) +{ + return CONTAINING_RECORD(chunk, struct wined3d_allocator_chunk_gl, c); +} + struct wined3d_allocator_chunk_vk { struct wined3d_allocator_chunk c; @@ -4155,6 +4153,36 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, void wined3d_device_vk_uav_clear_state_init(struct wined3d_device_vk *device_vk) DECLSPEC_HIDDEN; void wined3d_device_vk_uav_clear_state_cleanup(struct wined3d_device_vk *device_vk) DECLSPEC_HIDDEN; +struct wined3d_device_gl +{ + struct wined3d_device d; + + /* Textures for when no other textures are bound. */ + struct wined3d_dummy_textures dummy_textures; + + struct wined3d_allocator allocator; + uint64_t completed_fence_id; + uint64_t current_fence_id; + + struct wined3d_retired_block_gl + { + struct wined3d_allocator_block *block; + uint64_t fence_id; + } *retired_blocks; + SIZE_T retired_blocks_size; + SIZE_T retired_block_count; +}; + +static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_gl, d); +} + +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; +void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; +unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) DECLSPEC_HIDDEN; + static inline float wined3d_alpha_ref(const struct wined3d_state *state) { return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; -- 2.34.1

4 16

[PATCH 1/5] shlwapi/tests: Link directly to Url*() functions.
by Zebediah Figura 09 Feb '22

09 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 485 ++++++++++++++------------------------- 1 file changed, 176 insertions(+), 309 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0cc14dc65bf..ea58163ce2e 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -29,30 +29,6 @@ #include "wininet.h" #include "intshcut.h" -/* ################ */ -static HMODULE hShlwapi; -static HRESULT (WINAPI *pUrlUnescapeA)(LPSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlUnescapeW)(LPWSTR,LPWSTR,LPDWORD,DWORD); -static BOOL (WINAPI *pUrlIsA)(LPCSTR,URLIS); -static BOOL (WINAPI *pUrlIsW)(LPCWSTR,URLIS); -static HRESULT (WINAPI *pUrlHashA)(LPCSTR,LPBYTE,DWORD); -static HRESULT (WINAPI *pUrlHashW)(LPCWSTR,LPBYTE,DWORD); -static HRESULT (WINAPI *pUrlGetPartA)(LPCSTR,LPSTR,LPDWORD,DWORD,DWORD); -static HRESULT (WINAPI *pUrlGetPartW)(LPCWSTR,LPWSTR,LPDWORD,DWORD,DWORD); -static HRESULT (WINAPI *pUrlEscapeA)(LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlEscapeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCreateFromPathA)(LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCreateFromPathW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCombineA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCombineW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCanonicalizeA)(LPCSTR, LPSTR, LPDWORD, DWORD); -static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); -static HRESULT (WINAPI *pUrlApplySchemeA)(LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlApplySchemeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pParseURLA)(LPCSTR,PARSEDURLA*); -static HRESULT (WINAPI *pParseURLW)(LPCWSTR,PARSEDURLW*); -static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); - static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; static const char* TEST_URL_3 = "http://foo:bar@localhost:21/internal.php?query=x&return=y"; @@ -539,15 +515,10 @@ static void test_UrlApplyScheme(void) DWORD len; DWORD i; - if (!pUrlApplySchemeA) { - win_skip("UrlApplySchemeA not found\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(TEST_APPLY); i++) { len = TEST_APPLY_MAX_LENGTH; lstrcpyA(newurl, untouchedA); - res = pUrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); + res = UrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); ok( res == TEST_APPLY[i].res, "#%dA: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -563,7 +534,7 @@ static void test_UrlApplyScheme(void) MultiByteToWideChar(CP_ACP, 0, newurl, -1, newurlW, len); MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].url, -1, urlW, len); - res = pUrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); + res = UrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); WideCharToMultiByte(CP_ACP, 0, newurlW, -1, newurl, TEST_APPLY_MAX_LENGTH, NULL, NULL); ok( res == TEST_APPLY[i].res, "#%dW: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -579,7 +550,7 @@ static void test_UrlApplyScheme(void) /* buffer too small */ lstrcpyA(newurl, untouchedA); len = lstrlenA(TEST_APPLY[0].newurl); - res = pUrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); + res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); ok(res == E_POINTER, "got HRESULT 0x%x (expected E_POINTER)\n", res); /* The returned length include the space for the terminating 0 */ i = lstrlenA(TEST_APPLY[0].newurl)+1; @@ -589,18 +560,18 @@ static void test_UrlApplyScheme(void) /* NULL as parameter. The length and the buffer are not modified */ lstrcpyA(newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; - res = pUrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); + res = UrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; - res = pUrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); + res = UrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); lstrcpyA(newurl, untouchedA); - res = pUrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); + res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); @@ -616,25 +587,18 @@ static void hash_url(const char* szUrl) DWORD cbSize = sizeof(DWORD); DWORD dwHash1, dwHash2; - res = pUrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize); + res = UrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize); ok(res == S_OK, "UrlHashA returned 0x%x (expected S_OK) for %s\n", res, szUrl); - if (pUrlHashW) { - res = pUrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize); - ok(res == S_OK, "UrlHashW returned 0x%x (expected S_OK) for %s\n", res, szUrl); - ok(dwHash1 == dwHash2, - "Hashes didn't match (A: 0x%x, W: 0x%x) for %s\n", dwHash1, dwHash2, szUrl); - } - FreeWideString(wszTestUrl); + res = UrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize); + ok(res == S_OK, "UrlHashW returned 0x%x (expected S_OK) for %s\n", res, szUrl); + ok(dwHash1 == dwHash2, + "Hashes didn't match (A: 0x%x, W: 0x%x) for %s\n", dwHash1, dwHash2, szUrl); + FreeWideString(wszTestUrl); } static void test_UrlHash(void) { - if (!pUrlHashA) { - win_skip("UrlHashA not found\n"); - return; - } - hash_url(TEST_URL_1); hash_url(TEST_URL_2); hash_url(TEST_URL_3); @@ -652,31 +616,30 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const DWORD dwSize; dwSize = 1; - res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); + res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); ok(dwSize == strlen(szExpected)+1 || (*szExpected == '?' && dwSize == strlen(szExpected)), "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; - res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); + res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == S_OK, "UrlGetPartA for \"%s\" part 0x%08x returned 0x%x and \"%s\"\n", szUrl, dwPart, res, szPart); - if (pUrlGetPartW) { - dwSize = INTERNET_MAX_URL_LENGTH; - res = pUrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags); - ok(res == S_OK, - "UrlGetPartW for \"%s\" part 0x%08x returned 0x%x\n", - szUrl, dwPart, res); - wszConvertedPart = GetWideString(szPart); + dwSize = INTERNET_MAX_URL_LENGTH; + res = UrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags); + ok(res == S_OK, + "UrlGetPartW for \"%s\" part 0x%08x returned 0x%x\n", + szUrl, dwPart, res); - ok(lstrcmpW(wszPart,wszConvertedPart)==0, - "Strings didn't match between ansi and unicode UrlGetPart!\n"); + wszConvertedPart = GetWideString(szPart); - FreeWideString(wszConvertedPart); - } + ok(lstrcmpW(wszPart,wszConvertedPart)==0, + "Strings didn't match between ansi and unicode UrlGetPart!\n"); + + FreeWideString(wszConvertedPart); FreeWideString(wszUrl); /* Note that v6.0 and later don't return '?' with the query */ @@ -698,57 +661,47 @@ static void test_UrlGetPart(void) const char* short_url = "ascheme:"; CHAR szPart[INTERNET_MAX_URL_LENGTH]; + WCHAR bufW[5]; DWORD dwSize; HRESULT res; - if (!pUrlGetPartA) { - win_skip("UrlGetPartA not found\n"); - return; - } - - res = pUrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); + res = UrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null params gave: 0x%08x\n", res); - res = pUrlGetPartA(NULL, szPart, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA(NULL, szPart, &dwSize, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null URL gave: 0x%08x\n", res); - res = pUrlGetPartA(res_url, NULL, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA(res_url, NULL, &dwSize, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null szPart gave: 0x%08x\n", res); - res = pUrlGetPartA(res_url, szPart, NULL, URL_PART_SCHEME, 0); + res = UrlGetPartA(res_url, szPart, NULL, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null URL gave: 0x%08x\n", res); dwSize = 0; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "UrlGetPartA(*pcchOut = 0) returned %08X\n", res); ok(szPart[0] == 'x' && szPart[1] == 0, "UrlGetPartA(*pcchOut = 0) modified szPart: \"%s\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); - if(pUrlGetPartW) - { - const WCHAR hiW[] = {'h','i',0}; - WCHAR bufW[5]; - - /* UrlGetPartW returns S_OK instead of S_FALSE */ - dwSize = sizeof szPart; - bufW[0]='x'; bufW[1]=0; - res = pUrlGetPartW(hiW, bufW, &dwSize, URL_PART_SCHEME, 0); - todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); - ok(bufW[0] == 0, "UrlGetPartW(\"hi\") return \"%c\"\n", bufW[0]); - ok(dwSize == 0, "dwSize = %d\n", dwSize); - } + /* UrlGetPartW returns S_OK instead of S_FALSE */ + dwSize = sizeof szPart; + bufW[0]='x'; bufW[1]=0; + res = UrlGetPartW(L"hi", bufW, &dwSize, URL_PART_SCHEME, 0); + todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); + ok(bufW[0] == 0, "UrlGetPartW(\"hi\") return \"%c\"\n", bufW[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); @@ -774,7 +727,7 @@ static void test_UrlGetPart(void) test_url_part(short_url, URL_PART_SCHEME, 0, "ascheme"); dwSize = sizeof(szPart); - res = pUrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); test_url_part(res_url, URL_PART_SCHEME, 0, "res"); @@ -782,52 +735,52 @@ static void test_UrlGetPart(void) dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA(res_url, szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA(res_url, szPart, &dwSize, URL_PART_QUERY, 0); ok(res==S_FALSE, "UrlGetPartA returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA gave \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); - res = pUrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == '\0', "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA("index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA("index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA(excid_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA(excid_url, szPart, &dwSize, URL_PART_QUERY, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA(foo_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA(foo_url, szPart, &dwSize, URL_PART_QUERY, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); @@ -846,28 +799,26 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H DWORD dwSize; dwSize = INTERNET_MAX_URL_LENGTH; - ret = pUrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags); + ret = UrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags); ok(ret != dwExpectReturn, "got 0s%x: Unexpected return for NULL buffer, index %d\n", ret, index); - ret = pUrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); + ret = UrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); todo_wine_if (todo) ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - if (pUrlCanonicalizeW) { - dwSize = INTERNET_MAX_URL_LENGTH; - ret = pUrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags); - ok(ret != dwExpectReturn, "got 0x%x: Unexpected return for NULL buffer, index %d\n", ret, index); - ret = pUrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags); - ok(ret == dwExpectReturn, "UrlCanonicalizeW failed: expected 0x%08x, got 0x%x, index %d\n", - dwExpectReturn, ret, index); + dwSize = INTERNET_MAX_URL_LENGTH; + ret = UrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags); + ok(ret != dwExpectReturn, "got 0x%x: Unexpected return for NULL buffer, index %d\n", ret, index); + ret = UrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags); + ok(ret == dwExpectReturn, "UrlCanonicalizeW failed: expected 0x%08x, got 0x%x, index %d\n", + dwExpectReturn, ret, index); - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, - "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); - FreeWideString(wszConvertedUrl); - } + wszConvertedUrl = GetWideString(szReturnUrl); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, + "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); + FreeWideString(wszConvertedUrl); FreeWideString(wszUrl); FreeWideString(wszExpectUrl); @@ -881,40 +832,35 @@ static void test_UrlEscapeA(void) unsigned int i; char empty_string[] = ""; - if (!pUrlEscapeA) { - win_skip("UrlEscapeA not found\n"); - return; - } - - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); size = 0; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); size = 1; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; empty_string[0] = 127; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); size = 1; empty_string[0] = 127; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ "got %x, expected %x\n", ret, E_NOTIMPL); ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ @@ -925,7 +871,7 @@ static void test_UrlEscapeA(void) CHAR ret_url[INTERNET_MAX_URL_LENGTH]; size = INTERNET_MAX_URL_LENGTH; - ret = pUrlEscapeA(TEST_ESCAPE[i].url, ret_url, &size, TEST_ESCAPE[i].flags); + ret = UrlEscapeA(TEST_ESCAPE[i].url, ret_url, &size, TEST_ESCAPE[i].flags); ok(ret == TEST_ESCAPE[i].expectret, "UrlEscapeA returned 0x%08x instead of 0x%08x for \"%s\"\n", ret, TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].url); ok(!strcmp(ret_url, TEST_ESCAPE[i].expecturl), "Expected \"%s\", but got \"%s\" for \"%s\"\n", @@ -947,11 +893,6 @@ static void test_UrlEscapeW(void) WCHAR wc; int i; - if (!pUrlEscapeW) { - win_skip("UrlEscapeW not found\n"); - return; - } - /* Check error paths */ ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); @@ -989,21 +930,21 @@ static void test_UrlEscapeW(void) /* Check actual escaping */ size = ARRAY_SIZE(overwrite); - ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == S_OK, "got %x, expected S_OK\n", ret); ok(size == 9, "got %d, expected 9\n", size); ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); size = 1; wc = 127; - ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 10, "got %d, expected 10\n", size); ok(wc == 127, "String has changed, wc = %d\n", wc); /* non-ASCII range */ size = ARRAY_SIZE(ret_urlW); - ret = pUrlEscapeW(naW, ret_urlW, &size, 0); + ret = UrlEscapeW(naW, ret_urlW, &size, 0); ok(ret == S_OK, "got %x, expected S_OK\n", ret); ok(!lstrcmpW(naescapedW, ret_urlW), "got %s, expected %s\n", wine_dbgstr_w(ret_urlW), wine_dbgstr_w(naescapedW)); @@ -1014,7 +955,7 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; urlW = GetWideString(TEST_ESCAPE[i].url); expected_urlW = GetWideString(TEST_ESCAPE[i].expecturl); - ret = pUrlEscapeW(urlW, ret_urlW, &size, TEST_ESCAPE[i].flags); + ret = UrlEscapeW(urlW, ret_urlW, &size, TEST_ESCAPE[i].flags); ok(ret == TEST_ESCAPE[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for %s\n", ret, TEST_ESCAPE[i].expectret, wine_dbgstr_w(urlW)); ok(!lstrcmpW(ret_urlW, expected_urlW), "Expected %s, but got %s for %s flags %08x\n", @@ -1027,7 +968,7 @@ static void test_UrlEscapeW(void) WCHAR ret_url[INTERNET_MAX_URL_LENGTH]; size = INTERNET_MAX_URL_LENGTH; - ret = pUrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); + ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || @@ -1050,27 +991,22 @@ static void test_UrlCanonicalizeA(void) DWORD urllen; HRESULT hr; - if (!pUrlCanonicalizeA) { - win_skip("UrlCanonicalizeA not found\n"); - return; - } - urllen = lstrlenA(winehqA); /* Parameter checks */ dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeA(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeA(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeA(winehqA, NULL, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeA(winehqA, NULL, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, NULL, URL_UNESCAPE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, NULL, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = 0; - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* buffer has no space for the result */ @@ -1078,7 +1014,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); @@ -1088,7 +1024,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); @@ -1098,7 +1034,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); @@ -1108,7 +1044,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); @@ -1118,7 +1054,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_INVALIDARG) && (dwSize == 0), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_INVALIDARG' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), 0); @@ -1128,7 +1064,7 @@ static void test_UrlCanonicalizeA(void) memset(longurl, 'a', sizeof(longurl)); memcpy(longurl, winehqA, sizeof(winehqA)-1); longurl[sizeof(longurl)-1] = '\0'; - hr = pUrlCanonicalizeA(longurl, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(longurl, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok(hr == S_OK, "hr = %x\n", hr); test_url_canonicalize(-1, "", 0, S_OK, S_FALSE /* Vista/win2k8 */, "", FALSE); @@ -1151,27 +1087,22 @@ static void test_UrlCanonicalizeW(void) HRESULT hr; int i; - - if (!pUrlCanonicalizeW) { - win_skip("UrlCanonicalizeW not found\n"); - return; - } urllen = lstrlenW(winehqW); /* Parameter checks */ dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeW(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeW(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeW(winehqW, NULL, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeW(winehqW, NULL, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, NULL, URL_UNESCAPE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, NULL, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = 0; - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* buffer has no space for the result */ @@ -1179,7 +1110,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen+1); @@ -1190,7 +1121,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen+1); @@ -1200,7 +1131,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen); @@ -1210,7 +1141,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen); @@ -1226,7 +1157,7 @@ static void test_UrlCanonicalizeW(void) pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH; - pUrlCanonicalizeW(szUrl, szReturnUrl, &urllen, 0); + UrlCanonicalizeW(szUrl, szReturnUrl, &urllen, 0); choped = lstrlenW(szReturnUrl) < lstrlenW(szUrl); ok(choped == (i <= 32), "Incorrect char chopping for char %d\n", i); } @@ -1244,54 +1175,47 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla DWORD dwSize; DWORD dwExpectLen = lstrlenA(szExpectUrl); - if (!pUrlCombineA) { - win_skip("UrlCombineA not found\n"); - return; - } - wszUrl1 = GetWideString(szUrl1); wszUrl2 = GetWideString(szUrl2); wszExpectUrl = GetWideString(szExpectUrl); - hr = pUrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); ok(hr == E_INVALIDARG, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); dwSize = 0; - hr = pUrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); dwSize--; - hr = pUrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == E_POINTER, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - hr = pUrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == dwExpectReturn, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); if(SUCCEEDED(hr)) { ok(strcmp(szReturnUrl,szExpectUrl)==0, "Expected %s, but got %s\n", szExpectUrl, szReturnUrl); } - if (pUrlCombineW) { - dwSize = 0; - hr = pUrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); - ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); + dwSize = 0; + hr = UrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); + ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - dwSize--; - hr = pUrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == E_POINTER, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); + dwSize--; + hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); + ok(hr == E_POINTER, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - hr = pUrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == dwExpectReturn, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); - ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); - if(SUCCEEDED(hr)) { - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n"); - FreeWideString(wszConvertedUrl); - } + hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); + ok(hr == dwExpectReturn, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); + ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); + if(SUCCEEDED(hr)) { + wszConvertedUrl = GetWideString(szReturnUrl); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n"); + FreeWideString(wszConvertedUrl); } FreeWideString(wszUrl1); @@ -1320,32 +1244,25 @@ static void test_UrlCreateFromPath(void) WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; - if (!pUrlCreateFromPathA) { - win_skip("UrlCreateFromPathA not found\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(TEST_URLFROMPATH); i++) { len = INTERNET_MAX_URL_LENGTH; - ret = pUrlCreateFromPathA(TEST_URLFROMPATH[i].path, ret_url, &len, 0); + ret = UrlCreateFromPathA(TEST_URLFROMPATH[i].path, ret_url, &len, 0); ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path %s\n", ret, TEST_URLFROMPATH[i].path); ok(!lstrcmpiA(ret_url, TEST_URLFROMPATH[i].url), "url %s from path %s\n", ret_url, TEST_URLFROMPATH[i].path); ok(len == strlen(ret_url), "ret len %d from path %s\n", len, TEST_URLFROMPATH[i].path); - if (pUrlCreateFromPathW) { - len = INTERNET_MAX_URL_LENGTH; - pathW = GetWideString(TEST_URLFROMPATH[i].path); - urlW = GetWideString(TEST_URLFROMPATH[i].url); - ret = pUrlCreateFromPathW(pathW, ret_urlW, &len, 0); - WideCharToMultiByte(CP_ACP, 0, ret_urlW, -1, ret_url, sizeof(ret_url),0,0); - ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path L\"%s\", expected %08x\n", - ret, TEST_URLFROMPATH[i].path, TEST_URLFROMPATH[i].ret); - ok(!lstrcmpiW(ret_urlW, urlW), "got %s expected %s from path L\"%s\"\n", - ret_url, TEST_URLFROMPATH[i].url, TEST_URLFROMPATH[i].path); - ok(len == lstrlenW(ret_urlW), "ret len %d from path L\"%s\"\n", len, TEST_URLFROMPATH[i].path); - FreeWideString(urlW); - FreeWideString(pathW); - } + len = INTERNET_MAX_URL_LENGTH; + pathW = GetWideString(TEST_URLFROMPATH[i].path); + urlW = GetWideString(TEST_URLFROMPATH[i].url); + ret = UrlCreateFromPathW(pathW, ret_urlW, &len, 0); + WideCharToMultiByte(CP_ACP, 0, ret_urlW, -1, ret_url, sizeof(ret_url),0,0); + ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path L\"%s\", expected %08x\n", + ret, TEST_URLFROMPATH[i].path, TEST_URLFROMPATH[i].ret); + ok(!lstrcmpiW(ret_urlW, urlW), "got %s expected %s from path L\"%s\"\n", + ret_url, TEST_URLFROMPATH[i].url, TEST_URLFROMPATH[i].path); + ok(len == lstrlenW(ret_urlW), "ret len %d from path L\"%s\"\n", len, TEST_URLFROMPATH[i].path); + FreeWideString(urlW); + FreeWideString(pathW); } } @@ -1354,9 +1271,9 @@ static void test_UrlCreateFromPath(void) static void test_UrlIs_null(DWORD flag) { BOOL ret; - ret = pUrlIsA(NULL, flag); + ret = UrlIsA(NULL, flag); ok(ret == FALSE, "pUrlIsA(NULL, %d) failed\n", flag); - ret = pUrlIsW(NULL, flag); + ret = UrlIsW(NULL, flag); ok(ret == FALSE, "pUrlIsW(NULL, %d) failed\n", flag); } @@ -1366,11 +1283,6 @@ static void test_UrlIs(void) size_t i; WCHAR wurl[80]; - if (!pUrlIsA) { - win_skip("UrlIsA not found\n"); - return; - } - test_UrlIs_null(URLIS_APPLIABLE); test_UrlIs_null(URLIS_DIRECTORY); test_UrlIs_null(URLIS_FILEURL); @@ -1382,40 +1294,36 @@ static void test_UrlIs(void) for (i = 0; i < ARRAY_SIZE(TEST_PATH_IS_URL); i++) { MultiByteToWideChar(CP_ACP, 0, TEST_PATH_IS_URL[i].path, -1, wurl, ARRAY_SIZE(wurl)); - ret = pUrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); + ret = UrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); ok( ret == TEST_PATH_IS_URL[i].expect, "returned %d from path %s, expected %d\n", ret, TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); - if (pUrlIsW) { - ret = pUrlIsW( wurl, URLIS_URL ); - ok( ret == TEST_PATH_IS_URL[i].expect, - "returned %d from path (UrlIsW) %s, expected %d\n", ret, - TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); - } + ret = UrlIsW( wurl, URLIS_URL ); + ok( ret == TEST_PATH_IS_URL[i].expect, + "returned %d from path (UrlIsW) %s, expected %d\n", ret, + TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); } for (i = 0; i < ARRAY_SIZE(TEST_URLIS_ATTRIBS); i++) { MultiByteToWideChar(CP_ACP, 0, TEST_URLIS_ATTRIBS[i].url, -1, wurl, ARRAY_SIZE(wurl)); - ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); + ret = UrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, "returned %d for URLIS_OPAQUE, url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); - ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_FILEURL); + ret = UrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_FILEURL); ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, "returned %d for URLIS_FILEURL, url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); - if (pUrlIsW) { - ret = pUrlIsW( wurl, URLIS_OPAQUE); - ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, - "returned %d for URLIS_OPAQUE (UrlIsW), url \"%s\", expected %d\n", - ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); - ret = pUrlIsW( wurl, URLIS_FILEURL); - ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, - "returned %d for URLIS_FILEURL (UrlIsW), url \"%s\", expected %d\n", - ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); - } + ret = UrlIsW( wurl, URLIS_OPAQUE); + ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, + "returned %d for URLIS_OPAQUE (UrlIsW), url \"%s\", expected %d\n", + ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); + ret = UrlIsW( wurl, URLIS_FILEURL); + ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, + "returned %d for URLIS_FILEURL (UrlIsW), url \"%s\", expected %d\n", + ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); } } @@ -1436,13 +1344,9 @@ static void test_UrlUnescape(void) 'C',':','/','P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; HRESULT res; - if (!pUrlUnescapeA) { - win_skip("UrlUnescapeA not found\n"); - return; - } for (i = 0; i < ARRAY_SIZE(TEST_URL_UNESCAPE); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; - res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0); + res = UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK) for \"%s\"\n", res, TEST_URL_UNESCAPE[i].url); @@ -1450,53 +1354,49 @@ static void test_UrlUnescape(void) ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); /* if we set the buffer pointer to NULL here, UrlUnescape fails and the string is not converted */ - res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); + res = UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); ok(res == E_INVALIDARG, "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", res, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); - if (pUrlUnescapeW) { - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(TEST_URL_UNESCAPE[i].url); - expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); - res = pUrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); - ok(res == S_OK, - "UrlUnescapeW returned 0x%x (expected S_OK) for \"%s\"\n", - res, TEST_URL_UNESCAPE[i].url); + dwEscaped = INTERNET_MAX_URL_LENGTH; + urlW = GetWideString(TEST_URL_UNESCAPE[i].url); + expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); + res = UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); + ok(res == S_OK, + "UrlUnescapeW returned 0x%x (expected S_OK) for \"%s\"\n", + res, TEST_URL_UNESCAPE[i].url); - WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); - ok(lstrcmpW(ret_urlW, expected_urlW)==0, - "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", - TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); - FreeWideString(urlW); - FreeWideString(expected_urlW); - } + WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); + ok(lstrcmpW(ret_urlW, expected_urlW)==0, + "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", + TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); + FreeWideString(urlW); + FreeWideString(expected_urlW); } dwEscaped = sizeof(inplace); - res = pUrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); + res = UrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ - res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); + res = UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); - if (pUrlUnescapeW) { - dwEscaped = sizeof(inplaceW); - res = pUrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); - ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); + dwEscaped = sizeof(inplaceW); + res = UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); + ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ - res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ + res = UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); - ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); - } + ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); } static const struct parse_url_test_t { @@ -1534,7 +1434,7 @@ static void test_ParseURL(void) for (test = parse_url_tests; test < parse_url_tests + ARRAY_SIZE(parse_url_tests); test++) { memset(&parseda, 0xd0, sizeof(parseda)); parseda.cbSize = sizeof(parseda); - hres = pParseURLA(test->url, &parseda); + hres = ParseURLA(test->url, &parseda); ok(hres == test->hres, "ParseURL failed: %08x, expected %08x\n", hres, test->hres); if(hres == S_OK) { ok(parseda.pszProtocol == test->url, "parseda.pszProtocol = %s, expected %s\n", @@ -1557,7 +1457,7 @@ static void test_ParseURL(void) memset(&parsedw, 0xd0, sizeof(parsedw)); parsedw.cbSize = sizeof(parsedw); - hres = pParseURLW(url, &parsedw); + hres = ParseURLW(url, &parsedw); ok(hres == test->hres, "ParseURL failed: %08x, expected %08x\n", hres, test->hres); if(hres == S_OK) { ok(parsedw.pszProtocol == url, "parsedw.pszProtocol = %s, expected %s\n", @@ -1598,36 +1498,36 @@ static void test_HashData(void) int i; /* Test hashing with identically sized input/output buffers. */ - res = pHashData(input, 16, output, 16); + res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected, sizeof(expected)), "Output buffer did not match expected contents\n"); /* Test hashing with larger output buffer. */ - res = pHashData(input, 16, output, 32); + res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected2, sizeof(expected2)), "Output buffer did not match expected contents\n"); /* Test hashing with smaller input buffer. */ - res = pHashData(input, 8, output, 16); + res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected3, sizeof(expected3)), "Output buffer did not match expected contents\n"); /* Test passing NULL pointers for input/output parameters. */ - res = pHashData(NULL, 0, NULL, 0); + res = HashData(NULL, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = pHashData(input, 0, NULL, 0); + res = HashData(input, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = pHashData(NULL, 0, output, 0); + res = HashData(NULL, 0, output, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); @@ -1638,7 +1538,7 @@ static void test_HashData(void) for (i = 0; i < ARRAY_SIZE(output); i++) output[i] = 0xFF; - res = pHashData(input, 0, output, 0); + res = HashData(input, 0, output, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); /* The buffers should be unchanged. */ @@ -1655,12 +1555,12 @@ static void test_HashData(void) } /* Input/output parameters are not validated. */ - res = pHashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); + res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if (0) { - res = pHashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); + res = HashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); trace("HashData returned 0x%08x\n", res); } } @@ -1669,39 +1569,6 @@ static void test_HashData(void) START_TEST(url) { - char *pFunc; - - hShlwapi = GetModuleHandleA("shlwapi.dll"); - - /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ - pFunc = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); - if(!pFunc){ - win_skip("Too old shlwapi version\n"); - return; - } - - pUrlUnescapeA = (void *) GetProcAddress(hShlwapi, "UrlUnescapeA"); - pUrlUnescapeW = (void *) GetProcAddress(hShlwapi, "UrlUnescapeW"); - pUrlIsA = (void *) GetProcAddress(hShlwapi, "UrlIsA"); - pUrlIsW = (void *) GetProcAddress(hShlwapi, "UrlIsW"); - pUrlHashA = (void *) GetProcAddress(hShlwapi, "UrlHashA"); - pUrlHashW = (void *) GetProcAddress(hShlwapi, "UrlHashW"); - pUrlGetPartA = (void *) GetProcAddress(hShlwapi, "UrlGetPartA"); - pUrlGetPartW = (void *) GetProcAddress(hShlwapi, "UrlGetPartW"); - pUrlEscapeA = (void *) GetProcAddress(hShlwapi, "UrlEscapeA"); - pUrlEscapeW = (void *) GetProcAddress(hShlwapi, "UrlEscapeW"); - pUrlCreateFromPathA = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathA"); - pUrlCreateFromPathW = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathW"); - pUrlCombineA = (void *) GetProcAddress(hShlwapi, "UrlCombineA"); - pUrlCombineW = (void *) GetProcAddress(hShlwapi, "UrlCombineW"); - pUrlCanonicalizeA = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeA"); - pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); - pUrlApplySchemeA = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeA"); - pUrlApplySchemeW = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeW"); - pParseURLA = (void*)GetProcAddress(hShlwapi, (LPCSTR)1); - pParseURLW = (void*)GetProcAddress(hShlwapi, (LPCSTR)2); - pHashData = (void*)GetProcAddress(hShlwapi, "HashData"); - test_UrlApplyScheme(); test_UrlHash(); test_UrlGetPart(); -- 2.34.1

1 4

[PATCH] setupapi: Avoid race conditions with devnode_table.
by Brendan Shanks 08 Feb '22

08 Feb '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Fixes a crash where two threads calling SetupDiGetClassDevs() would end up in alloc_devnode() at the same time. One thread would start iterating through the table after devnode_table_size was set but before devnode_table was allocated, and crash. dlls/setupapi/devinst.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ecc0b58ca5c..f3ae4fdb1da 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -233,11 +233,21 @@ static inline void copy_device_iface_data(SP_DEVICE_INTERFACE_DATA *data, static struct device **devnode_table; static unsigned int devnode_table_size; +static CRITICAL_SECTION devnode_table_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &devnode_table_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": devnode_table_cs") } +}; +static CRITICAL_SECTION devnode_table_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static DEVINST alloc_devnode(struct device *device) { unsigned int i; + EnterCriticalSection(&devnode_table_cs); + for (i = 0; i < devnode_table_size; ++i) { if (!devnode_table[i]) @@ -260,21 +270,33 @@ static DEVINST alloc_devnode(struct device *device) } devnode_table[i] = device; + + LeaveCriticalSection(&devnode_table_cs); + return i; } static void free_devnode(DEVINST devnode) { + EnterCriticalSection(&devnode_table_cs); devnode_table[devnode] = NULL; + LeaveCriticalSection(&devnode_table_cs); } static struct device *get_devnode_device(DEVINST devnode) { + struct device *device = NULL; + + EnterCriticalSection(&devnode_table_cs); + if (devnode < devnode_table_size) - return devnode_table[devnode]; + device = devnode_table[devnode]; + else + WARN("device node %u not found\n", devnode); - WARN("device node %u not found\n", devnode); - return NULL; + LeaveCriticalSection(&devnode_table_cs); + + return device; } static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) -- 2.32.0 (Apple Git-132)

2 2

[tools 1/3] testbot/SetWinLocale: Better detect when Windows has rebooted.
by Francois Gouget 08 Feb '22

08 Feb '22

This no longer relies on a long pause to give time for Windows to start rebooting and should detect when TestAgentd is ready again faster. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2324a5cb16..dc551853af 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -902,18 +902,19 @@ if ($OptReboot) { my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); + my $OldCount = $TA->GetProperties("start.count"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows - # Wait a bit to make sure we don't reconnect before Windows has rebooted. - sleep(30); - - Debug(Elapsed($Start), " Waiting for Windows to boot\n"); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot); - if (!$TA->Ping()) + my ($OneTimeout, $MinAttempts, $MinTimeout) = $TA->SetConnectTimeout(3, 1, 3); + while (1) { - FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); + my $NewCount = $TA->GetProperties("start.count"); + next if (!defined $NewCount); # Rebooting (TestAgentd is not running) + last if ($NewCount != $OldCount); # start.count got incremented + sleep(10); # Not rebooting yet } + $TA->SetConnectTimeout($OneTimeout, $MinAttempts, $MinTimeout); # Skip this check on pre-Windows 10 versions, i.e. those that don't have # 'CountryName' and if the settings were not changed in the first place. -- 2.30.2

1 2

[tools] testbot/LibvirtTool: Revert() does not need its own VM object.
by Francois Gouget 08 Feb '22

08 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 7a865499c2..b6b1fad581 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -447,9 +447,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$$$) +sub SetupTestAgentd($$$) { - my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; + my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -572,7 +572,6 @@ sub CreateSnapshot($$) sub Revert() { - my $VM = CreateVMs()->GetItem($VMKey); if (!$Debug and $VM->Status ne "reverting") { Error("The VM is not ready to be reverted (". $VM->Status .")\n"); @@ -648,7 +647,7 @@ sub Revert() # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); if ($CreateSnapshot) { -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Include the VM name in error messages.
by Francois Gouget 08 Feb '22

08 Feb '22

Multiple VMs may be reverted at the same time (either on the same VM host or on separate hosts) so this is needed to know which VM the error is about. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index b6b1fad581..681223f11c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -132,7 +132,7 @@ if (!defined $Usage) $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { - Error "VM $VMKey does not exist\n"; + Error "The $VMKey VM does not exist\n"; $Usage = 2; } } @@ -301,7 +301,7 @@ sub ShutDown() my $PTA = GetPrivilegedTA($VM->GetAgent()); if (!$PTA->Run($Cmd, 0)) { - Error "Could not run @$Cmd: ". $PTA->GetLastError() ."\n"; + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; $Success = 0; } else @@ -469,14 +469,14 @@ sub SetupTestAgentd($$$) LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) { - FatalError("Unsupported TestAgent server version: $Version\n"); + FatalError("Unsupported TestAgent server version on $VMKey: $Version\n"); } # We want 'TestAgentd --detach --show-restarts' on Windows but this was # not supported before this version and changing how the server is started # is too complex. if (!$TA->HasMinVersion(1, 7)) { - FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + FatalError("The $VMKey TestAgent server is too old to be upgraded: $Version\n"); } if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) @@ -506,10 +506,10 @@ sub SetupTestAgentd($$$) # HTTPS certificates), but also for the build (if the time moves forward # during the build some ccache versions will return a compilation error). my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the VM system time\n") if (!$PTA); + FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); if (!$PTA->SetTime()) { - FatalError("Setting the VM system time failed: ". $PTA->GetLastError() ."\n"); + FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } if ($Booting and $VM->Type eq "wine") @@ -518,16 +518,16 @@ sub SetupTestAgentd($$$) Debug(Elapsed($Start), " Waiting for the X session\n"); LogMsg "Waiting for the $VMKey X session\n"; my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); if (!defined $TA->Wait($Pid, $SleepAfterBoot)) { my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - FatalError("Timed out waiting for the X session\n"); + FatalError("Timed out waiting for the $VMKey X session\n"); } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); } } @@ -544,7 +544,7 @@ sub SetupTestAgentd($$$) my $Count = $TA->GetProperties("start.count"); if (defined $Count and $Count > 1) { - FatalError("The VM has been rebooted too many times: start.count=$Count > 1"); + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); } } $PTA->Disconnect(); @@ -574,7 +574,7 @@ sub Revert() { if (!$Debug and $VM->Status ne "reverting") { - Error("The VM is not ready to be reverted (". $VM->Status .")\n"); + Error("$VMKey is not ready to be reverted (". $VM->Status .")\n"); return 1; } $CurrentStatus = "reverting"; -- 2.30.2

1 0

[tools] testbot/TestAgent: The maximum alarm() value is signed.
by Francois Gouget 08 Feb '22

08 Feb '22

And still 32-bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index fea7e650e1..b395cf2d26 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -267,8 +267,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - # alarm() has a 32-bit limit, even on 64-bit systems - alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); + # alarm() has a signed 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0x7fffffff ? $Timeout : 0x7fffffff); } } -- 2.30.2

1 0

[PATCH] dmime/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 08 Feb '22

08 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/Makefile.in | 1 - dlls/dmime/tests/dmime.c | 316 ++++++++++++++++----------------- dlls/dmime/tests/performance.c | 241 +++++++++++++------------ 3 files changed, 274 insertions(+), 284 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index f2c93bb1a68..f4c47038e54 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmime.dll IMPORTS = user32 ole32 dsound diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 99295f391bd..8f2bf6f2812 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -57,8 +57,7 @@ static void test_COM_audiopath(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), - "DirectMusicPerformance create failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "DirectMusicPerformance create failed: %#lx\n", hr); if (!performance) { win_skip("IDirectMusicPerformance8 not available\n"); return; @@ -67,67 +66,67 @@ static void test_COM_audiopath(void) DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED), /* Win 10 testbot */ - "DirectMusicPerformance_InitAudio failed: %08x\n", hr); + "DirectMusicPerformance_InitAudio failed: %#lx\n", hr); if (FAILED(hr)) { skip("Audio failed to initialize\n"); return; } hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); - ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %#lx\n", hr); /* IDirectMusicObject and IPersistStream are not supported */ hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IDirectMusicObject, (void**)&unk); - todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%08x, iface=%p\n", + todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%#lx, iface=%p\n", hr, unk); if (unk) IUnknown_Release(unk); hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IPersistStream, (void**)&unk); - todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%08x, iface=%p\n", + todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%#lx, iface=%p\n", hr, unk); if (unk) IUnknown_Release(unk); /* Same refcount for all DirectMusicAudioPath interfaces */ refcount = IDirectMusicAudioPath_AddRef(dmap); - ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + ok(refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicAudioPath_QueryInterface(dmap, &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); ok(unk == (IUnknown*)dmap, "got %p, %p\n", unk, dmap); 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 = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundBuffer, (void**)&dsound); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IDirectSoundBuffer_Release(dsound); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IDirectSoundBuffer8_Release(dsound8); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundNotify, (void**)&notify); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IKsPropertySet, (void**)&propset); - todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); if (propset) IKsPropertySet_Release(propset); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IUnknown_Release(unk); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &GUID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); @@ -151,44 +150,44 @@ static void test_COM_audiopathconfig(void) return; } ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicAudioPathConfig create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicAudioPathConfig create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmap, "dmap = %p\n", dmap); /* IDirectMusicAudioPath not supported */ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicAudioPath, (void**)&dmap); todo_wine ok(FAILED(hr) && !dmap, - "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap); /* IDirectMusicObject and IPersistStream supported */ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicObject create failed: %#lx, expected S_OK\n", hr); IPersistStream_Release(ps); hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicObject create failed: %#lx, expected S_OK\n", hr); /* Same refcount for all DirectMusicObject interfaces */ 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); /* IDirectMusicAudioPath still not supported */ hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicAudioPath, (void**)&dmap); todo_wine ok(FAILED(hr) && !dmap, - "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap); while (IDirectMusicObject_Release(dmo)); } @@ -207,41 +206,41 @@ static void test_COM_graph(void) hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmg); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicGraph create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmg, "dmg = %p\n", dmg); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmg); - ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicGraph interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicGraph, (void**)&dmg); - ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicGraph create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicGraph_AddRef(dmg); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IDirectMusicObject, (void**)&dmo); if (hr == E_NOINTERFACE) { win_skip("DirectMusicGraph without IDirectMusicObject\n"); return; } - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicGraph_QueryInterface(dmg, &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 == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicGraph_QueryInterface(dmg, &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 == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicGraph_Release(dmg)); @@ -260,14 +259,13 @@ static void test_COM_segment(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dms); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSegment create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dms, "dms = %p\n", dms); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dms); - ok(hr == E_NOINTERFACE, - "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicSegment create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount */ hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, @@ -276,28 +274,28 @@ static void test_COM_segment(void) win_skip("DirectMusicSegment without IDirectMusicSegment8\n"); return; } - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicSegment8_AddRef(dms); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); IDirectMusicSegment8_AddRef(dms); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); - 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 = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &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_Release(unk); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicObject_Release(dmo); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IPersistStream_Release(stream); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + ok (refcount == 1, "refcount == %lu, expected 1\n", refcount); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); + ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } static void test_COM_segmentstate(void) @@ -311,14 +309,13 @@ static void test_COM_segmentstate(void) hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmss8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSegmentState8 create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmss8, "dmss8 = %p\n", dmss8); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmss8); - ok(hr == E_NOINTERFACE, - "DirectMusicSegmentState8 create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicSegmentState8 create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicSegmentState interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, @@ -327,18 +324,18 @@ static void test_COM_segmentstate(void) win_skip("DirectMusicSegmentState without IDirectMusicSegmentState8\n"); return; } - ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicSegmentState8_AddRef(dmss8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &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 == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got %08x\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); while (IDirectMusicSegmentState8_Release(dmss8)); } @@ -381,44 +378,43 @@ static void test_COM_track(void) continue; } ok(hr == CLASS_E_NOAGGREGATION, - "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + "%s create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); ok(!dmt8, "dmt8 = %p\n", dmt8); /* Invalid RIID */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt8); - ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", - class[i].name, hr); + ok(hr == E_NOINTERFACE, "%s create failed: %#lx, expected E_NOINTERFACE\n", class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmt, &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 = IDirectMusicTrack_QueryInterface(dmt, &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 = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); if (class[i].has_dmt8) { - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %#lx\n", hr); refcount = IDirectMusicTrack8_AddRef(dmt8); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IDirectMusicTrack8_Release(dmt8); } else { - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %#lx\n", hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); } while (IDirectMusicTrack_Release(dmt)); @@ -439,23 +435,23 @@ static void test_audiopathconfig(void) win_skip("DirectMusicAudioPathConfig not registered\n"); return; } - ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicAudioPathConfig 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_DirectMusicAudioPathConfig), "Expected class CLSID_DirectMusicAudioPathConfig 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)); } @@ -470,24 +466,24 @@ static void test_graph(void) hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicGraph, (void**)&dmg); - ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicGraph create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicGraph_QueryInterface(dmg, &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 || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %#lx\n", hr); if (hr == S_OK) ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), "Expected class CLSID_DirectMusicGraph 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 (IDirectMusicGraph_Release(dmg)); } @@ -502,24 +498,24 @@ static void test_segment(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment, (void**)&dms); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicSegment_QueryInterface(dms, &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 || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %#lx\n", hr); if (hr == S_OK) ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), "Expected class CLSID_DirectMusicSegment 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 (IDirectMusicSegment_Release(dms)); } @@ -531,12 +527,12 @@ static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *na hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&track); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", name, hr); hr = IDirectMusicSegment8_InsertTrack(seg, track, group); if (group) - ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + ok(hr == S_OK, "Inserting %s failed: %#lx, expected S_OK\n", name, hr); else - ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + ok(hr == E_INVALIDARG, "Inserting %s failed: %#lx, expected E_INVALIDARG\n", name, hr); IDirectMusicTrack_Release(track); } @@ -555,16 +551,16 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char else hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); return; } - ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicTrack_QueryInterface(track, &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(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", group, index, name, wine_dbgstr_guid(&class)); IPersistStream_Release(ps); @@ -584,7 +580,7 @@ static void test_gettrack(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment8, (void**)&seg); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); add_track(seg, LyricsTrack, 0x0); /* failure */ add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ @@ -596,7 +592,7 @@ static void test_gettrack(void) /* Ignore GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); expect_track(seg, LyricsTrack, 0x1, 0); expect_track(seg, ParamControlTrack, 0x1, 1); @@ -615,7 +611,7 @@ static void test_gettrack(void) /* Use the GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track); - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); expect_guid_track(seg, LyricsTrack, 0x1, 0); expect_guid_track(seg, ParamControlTrack, 0x1, 0); @@ -638,35 +634,32 @@ static void test_segment_param(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment8, (void **)&seg); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); add_track(seg, LyricsTrack, 0x1); /* no params */ add_track(seg, SegmentTriggerTrack, 0x1); /* all params "supported" */ hr = IDirectMusicSegment8_GetParam(seg, NULL, 0x1, 0, 0, NULL, buf); - ok(hr == E_POINTER, "GetParam failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "GetParam failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicSegment8_SetParam(seg, NULL, 0x1, 0, 0, buf); - todo_wine ok(hr == E_POINTER, "SetParam failed: %08x, expected E_POINTER\n", hr); + todo_wine ok(hr == E_POINTER, "SetParam failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, NULL, buf); - ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, NULL, buf); - ok(hr == DMUS_E_TRACK_NOT_FOUND, - "GetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + ok(hr == DMUS_E_TRACK_NOT_FOUND, "GetParam failed: %#lx, expected DMUS_E_TRACK_NOT_FOUND\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ANYTRACK, 0, NULL, buf); - ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, buf); - ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, buf); todo_wine ok(hr == DMUS_E_TRACK_NOT_FOUND, - "SetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + "SetParam failed: %#lx, expected DMUS_E_TRACK_NOT_FOUND\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ALLTRACKS, 0, buf); - ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); IDirectMusicSegment8_Release(seg); } @@ -678,7 +671,7 @@ static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char * char buf[64] = { 0 }; hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); - ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "GetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char *name, @@ -688,7 +681,7 @@ static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char * char buf[64] = { 0 }; hr = IDirectMusicTrack8_SetParam(track, type, 0, buf); - ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "SetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void test_track(void) @@ -760,14 +753,14 @@ static void test_track(void) trace("Testing %s\n", class[i].name); hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ if (class[i].has_params != ~0) { for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); if (class[i].has_params & (1 << j)) { - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[j].name, hr); if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) { expect_getparam(dmt, param_types[j].type, param_types[j].name, @@ -781,7 +774,7 @@ static void test_track(void) DMUS_E_GET_UNSUPPORTED); } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); @@ -810,61 +803,61 @@ static void test_track(void) } } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %#lx\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - ok(hr == E_NOTIMPL, "got: %08x\n", hr); + ok(hr == E_NOTIMPL, "got: %#lx\n", hr); } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack_RemoveNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %#lx\n", hr); } hr = IDirectMusicTrack_Clone(dmt, 0, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %#lx\n", hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); if (class[i].clsid == &CLSID_DirectMusicTempoTrack) - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); else - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); IDirectMusicTrack8_Release(dmt8); } /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &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, &classid); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&classid, class[i].clsid), "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); /* Unimplemented IPersistStream methods */ 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 (IDirectMusicTrack_Release(dmt)); } @@ -995,7 +988,7 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(forms[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); if (hr != S_OK) { - win_skip("Could not create %s object: %08x\n", forms[i].class, hr); + win_skip("Could not create %s object: %#lx\n", forms[i].class, hr); return; } @@ -1003,13 +996,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); if (forms[i].needs_size) { - todo_wine ok(hr == E_INVALIDARG, - "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); } - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); @@ -1020,12 +1012,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) { - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); desc.dwSize = 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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); @@ -1034,14 +1026,14 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = 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); if (forms[i].needs_size) - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); else - 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, NULL, 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); IStream_Release(stream); /* Wrong form */ @@ -1052,10 +1044,10 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); else - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == E_FAIL, "ParseDescriptor failed: %#lx, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* Not a RIFF stream */ @@ -1065,10 +1057,10 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); else - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == E_FAIL, "ParseDescriptor failed: %#lx, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* All desc chunks */ @@ -1077,17 +1069,17 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = 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); valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; if (forms[i].form != mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); 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); if (forms[i].form != mmioFOURCC('W','A','V','E')) ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", @@ -1100,8 +1092,8 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); IStream_Release(stream); /* UNFO list with INAM */ @@ -1111,8 +1103,8 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = 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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -1122,11 +1114,11 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = 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); valid = DMUS_OBJ_CLASS; if (forms[i].form == mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index d09d0120023..100d8e40be0 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -38,18 +38,18 @@ static void create_performance(IDirectMusicPerformance8 **performance, IDirectMu hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)performance); - ok(hr == S_OK, "DirectMusicPerformance create failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusicPerformance create failed: %#lx\n", hr); if (dmusic) { hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)dmusic); - ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusic create failed: %#lx\n", hr); } if (dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); if (set_cooplevel) { hr = IDirectSound_SetCooperativeLevel(*dsound, GetForegroundWindow(), DSSCL_PRIORITY); - ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr); } } } @@ -60,7 +60,7 @@ static void destroy_performance(IDirectMusicPerformance8 *performance, IDirectMu HRESULT hr; hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + ok(hr == S_OK, "CloseDown failed: %#lx\n", hr); IDirectMusicPerformance8_Release(performance); if (dmusic) IDirectMusic_Release(dmusic); @@ -89,7 +89,7 @@ static HRESULT test_InitAudio(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)&performance); if (hr != S_OK) { - skip("Cannot create DirectMusicPerformance object (%x)\n", hr); + skip("Cannot create DirectMusicPerformance object (%lx)\n", hr); CoUninitialize(); return hr; } @@ -103,36 +103,36 @@ static HRESULT test_InitAudio(void) } hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); IDirectMusicPort_Release(port); port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%#lx)\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%#lx)\n", hr); IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); - ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); + ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%lx)\n", hr); if (hr == S_OK) IDirectMusicAudioPath_Release(path); hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); + ok(hr == S_OK, "Failed to call CloseDown (%lx)\n", hr); IDirectMusicPerformance8_Release(performance); /* Auto generated dmusic and dsound */ create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -140,93 +140,93 @@ static HRESULT test_InitAudio(void) dmusic = NULL; dsound = NULL; hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %ld expected 3\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, NULL, NULL); /* dsound without SetCooperativeLevel() */ create_performance(&performance, NULL, &dsound, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %08x\n", hr); + todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Using the wrong CLSID_DirectSound */ create_performance(&performance, NULL, NULL, FALSE); hr = DirectSoundCreate(NULL, &dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %08x\n", hr); + todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Init() works with just a CLSID_DirectSound */ create_performance(&performance, NULL, NULL, FALSE); hr = DirectSoundCreate(NULL, &dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY); - ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Init() followed by InitAudio() */ create_performance(&performance, NULL, &dsound, TRUE); hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %08x\n", hr); + ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Provided dmusic and dsound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* Provided dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); - ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* Provided dmusic and dsound, dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); - ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %ld expected 3\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* InitAudio with perf channel count not a multiple of 16 rounds up */ create_performance(&performance, NULL, NULL, TRUE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); ok(hr == S_OK && group == 2 && channel == 15, - "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); + "PChannelInfo failed, got %#lx, %lu, %lu\n", hr, group, channel); hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); destroy_performance(performance, NULL, NULL); return S_OK; @@ -244,10 +244,10 @@ static void test_createport(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(perf, &music, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); i = 0; @@ -255,21 +255,21 @@ static void test_createport(void) portcaps.dwSize = sizeof(portcaps); hr = IDirectMusic_EnumPort(music, i, &portcaps); - ok(hr == S_OK || hr == S_FALSE || (i == 0 && hr == E_INVALIDARG), "EnumPort failed: %08x\n", hr); + ok(hr == S_OK || hr == S_FALSE || (i == 0 && hr == E_INVALIDARG), "EnumPort failed: %#lx\n", hr); if(hr != S_OK) break; - ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %08x\n", portcaps.dwSize); - trace("portcaps(%u).dwFlags: %08x\n", i, portcaps.dwFlags); - trace("portcaps(%u).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); - trace("portcaps(%u).dwClass: %08x\n", i, portcaps.dwClass); - trace("portcaps(%u).dwType: %08x\n", i, portcaps.dwType); - trace("portcaps(%u).dwMemorySize: %08x\n", i, portcaps.dwMemorySize); - trace("portcaps(%u).dwMaxChannelGroups: %08x\n", i, portcaps.dwMaxChannelGroups); - trace("portcaps(%u).dwMaxVoices: %08x\n", i, portcaps.dwMaxVoices); - trace("portcaps(%u).dwMaxAudioChannels: %08x\n", i, portcaps.dwMaxAudioChannels); - trace("portcaps(%u).dwEffectFlags: %08x\n", i, portcaps.dwEffectFlags); - trace("portcaps(%u).wszDescription: %s\n", i, wine_dbgstr_w(portcaps.wszDescription)); + ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %lu\n", portcaps.dwSize); + trace("portcaps(%lu).dwFlags: %#lx\n", i, portcaps.dwFlags); + trace("portcaps(%lu).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); + trace("portcaps(%lu).dwClass: %#lx\n", i, portcaps.dwClass); + trace("portcaps(%lu).dwType: %#lx\n", i, portcaps.dwType); + trace("portcaps(%lu).dwMemorySize: %#lx\n", i, portcaps.dwMemorySize); + trace("portcaps(%lu).dwMaxChannelGroups: %lu\n", i, portcaps.dwMaxChannelGroups); + trace("portcaps(%lu).dwMaxVoices: %lu\n", i, portcaps.dwMaxVoices); + trace("portcaps(%lu).dwMaxAudioChannels: %lu\n", i, portcaps.dwMaxAudioChannels); + trace("portcaps(%lu).dwEffectFlags: %#lx\n", i, portcaps.dwEffectFlags); + trace("portcaps(%lu).wszDescription: %s\n", i, wine_dbgstr_w(portcaps.wszDescription)); ++i; } @@ -284,7 +284,7 @@ static void test_createport(void) /* dwValidParams == 0 -> S_OK, filled struct */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -294,7 +294,7 @@ static void test_createport(void) portparams.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS; portparams.dwChannelGroups = 0; hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - todo_wine ok(hr == S_FALSE, "CreatePort failed: %08x\n", hr); + todo_wine ok(hr == S_FALSE, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -302,7 +302,7 @@ static void test_createport(void) /* dwValidParams != 0, valid params -> S_OK */ hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); IDirectMusicPort_Release(port); port = NULL; @@ -310,7 +310,7 @@ static void test_createport(void) /* GUID_NULL succeeds */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -319,19 +319,19 @@ static void test_createport(void) /* null GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, NULL, &portparams, &port, NULL); - ok(hr == E_POINTER, "CreatePort failed: %08x\n", hr); + ok(hr == E_POINTER, "CreatePort failed: %#lx\n", hr); ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); /* garbage GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &GUID_Bunk, &portparams, &port, NULL); - ok(hr == E_NOINTERFACE, "CreatePort failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "CreatePort failed: %#lx\n", hr); ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); hr = IDirectMusicPerformance8_CloseDown(perf); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + ok(hr == S_OK, "CloseDown failed: %#lx\n", hr); IDirectMusic_Release(music); IDirectMusicPerformance_Release(perf); @@ -347,99 +347,99 @@ static void test_pchannel(void) create_performance(&perf, NULL, NULL, TRUE); hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %#lx, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); - ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + ok(hr == S_OK, "AddPort of default port failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == S_OK && port, "PChannelInfo failed, got %#lx, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port == port2 && group == 1 && channel == i, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx, %p\n", hr, port); /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); - ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port == port2 && group == 0 && channel == i, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Last PChannel Block can be set only individually but not read */ hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); port2 = (IDirectMusicPort *)0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, - "PChannelInfo failed, got %08x, %p\n", hr, port2); + "PChannelInfo failed, got %#lx, %p\n", hr, port2); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); - ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); - todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 15; i < MAXDWORD; i++) { hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, - "PChannelInfo failed, got %08x, %p\n", hr, port2); + "PChannelInfo failed, got %#lx, %p\n", hr, port2); } /* Second to last PChannel Block can be set only individually and read */ hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); - todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 1 && channel == 7, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Third to last PChannel Block behaves normal */ hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); - ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* One PChannel set in a Block, rest is initialized too */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 1 && channel == 13, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == 8, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == 15, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); IDirectMusicPort_Release(port); @@ -458,36 +458,35 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmp); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicPerformance create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmp, "dmp = %p\n", dmp); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmp); - ok(hr == E_NOINTERFACE, - "DirectMusicPerformance create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicPerformance create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance, (void**)&dmp); - ok(hr == S_OK, "DirectMusicPerformance create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicPerformance create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicPerformance_AddRef(dmp); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance2, (void**)&dmp2); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %#lx\n", hr); IDirectMusicPerformance_AddRef(dmp); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance8, (void**)&dmp8); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %#lx\n", hr); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicPerformance8_Release(dmp8); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IDirectMusicPerformance_Release(dmp2); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + ok (refcount == 1, "refcount == %lu, expected 1\n", refcount); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); + ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } static void test_notification_type(void) @@ -513,25 +512,25 @@ static void test_notification_type(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); messages = CreateEventA( NULL, FALSE, FALSE, NULL ); hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); desc.dwSize = sizeof(DMUS_OBJECTDESC); @@ -540,31 +539,31 @@ static void test_notification_type(void) desc.pbMemData = rifffile; desc.llMemLength = sizeof(rifffile); hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); - ok(hr == S_OK, "Download failed: %08x\n", hr); + ok(hr == S_OK, "Download failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); - ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(hr == S_OK, "PlaySegmentEx failed: %#lx\n", hr); ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); while (!found_end) { result = WaitForSingleObject(messages, 500); - todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %ld\n", result); if (result != WAIT_OBJECT_0) break; msg = NULL; hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(msg != NULL, "Unexpected NULL pointer\n"); if (FAILED(hr) || !msg) break; - trace("Notification: %d\n", msg->dwNotificationOption); + trace("Notification: %ld\n", msg->dwNotificationOption); if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND || msg->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) { @@ -574,17 +573,17 @@ static void test_notification_type(void) IDirectMusicSegment *segment; hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); if (FAILED(hr)) { IDirectMusicSegmentState8_Release(segmentstate); break; } hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); found_end = TRUE; @@ -618,17 +617,17 @@ static void test_performance_graph(void) create_performance(&perf, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetGraph(perf, NULL); - ok(hr == E_POINTER, "Failed: %08x\n", hr); + ok(hr == E_POINTER, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetGraph(perf, &graph2); - ok(hr == DMUS_E_NOT_FOUND, "Failed: %08x\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "Failed: %#lx\n", hr); ok(graph2 == NULL, "unexpected pointer.\n"); hr = IDirectMusicPerformance8_QueryInterface(perf, &IID_IDirectMusicGraph, (void**)&graph); - todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); if (graph) IDirectMusicGraph_Release(graph); @@ -641,13 +640,13 @@ START_TEST( performance ) hr = CoInitialize(NULL); if (FAILED(hr)) { - skip("Cannot initialize COM (%x)\n", hr); + skip("Cannot initialize COM (%lx)\n", hr); return; } hr = test_InitAudio(); if (hr != S_OK) { - skip("InitAudio failed (%x)\n", hr); + skip("InitAudio failed (%lx)\n", hr); return; } -- 2.34.1

2 1

[PATCH] dmband: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 08 Feb '22

08 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/Makefile.in | 1 - dlls/dmband/band.c | 44 ++++++++++++++++++------------------ dlls/dmband/bandtrack.c | 50 ++++++++++++++++++++--------------------- dlls/dmband/dmobject.c | 20 ++++++++--------- dlls/dmband/dmutils.c | 6 ++--- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 36488c03b99..6fa1502f6b0 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmband.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 6f990afaf7f..1910e53d187 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -69,7 +69,7 @@ static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(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); @@ -213,30 +213,30 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { - ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + ERR_(dmfile)("unexpected size %ld\n", Chunk.dwSize); return E_FAIL; } IStream_Read (pStm, &inst, Chunk.dwSize, NULL); if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) inst.nPitchBendRange = 0; - TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); - TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); - TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]); - TRACE_(dmfile)(" - dwNoteRanges[1]: %u\n", inst.dwNoteRanges[1]); - TRACE_(dmfile)(" - dwNoteRanges[2]: %u\n", inst.dwNoteRanges[2]); - TRACE_(dmfile)(" - dwNoteRanges[3]: %u\n", inst.dwNoteRanges[3]); - TRACE_(dmfile)(" - dwPChannel: %u\n", inst.dwPChannel); - TRACE_(dmfile)(" - dwFlags: %x\n", inst.dwFlags); + TRACE_(dmfile)(" - dwPatch: %lu\n", inst.dwPatch); + TRACE_(dmfile)(" - dwAssignPatch: %lu\n", inst.dwAssignPatch); + TRACE_(dmfile)(" - dwNoteRanges[0]: %lu\n", inst.dwNoteRanges[0]); + TRACE_(dmfile)(" - dwNoteRanges[1]: %lu\n", inst.dwNoteRanges[1]); + TRACE_(dmfile)(" - dwNoteRanges[2]: %lu\n", inst.dwNoteRanges[2]); + TRACE_(dmfile)(" - dwNoteRanges[3]: %lu\n", inst.dwNoteRanges[3]); + TRACE_(dmfile)(" - dwPChannel: %lu\n", inst.dwPChannel); + TRACE_(dmfile)(" - dwFlags: %lx\n", inst.dwFlags); TRACE_(dmfile)(" - bPan: %u\n", inst.bPan); TRACE_(dmfile)(" - bVolume: %u\n", inst.bVolume); TRACE_(dmfile)(" - nTranspose: %d\n", inst.nTranspose); - TRACE_(dmfile)(" - dwChannelPriority: %u\n", inst.dwChannelPriority); + TRACE_(dmfile)(" - dwChannelPriority: %lu\n", inst.dwChannelPriority); TRACE_(dmfile)(" - nPitchBendRange: %d\n", inst.nPitchBendRange); break; } @@ -272,7 +272,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * 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]); /* @@ -321,7 +321,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -351,7 +351,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C 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]); return S_OK; @@ -378,7 +378,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -402,7 +402,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -417,7 +417,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p } } } - 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; } @@ -444,7 +444,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -465,11 +465,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p,%p): loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { TRACE_(dmfile)(": Band form\n"); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 612be063e19..0864e91bd4b 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -68,7 +68,7 @@ static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -78,7 +78,7 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(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); @@ -101,7 +101,7 @@ static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %x): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + FIXME("(%p, %p, %p, %p, %ld, %lx): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); return S_OK; } @@ -120,7 +120,7 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %x, %p, %p, %d): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); + FIXME("(%p, %p, %ld, %ld, %ld, %lx, %p, %p, %ld): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); /* Sends following pMSG: - DMUS_PATCH_PMSG @@ -137,7 +137,7 @@ static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -154,7 +154,7 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -234,7 +234,7 @@ static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -245,7 +245,7 @@ static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_d { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %x, %p, %p, %d): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %lx, %p, %p, %ld): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), flags, performance, segment_state, virtual_id); return S_OK; @@ -257,7 +257,7 @@ static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), rtNext, param, state_data, flags); return S_OK; @@ -268,7 +268,7 @@ static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), param, state_data, flags); return S_OK; @@ -279,7 +279,7 @@ static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -288,7 +288,7 @@ static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra IDirectMusicTrack **ppResultTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -383,7 +383,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -393,14 +393,14 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDITEM_CHUNK: { DMUS_IO_BAND_ITEM_HEADER tmp_header; TRACE_(dmfile)(": Band Item chunk v1\n"); IStream_Read (pStm, &tmp_header, sizeof(DMUS_IO_BAND_ITEM_HEADER), NULL); - TRACE_(dmfile)(" - lBandTime: %u\n", tmp_header.lBandTime); + TRACE_(dmfile)(" - lBandTime: %lu\n", tmp_header.lBandTime); header.dwVersion = 1; header.lBandTime = tmp_header.lBandTime; @@ -411,8 +411,8 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK TRACE_(dmfile)(": Band Item chunk v2\n"); IStream_Read (pStm, &tmp_header2, sizeof(DMUS_IO_BAND_ITEM_HEADER2), NULL); - TRACE_(dmfile)(" - lBandTimeLogical: %u\n", tmp_header2.lBandTimeLogical); - TRACE_(dmfile)(" - lBandTimePhysical: %u\n", tmp_header2.lBandTimePhysical); + TRACE_(dmfile)(" - lBandTimeLogical: %lu\n", tmp_header2.lBandTimeLogical); + TRACE_(dmfile)(" - lBandTimePhysical: %lu\n", tmp_header2.lBandTimePhysical); header.dwVersion = 2; header.lBandTimeLogical = tmp_header2.lBandTimeLogical; @@ -465,7 +465,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK 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]); break; } @@ -476,7 +476,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK 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]); return S_OK; @@ -501,7 +501,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -525,7 +525,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -540,7 +540,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH } } } - 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; } @@ -567,7 +567,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -588,11 +588,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDTRACK_FORM: { TRACE_(dmfile)(": Band track form\n"); diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/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/dmband/dmutils.c b/dlls/dmband/dmutils.c index c676775d354..01cec0f4c64 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -169,7 +169,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -181,7 +181,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - dwValidData: %lu\n", ref.dwValidData); break; } default: { @@ -192,7 +192,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } } } - TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; -- 2.34.1

1 0

[PATCH] dmband/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 08 Feb '22

08 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/tests/Makefile.in | 1 - dlls/dmband/tests/dmband.c | 142 +++++++++++++++++----------------- 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/dlls/dmband/tests/Makefile.in b/dlls/dmband/tests/Makefile.in index 201ecc98c97..ddce98f1085 100644 --- a/dlls/dmband/tests/Makefile.in +++ b/dlls/dmband/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmband.dll IMPORTS = oleaut32 ole32 uuid diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 4b8aaf61208..07ffcf4e7fe 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -59,37 +59,37 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmb); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicBand create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmb, "dmb = %p\n", dmb); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmb); - ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicBand interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (void**)&dmb); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicBand_AddRef(dmb); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicBand_QueryInterface(dmb, &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 == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicBand_QueryInterface(dmb, &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 == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicBand_Release(dmb)); @@ -108,39 +108,39 @@ static void test_COM_bandtrack(void) hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmbt); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicBandTrack create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmbt, "dmbt = %p\n", dmbt); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmbt); - ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicBandTrack interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmbt); - ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicTrack_AddRef(dmbt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmbt, &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 = IDirectMusicTrack_QueryInterface(dmbt, &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 = IDirectMusicTrack_QueryInterface(dmbt, &IID_IDirectMusicBandTrackPrivate, (void**)&private); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %#lx\n", hr); if (hr == S_OK) { refcount = IUnknown_AddRef(private); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(private); } @@ -157,19 +157,19 @@ static void test_dmband(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (void**)&dmb); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); /* Unimplemented IPersistStream methods */ hr = IDirectMusicBand_QueryInterface(dmb, &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 == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %#lx\n", hr); 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 (IDirectMusicBand_Release(dmb)); } @@ -223,86 +223,86 @@ static void test_bandtrack(void) hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ todo_wine { hr = IDirectMusicTrack8_Init(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine - ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); for (i = 0; i < ARRAY_SIZE(param_types); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); if (param_types[i].supported) { - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); if (param_types[i].type != &GUID_BandParam) ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", param_types[i].name, hr); } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", param_types[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, param_types[i].type, 0, buf); ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "SetParam(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "SetParam(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); } } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); todo_wine { hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &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_DirectMusicBandTrack), "Expected class CLSID_DirectMusicBandTrack 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 (IDirectMusicTrack8_Release(dmt8)); } @@ -416,12 +416,12 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", @@ -431,8 +431,8 @@ static void test_parsedescriptor(void) 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 == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", @@ -442,34 +442,34 @@ static void test_parsedescriptor(void) /* NULL pointers */ 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_INVALID_BAND, - "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_INVALID_BAND\n", hr); IStream_Release(stream); /* A category chunk adds DMUS_OBJ_DATE too */ stream = gen_riff_stream(catdate); 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); valid = DMUS_OBJ_CLASS | DMUS_OBJ_CATEGORY | DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); IStream_Release(stream); /* All desc chunks, extra DMUS_OBJ_DATE */ 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); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", wine_dbgstr_guid(&desc.guidClass)); @@ -478,7 +478,7 @@ static void test_parsedescriptor(void) ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, - "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, + "Got file time %#08lx %#08lx, expected 0\n", desc.ftDate.dwHighDateTime, desc.ftDate.dwLowDateTime); IStream_Release(stream); @@ -487,9 +487,9 @@ 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(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), - "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -499,8 +499,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_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -508,9 +508,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); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH] dmime: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc 08 Feb '22

08 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 10 +++--- dlls/dmime/dmobject.c | 20 ++++++------ dlls/dmime/graph.c | 8 ++--- dlls/dmime/lyricstrack.c | 32 +++++++++--------- dlls/dmime/markertrack.c | 14 ++++---- dlls/dmime/paramcontroltrack.c | 24 +++++++------- dlls/dmime/performance.c | 60 +++++++++++++++++----------------- dlls/dmime/segment.c | 58 ++++++++++++++++---------------- dlls/dmime/segmentstate.c | 8 ++--- dlls/dmime/segtriggertrack.c | 34 +++++++++---------- dlls/dmime/seqtrack.c | 24 +++++++------- dlls/dmime/sysextrack.c | 24 +++++++------- dlls/dmime/tempotrack.c | 26 +++++++-------- dlls/dmime/timesigtrack.c | 16 ++++----- dlls/dmime/wavetrack.c | 50 ++++++++++++++-------------- 16 files changed, 204 insertions(+), 205 deletions(-) diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index 4098a2c9fdb..51d1492585f 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmime.dll IMPORTS = dxguid uuid dsound ole32 user32 advapi32 diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 078d843d466..5018be9d453 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -94,7 +94,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_AddRef (IDirectMusicAudioPath *ifa struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref); DMIME_LockModule(); return ref; @@ -105,7 +105,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if (ref == 0) { if (This->pPrimary) @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); HRESULT hr; - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), + FIXME("(%p, %ld, %ld, %ld, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { @@ -238,14 +238,14 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath * static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %i, %d): stub\n", This, lVolume, dwDuration); + FIXME("(%p, %li, %ld): stub\n", This, lVolume, dwDuration); return S_OK; } static HRESULT WINAPI IDirectMusicAudioPathImpl_ConvertPChannel (IDirectMusicAudioPath *iface, DWORD dwPChannelIn, DWORD* pdwPChannelOut) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); + FIXME("(%p, %ld, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); return S_OK; } diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/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/dmime/graph.c b/dlls/dmime/graph.c index 85eef9c091d..526163e5b54 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicGraph_AddRef(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); DMIME_LockModule(); return ref; @@ -84,7 +84,7 @@ static ULONG WINAPI DirectMusicGraph_Release(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -108,7 +108,7 @@ static HRESULT WINAPI DirectMusicGraph_InsertTool(IDirectMusicGraph *iface, IDir LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pNewTool = NULL; - FIXME("(%p, %p, %p, %d, %i): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); + FIXME("(%p, %p, %p, %ld, %li): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); if (!pTool) return E_POINTER; @@ -150,7 +150,7 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); + TRACE("(%p, %ld, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) { diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index b2ce3e0a4c1..769713a6ba1 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -70,7 +70,7 @@ static ULONG WINAPI lyrics_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI lyrics_track_Release(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(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); @@ -102,7 +102,7 @@ static HRESULT WINAPI lyrics_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -118,7 +118,7 @@ static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -127,7 +127,7 @@ static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -136,7 +136,7 @@ static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -169,7 +169,7 @@ static HRESULT WINAPI lyrics_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME m MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -178,7 +178,7 @@ static HRESULT WINAPI lyrics_track_PlayEx(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI lyrics_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI lyrics_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI lyrics_track_Compose(IDirectMusicTrack8 *iface, IUnknown * { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -215,7 +215,7 @@ static HRESULT WINAPI lyrics_track_Join(IDirectMusicTrack8 *iface, IDirectMusicT MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -267,10 +267,10 @@ static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream } TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); - TRACE(" - dwFlags 0x%08x\n", header.dwFlags); - TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); - TRACE(" - lTimeLogical %d\n", header.lTimeLogical); - TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + TRACE(" - dwFlags %#lx\n", header.dwFlags); + TRACE(" - dwTimingFlags %#lx\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %ld\n", header.lTimeLogical); + TRACE(" - lTimePhysical %ld\n", header.lTimePhysical); if (FAILED(hr = stream_next_chunk(stream, &child))) return hr; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index f41bed668a6..cfb788ccf50 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -64,7 +64,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -74,7 +74,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!param) return E_POINTER; @@ -144,7 +144,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 8fb3d40332f..c0aed374101 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI paramcontrol_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI paramcontrol_track_Release(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(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); @@ -98,7 +98,7 @@ static HRESULT WINAPI paramcontrol_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -114,7 +114,7 @@ static HRESULT WINAPI paramcontrol_track_Play(IDirectMusicTrack8 *iface, void *p IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -123,7 +123,7 @@ static HRESULT WINAPI paramcontrol_track_GetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -132,7 +132,7 @@ static HRESULT WINAPI paramcontrol_track_SetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -166,7 +166,7 @@ static HRESULT WINAPI paramcontrol_track_Clone(IDirectMusicTrack8 *iface, MUSIC_ MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -175,7 +175,7 @@ static HRESULT WINAPI paramcontrol_track_PlayEx(IDirectMusicTrack8 *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI paramcontrol_track_GetParamEx(IDirectMusicTrack8 *iface, R DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -194,7 +194,7 @@ static HRESULT WINAPI paramcontrol_track_SetParamEx(IDirectMusicTrack8 *iface, R REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -204,7 +204,7 @@ static HRESULT WINAPI paramcontrol_track_Compose(IDirectMusicTrack8 *iface, IUnk { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI paramcontrol_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack **resulttrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 58d16de234d..f59be107c58 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -103,7 +103,7 @@ static DMUS_PMSGItem* ProceedMsg(IDirectMusicPerformance8Impl* This, DMUS_PMSGIt case DMUS_PMSGT_TEMPO: case DMUS_PMSGT_STOP: default: - FIXME("Unhandled PMsg Type: 0x%x\n", cur->pMsg.dwType); + FIXME("Unhandled PMsg Type: %#lx\n", cur->pMsg.dwType); break; } return cur; @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_AddRef(IDirectMusicPerformance8 IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref); DMIME_LockModule(); @@ -288,7 +288,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if (ref == 0) { wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); @@ -318,7 +318,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment(IDirectMusicPerfo { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %d, 0x%s, %p): stub\n", This, pSegment, dwFlags, + FIXME("(%p, %p, %ld, 0x%s, %p): stub\n", This, pSegment, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -331,7 +331,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Stop(IDirectMusicPerformance8 { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %p, %d, %d): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); + FIXME("(%p, %p, %p, %ld, %ld): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); return S_OK; } @@ -340,7 +340,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetSegmentState(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p,%p, %d): stub\n", This, ppSegmentState, mtTime); + FIXME("(%p,%p, %ld): stub\n", This, ppSegmentState, mtTime); return S_OK; } @@ -349,7 +349,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetPrepareTime(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwPrepareTime = dwMilliSeconds; return S_OK; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetBumperLength(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwBumperLength = dwMilliSeconds; return S_OK; } @@ -447,7 +447,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime(IDirectM { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p): stub\n", This, mtTime, prtTime); + FIXME("(%p, %ld, %p): stub\n", This, mtTime, prtTime); return S_OK; } @@ -496,9 +496,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AllocPMsg(IDirectMusicPerform { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); DMUS_PMSGItem* pItem = NULL; - - FIXME("(%p, %d, %p): stub\n", This, cb, ppPMSG); - + + FIXME("(%p, %ld, %p): stub\n", This, cb, ppPMSG); + if (sizeof(DMUS_PMSG) > cb) { return E_INVALIDARG; } @@ -698,7 +698,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMu { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + FIXME("(%p, %ld, %p, %ld): semi-stub\n", This, block_num, port, group); if (!port) return E_POINTER; @@ -716,7 +716,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); struct pchannel_block *block; - FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); + FIXME("(%p)->(%ld, %p, %ld, %ld) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; @@ -739,7 +739,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerf DWORD block_num = pchannel / 16; unsigned int index = pchannel % 16; - TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); + TRACE("(%p)->(%ld, %p, %p, %p)\n", This, pchannel, port, group, channel); entry = wine_rb_get(&This->pchannels, &block_num); if (!entry) @@ -765,7 +765,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_DownloadInstrument(IDirectMus { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %d, %p, %p, %d, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); return S_OK; } @@ -774,7 +774,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Invalidate(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %d): stub\n", This, mtTime, dwFlags); + FIXME("(%p, %ld, %ld): stub\n", This, mtTime, dwFlags); return S_OK; } @@ -784,7 +784,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; } @@ -793,7 +793,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -802,8 +802,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %s, %p, %d): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) memcpy(pParam, &This->fAutoDownload, sizeof(This->fAutoDownload)); if (IsEqualGUID (rguidType, &GUID_PerfMasterGrooveLevel)) @@ -821,8 +821,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %s, %p, %d)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) { memcpy(&This->fAutoDownload, pParam, dwSize); TRACE("=> AutoDownload set to %d\n", This->fAutoDownload); @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetResolvedTime(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, 0x%s, %p, %d): stub\n", This, wine_dbgstr_longlong(rtTime), + FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rtTime), prtResolved, dwTimeResolveFlags); return S_OK; } @@ -931,7 +931,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_TimeToRhythm(IDirectMusicPerf { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); + FIXME("(%p, %ld, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); return S_OK; } @@ -953,7 +953,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, default_path_type, + TRACE("(%p, %p, %p, %p, %lx, %lu, %lx, %p)\n", This, dmusic, dsound, hwnd, default_path_type, num_channels, flags, params); if (This->dmusic) @@ -1038,7 +1038,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %p, %p, %d, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, + FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -1050,7 +1050,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformanc { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s, %d): stub\n", This, pObjectToStop, + FIXME("(%p, %p, 0x%s, %ld): stub\n", This, pObjectToStop, wine_dbgstr_longlong(i64StopTime), dwFlags); return S_OK; } @@ -1097,7 +1097,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK; - FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); + FIXME("(%p)->(%ld, %ld, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); if (NULL == ppNewPath) { return E_POINTER; @@ -1222,7 +1222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 326ffe98e18..8ec4059e8f9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_AddRef(IDirectMusicSegment8 *iface) IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(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); @@ -109,7 +109,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLength(IDirectMusicSegment8 *i { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, mtLength); + TRACE("(%p, %ld)\n", This, mtLength); This->header.mtLength = mtLength; return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetRepeats(IDirectMusicSegment8 * { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, dwRepeats); + TRACE("(%p, %ld)\n", This, dwRepeats); This->header.dwRepeats = dwRepeats; return S_OK; } @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetDefaultResolution(IDirectMusic { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, dwResolution); + TRACE("(%p, %ld)\n", This, dwResolution); This->header.dwResolution = dwResolution; return S_OK; } @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#lx, %#lx, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { /** @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> %#x, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { *pdwGroupBits = pIt->dwGroupBits; return S_OK; @@ -243,7 +243,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, group); + TRACE("(%p, %p, %#lx)\n", This, pTrack, group); if (!group) return E_INVALIDARG; @@ -251,7 +251,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%lu: %p -> %#lx, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -303,7 +303,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InitPlay(IDirectMusicSegment8 *if IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); HRESULT hr; - FIXME("(%p, %p, %p, %d): semi-stub\n", This, ppSegState, pPerformance, dwFlags); + FIXME("(%p, %p, %p, %ld): semi-stub\n", This, ppSegState, pPerformance, dwFlags); if (NULL == ppSegState) { return E_POINTER; } @@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *if unsigned int i, count; HRESULT hr = DMUS_E_TRACK_NOT_FOUND; - TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + TRACE("(%p, %s, %#lx, %lu, %ld, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, next, param); if (!type) @@ -406,7 +406,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#lx, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -414,7 +414,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment **ppSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppSegment); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); return S_OK; } @@ -423,7 +423,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetStartPoint(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, mtStart); + TRACE("(%p, %ld)\n", This, mtStart); if (mtStart >= This->header.mtLength) { return DMUS_E_OUT_OF_RANGE; } @@ -449,7 +449,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, start, end); + TRACE("(%p, %ld, %ld)\n", This, start, end); if ((end || start) && (start >= This->header.mtLength || end > This->header.mtLength || start > end)) @@ -479,7 +479,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetPChannelsUsed(IDirectMusicSegm DWORD dwNumPChannels, DWORD *paPChannels) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwNumPChannels, paPChannels); + FIXME("(%p, %ld, %p): stub\n", This, dwNumPChannels, paPChannels); return S_OK; } @@ -488,7 +488,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#lx, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } @@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Compose(IDirectMusicSegment8 *ifa IDirectMusicSegment **ppComposedSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); + FIXME("(%p, %ld, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); return S_OK; } @@ -629,7 +629,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, return hr; TRACE("Found DMUS_IO_TRACK_HEADER\n"); TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); - TRACE("\tdwGroup: %#x\n", thdr.dwGroup); + TRACE("\tdwGroup: %#lx\n", thdr.dwGroup); TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); @@ -649,7 +649,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); - TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); + TRACE("dwFlags: %#lx, dwPriority: %lu\n", txhdr.dwFlags, txhdr.dwPriority); } } if (hr != S_OK) @@ -713,16 +713,16 @@ static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) else if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart)) dx = 8; TRACE("Found DirectX%d DMUS_IO_SEGMENT_HEADER\n", dx); - TRACE("\tdwRepeats: %u\n", h->dwRepeats); - TRACE("\tmtLength: %u\n", h->mtLength); - TRACE("\tmtPlayStart: %u\n", h->mtPlayStart); - TRACE("\tmtLoopStart: %u\n", h->mtLoopStart); - TRACE("\tmtLoopEnd: %u\n", h->mtLoopEnd); - TRACE("\tdwResolution: %u\n", h->dwResolution); + TRACE("\tdwRepeats: %lu\n", h->dwRepeats); + TRACE("\tmtLength: %lu\n", h->mtLength); + TRACE("\tmtPlayStart: %lu\n", h->mtPlayStart); + TRACE("\tmtLoopStart: %lu\n", h->mtLoopStart); + TRACE("\tmtLoopEnd: %lu\n", h->mtLoopEnd); + TRACE("\tdwResolution: %lu\n", h->dwResolution); if (dx >= 8) { TRACE("\trtLength: %s\n", wine_dbgstr_longlong(h->rtLength)); - TRACE("\tdwFlags: %u\n", h->dwFlags); - TRACE("\tdwReserved: %u\n", h->dwReserved); + TRACE("\tdwFlags: %lu\n", h->dwFlags); + TRACE("\tdwReserved: %lu\n", h->dwReserved); } if (dx == 9) { TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index edd7ed70f05..61347d8c1a2 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -61,7 +61,7 @@ static ULONG WINAPI DirectMusicSegmentState8_AddRef(IDirectMusicSegmentState8 *i IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); DMIME_LockModule(); @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicSegmentState8_Release(IDirectMusicSegmentState8 * IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -120,13 +120,13 @@ static HRESULT WINAPI DirectMusicSegmentState8_GetStartPoint(IDirectMusicSegment static HRESULT WINAPI DirectMusicSegmentState8_SetTrackConfig(IDirectMusicSegmentState8 *iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %ld, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } static HRESULT WINAPI DirectMusicSegmentState8_GetObjectInPath(IDirectMusicSegmentState8 *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); + FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); return S_OK; } diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 9a7602f58db..14e013c8e16 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -76,7 +76,7 @@ static ULONG WINAPI segment_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct list *cursor, *cursor2; @@ -120,7 +120,7 @@ static HRESULT WINAPI segment_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -136,7 +136,7 @@ static HRESULT WINAPI segment_track_Play(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -145,7 +145,7 @@ static HRESULT WINAPI segment_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -154,7 +154,7 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI segment_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI segment_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI segment_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -216,7 +216,7 @@ static HRESULT WINAPI segment_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -226,7 +226,7 @@ static HRESULT WINAPI segment_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -234,7 +234,7 @@ static HRESULT WINAPI segment_track_Join(IDirectMusicTrack8 *iface, IDirectMusic MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -282,10 +282,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st goto error; TRACE("Found DMUS_IO_SEGMENT_ITEM_HEADER\n"); - TRACE("\tlTimePhysical: %u\n", item->header.lTimeLogical); - TRACE("\tlTimePhysical: %u\n", item->header.lTimePhysical); - TRACE("\tdwPlayFlags: %#08x\n", item->header.dwPlayFlags); - TRACE("\tdwFlags: %#08x\n", item->header.dwFlags); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimeLogical); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimePhysical); + TRACE("\tdwPlayFlags: %#08lx\n", item->header.dwPlayFlags); + TRACE("\tdwFlags: %#08lx\n", item->header.dwFlags); /* Second chunk is a reference list */ if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || @@ -358,7 +358,7 @@ static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream if (FAILED(hr)) return hr; if (header.dwFlags) - WARN("Got flags %#x; must be zero\n", header.dwFlags); + WARN("Got flags %#lx; must be zero\n", header.dwFlags); if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return FAILED(hr) ? hr : DMUS_E_INVALID_SEGMENTTRIGGERTRACK; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 5d9a579988d..3c4e2c22439 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sequence_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sequence_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI sequence_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI sequence_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sequence_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI sequence_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -175,7 +175,7 @@ static HRESULT WINAPI sequence_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI sequence_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -195,7 +195,7 @@ static HRESULT WINAPI sequence_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -205,7 +205,7 @@ static HRESULT WINAPI sequence_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI sequence_track_Join(IDirectMusicTrack8 *iface, IDirectMusi MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 81d60f2a29e..ded348aede9 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sysex_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sysex_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(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); @@ -97,7 +97,7 @@ static HRESULT WINAPI sysex_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI sysex_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI sysex_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sysex_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -165,7 +165,7 @@ static HRESULT WINAPI sysex_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -174,7 +174,7 @@ static HRESULT WINAPI sysex_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -184,7 +184,7 @@ static HRESULT WINAPI sysex_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI sysex_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI sysex_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -212,7 +212,7 @@ static HRESULT WINAPI sysex_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 57931bf1e56..0e8d5bcab48 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -72,7 +72,7 @@ static ULONG WINAPI tempo_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(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 tempo_track_Release(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { heap_free(This->items); @@ -108,7 +108,7 @@ static HRESULT WINAPI tempo_track_InitPlay(IDirectMusicTrack8 *iface, LPDMUS_PRIVATE_TEMPO_PLAY_STATE pState = NULL; - FIXME("(%p, %p, %p, %p, %d, %d): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); pState = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_PLAY_STATE)); if (NULL == pState) @@ -141,7 +141,7 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); /** should use IDirectMusicPerformance_SendPMsg here */ return S_OK; } @@ -153,7 +153,7 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty DMUS_TEMPO_PARAM *prm = param; unsigned int i; - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!param) return E_POINTER; @@ -190,7 +190,7 @@ static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_DisableTempo)) { if (!param) @@ -250,7 +250,7 @@ static HRESULT WINAPI tempo_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -259,7 +259,7 @@ static HRESULT WINAPI tempo_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -269,7 +269,7 @@ static HRESULT WINAPI tempo_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -278,7 +278,7 @@ static HRESULT WINAPI tempo_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -288,7 +288,7 @@ static HRESULT WINAPI tempo_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -297,7 +297,7 @@ static HRESULT WINAPI tempo_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr IDirectMusicTrack **ppResultTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -351,7 +351,7 @@ static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream * for (i = 0; i < This->count; i++) { TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%u\n", i); - TRACE_(dmfile)(" - lTime = %u\n", This->items[i].lTime); + TRACE_(dmfile)(" - lTime = %lu\n", This->items[i].lTime); TRACE_(dmfile)(" - dblTempo = %g\n", This->items[i].dblTempo); } diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index c34049beb18..d6452e92e1b 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -83,7 +83,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { heap_free(This->items); @@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -123,7 +123,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (IsEqualGUID(type, &GUID_TimeSignature)) { FIXME("GUID_TimeSignature not handled yet\n"); @@ -147,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_DisableTimeSig)) { FIXME("GUID_DisableTimeSig not handled yet\n"); @@ -197,7 +197,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -242,7 +242,7 @@ static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *str for (i = 0; i < This->count; i++) { TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); - TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - lTime %ld\n", This->items[i].lTime); TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); TRACE(" - bBeat %d\n", This->items[i].bBeat); TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 454695ebfb6..171c3e5c6b7 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -85,7 +85,7 @@ static ULONG WINAPI wave_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct wave_item *item, *item2; @@ -131,7 +131,7 @@ static HRESULT WINAPI wave_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -147,7 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -156,7 +156,7 @@ static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -165,7 +165,7 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) { FIXME("GUID_Disable_Auto_Download not handled yet\n"); @@ -239,7 +239,7 @@ static HRESULT WINAPI wave_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -248,7 +248,7 @@ static HRESULT WINAPI wave_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -258,7 +258,7 @@ static HRESULT WINAPI wave_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -267,7 +267,7 @@ static HRESULT WINAPI wave_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -277,7 +277,7 @@ static HRESULT WINAPI wave_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -285,7 +285,7 @@ static HRESULT WINAPI wave_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -341,15 +341,15 @@ static HRESULT parse_wave_item(struct wave_part *part, IStream *stream, struct c } TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); - TRACE("\tlVolume %d\n", item->header.lVolume); - TRACE("\tdwVariations %d\n", item->header.dwVariations); + TRACE("\tlVolume %ld\n", item->header.lVolume); + TRACE("\tdwVariations %ld\n", item->header.dwVariations); TRACE("\trtTime %s\n", wine_dbgstr_longlong(item->header.rtTime)); TRACE("\trtStartOffset %s\n", wine_dbgstr_longlong(item->header.rtStartOffset)); TRACE("\trtReserved %s\n", wine_dbgstr_longlong(item->header.rtReserved)); TRACE("\trtDuration %s\n", wine_dbgstr_longlong(item->header.rtDuration)); - TRACE("\tdwLoopStart %d\n", item->header.dwLoopStart); - TRACE("\tdwLoopEnd %d\n", item->header.dwLoopEnd); - TRACE("\tdwFlags %#08x\n", item->header.dwFlags); + TRACE("\tdwLoopStart %ld\n", item->header.dwLoopStart); + TRACE("\tdwLoopEnd %ld\n", item->header.dwLoopEnd); + TRACE("\tdwFlags %#08lx\n", item->header.dwFlags); TRACE("\twVolumeRange %d\n", item->header.wVolumeRange); TRACE("\twPitchRange %d\n", item->header.wPitchRange); @@ -394,12 +394,12 @@ static HRESULT parse_wave_part(IDirectMusicWaveTrack *This, IStream *stream, } TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); - TRACE("\tlVolume %d\n", part->header.lVolume); - TRACE("\tdwVariations %d\n", part->header.dwVariations); - TRACE("\tdwPChannel %d\n", part->header.dwPChannel); - TRACE("\tdwLockToPart %d\n", part->header.dwLockToPart); - TRACE("\tdwFlags %#08x\n", part->header.dwFlags); - TRACE("\tdwIndex %d\n", part->header.dwIndex); + TRACE("\tlVolume %ld\n", part->header.lVolume); + TRACE("\tdwVariations %ld\n", part->header.dwVariations); + TRACE("\tdwPChannel %ld\n", part->header.dwPChannel); + TRACE("\tdwLockToPart %ld\n", part->header.dwLockToPart); + TRACE("\tdwFlags %#08lx\n", part->header.dwFlags); + TRACE("\tdwIndex %ld\n", part->header.dwIndex); /* Array of wave items */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) @@ -447,8 +447,8 @@ static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *s return hr; TRACE("Found DMUS_IO_WAVE_TRACK_HEADER\n"); - TRACE("\tlVolume %d\n", This->header.lVolume); - TRACE("\tdwFlags %#08x\n", This->header.dwFlags); + TRACE("\tlVolume %ld\n", This->header.lVolume); + TRACE("\tdwFlags %#08lx\n", This->header.dwFlags); /* Array of wave parts */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) -- 2.34.1

1 0

[PATCH v3] win32u: Cache GL driver functions in DC.
by Paul Gofman 08 Feb '22

08 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 225319-225320. dlls/win32u/dc.c | 56 ++++++++++++++++++++++++------------- dlls/win32u/driver.c | 23 +++++++++++---- dlls/win32u/ntgdi_private.h | 23 +++++++++++++++ 3 files changed, 77 insertions(+), 25 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index aed2d3684a7..f9ea909371d 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -63,25 +63,6 @@ static const struct gdi_obj_funcs dc_funcs = }; -static inline DC *get_dc_obj( HDC hdc ) -{ - DWORD type; - DC *dc = get_any_obj_ptr( hdc, &type ); - if (!dc) return NULL; - - switch (type) - { - case NTGDI_OBJ_DC: - case NTGDI_OBJ_MEMDC: - case NTGDI_OBJ_ENHMETADC: - return dc; - default: - GDI_ReleaseObj( hdc ); - SetLastError( ERROR_INVALID_HANDLE ); - return NULL; - } -} - /* alloc DC_ATTR from a pool of memory accessible from client */ static DC_ATTR *alloc_dc_attr(void) { @@ -310,6 +291,43 @@ DC *get_dc_ptr( HDC hdc ) } +/*********************************************************************** + * grab_dc + * + * Retrieve a DC pointer, increase ref count and release the GDI lock. + */ +DC *grab_dc( HDC hdc ) +{ + DC *dc; + + if (!GDI_inc_ref_count( hdc )) return NULL; + if (!(dc = get_dc_obj( hdc ))) + { + GDI_dec_ref_count( hdc ); + return NULL; + } + if (dc->attr->disabled) + { + GDI_dec_ref_count( hdc ); + GDI_ReleaseObj( hdc ); + return NULL; + } + GDI_ReleaseObj( hdc ); + return dc; +} + + +/*********************************************************************** + * put_dc + * + * Decrease ref count previously increased by grab_dc(). + */ +void put_dc( HDC hdc ) +{ + GDI_dec_ref_count( hdc ); +} + + /*********************************************************************** * release_dc_ptr */ diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 39996086c6d..19987817cc9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1347,14 +1347,25 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE */ struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) { - struct opengl_funcs *ret = NULL; - DC * dc = get_dc_ptr( hdc ); + struct opengl_funcs *ret; + PHYSDEV physdev; + DC * dc; - if (dc) + if (!(dc = get_dc_obj( hdc ))) return NULL; + if (dc->attr->disabled) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); - ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); - release_dc_ptr( dc ); + GDI_ReleaseObj( hdc ); + return NULL; } + ret = dc->gl_funcs; + GDI_ReleaseObj( hdc ); + + if (ret) return ret; + + if (!(dc = grab_dc( hdc ))) return NULL; + physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); + ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); + InterlockedCompareExchangePointer( (void * volatile *)&dc->gl_funcs, ret, NULL ); + put_dc( hdc ); return ret; } diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index bfeb4557da7..20a41ccda32 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -87,6 +87,8 @@ typedef struct tagDC XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ RECT bounds; /* Current bounding rect */ + + struct opengl_funcs *gl_funcs; /* Opengl driver functions */ } DC; /* Certain functions will do no further processing if the driver returns this. @@ -170,6 +172,8 @@ static inline HRGN get_dc_region( DC *dc ) extern DC *alloc_dc_ptr( DWORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; +extern DC *grab_dc( HDC hdc ) DECLSPEC_HIDDEN; +extern void put_dc( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; @@ -660,6 +664,25 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } +static inline DC *get_dc_obj( HDC hdc ) +{ + DWORD type; + DC *dc = get_any_obj_ptr( hdc, &type ); + if (!dc) return NULL; + + switch (type) + { + case NTGDI_OBJ_DC: + case NTGDI_OBJ_MEMDC: + case NTGDI_OBJ_ENHMETADC: + return dc; + default: + GDI_ReleaseObj( hdc ); + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } +} + extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; -- 2.34.1

2 1

[PATCH] diasymreader: Stub ISymUnmanagedDocumentWriter.
by Esme Povirk 08 Feb '22

08 Feb '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/diasymreader/writer.c | 96 +++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 1820ccb51b0..64fdbdb8272 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -45,6 +45,11 @@ typedef struct SymWriter { WCHAR pdb_filename[MAX_PATH]; } SymWriter; +typedef struct SymDocumentWriter { + ISymUnmanagedDocumentWriter iface; + LONG ref; +} SymDocumentWriter; + static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) { return CONTAINING_RECORD(iface, SymWriter, iface); @@ -55,6 +60,81 @@ static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); } +static inline SymDocumentWriter *impl_from_ISymUnmanagedDocumentWriter(ISymUnmanagedDocumentWriter *iface) +{ + return CONTAINING_RECORD(iface, SymDocumentWriter, iface); +} + +static HRESULT WINAPI SymDocumentWriter_QueryInterface(ISymUnmanagedDocumentWriter *iface, REFIID iid, + void **ppv) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ISymUnmanagedDocumentWriter, iid)) + { + *ppv = &This->iface; + } + else + { + WARN("unknown interface %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI SymDocumentWriter_AddRef(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI SymDocumentWriter_SetSource(ISymUnmanagedDocumentWriter *iface, ULONG sourceSize, + BYTE source[]) +{ + FIXME("(%p,%u,%p)\n", iface, sourceSize, source); + return S_OK; +} + +static HRESULT WINAPI SymDocumentWriter_SetChecksum(ISymUnmanagedDocumentWriter *iface, GUID algorithmID, + ULONG32 checkSumSize, BYTE checkSum[]) +{ + FIXME("(%p,%s,%u,%p)\n", iface, debugstr_guid(&algorithmID), checkSumSize, checkSum); + return S_OK; +} + +static const ISymUnmanagedDocumentWriterVtbl SymDocumentWriter_Vtbl = { + SymDocumentWriter_QueryInterface, + SymDocumentWriter_AddRef, + SymDocumentWriter_Release, + SymDocumentWriter_SetSource, + SymDocumentWriter_SetChecksum +}; + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -117,9 +197,23 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons const GUID *language, const GUID *languageVendor, const GUID *documentType, ISymUnmanagedDocumentWriter** pRetVal) { + SymDocumentWriter *result; + FIXME("(%p,%s,%s,%s,%s,%p)\n", iface, debugstr_w(url), debugstr_guid(language), debugstr_guid(languageVendor), debugstr_guid(documentType), pRetVal); - return E_NOTIMPL; + + if (!pRetVal) + return E_POINTER; + + result = heap_alloc(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->iface.lpVtbl = &SymDocumentWriter_Vtbl; + result->ref = 1; + *pRetVal = &result->iface; + + return S_OK; } static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod) -- 2.30.2

1 0

[RFC PATCH 1/4] ntdll: Consolidate 2 STRs into 1 STRD in ARM syscall dispatcher.
by Jinoh Kang 08 Feb '22

08 Feb '22

STRD is an ARMv7 instruction that stores two consecutive 32-bit words in one operation. A single STRD saves one clock cycle compared to two LDRs. Shortened code also leads to less time spent on instruction fetch and more efficient I-cache utilization. Running llvm-mca --timeline on the old code reports: 0123 Index 0123456789 [0,0] DeeeeER . . ldr.w r1, [r1, #472] [0,1] D====eER . . add.w r0, r1, #16 [0,2] D=====eeeeeER. stm.w r0, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr} [0,3] .DeE--------R. add r2, sp, #16 [0,4] .D=====eE---R. str r2, [r1, #56] [0,5] .D======eE--R. str r3, [r1, #60] [0,6] . D---------R. mrs r0, apsr [0,7] . DeeE------R. bfi r0, lr, #5, #1 [0,8] . D======eE-R. str r0, [r1, #64] [0,9] . DeE-------R. mov.w r0, #0 [0,10] . D======eER. str r0, [r1, #68] [0,11] . D======E-R. vmrs r0, fpscr [0,12] . D=======eER str r0, [r1, #72] [0,13] . D=eE------R add.w r0, r1, #96 Running llvm-mca --timeline on the new code reports: 012 Index 0123456789 [0,0] DeeeeER . . ldr.w r1, [r1, #472] [0,1] D====eER . . add.w r0, r1, #16 [0,2] D=====eeeeeER stm.w r0, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr} [0,3] .DeE--------R add r2, sp, #16 [0,4] .D=====eE---R strd r2, r3, [r1, #56] [0,5] .D----------R mrs r0, apsr [0,6] .DeeE-------R bfi r0, lr, #5, #1 [0,7] . D=====eE--R str r0, [r1, #64] [0,8] . DeE-------R mov.w r0, #0 [0,9] . D======eE-R str r0, [r1, #68] [0,10] . D=====E--R vmrs r0, fpscr [0,11] . D======eER str r0, [r1, #72] [0,12] . D=eE-----R add.w r0, r1, #96 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..8c8750153df 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1157,8 +1157,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "add r0, r1, #0x10\n\t" "stm r0, {r4-r12,lr}\n\t" "add r2, sp, #0x10\n\t" - "str r2, [r1, #0x38]\n\t" - "str r3, [r1, #0x3c]\n\t" + "strd r2, r3, [r1, #0x38]\n\t" "mrs r0, CPSR\n\t" "bfi r0, lr, #5, #1\n\t" /* set thumb bit */ "str r0, [r1, #0x40]\n\t" -- 2.35.1

5 8

[PATCH 6/6] d3dcompiler: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dcompiler_33/Makefile.in | 2 +- dlls/d3dcompiler_34/Makefile.in | 2 +- dlls/d3dcompiler_35/Makefile.in | 2 +- dlls/d3dcompiler_36/Makefile.in | 2 +- dlls/d3dcompiler_37/Makefile.in | 2 +- dlls/d3dcompiler_38/Makefile.in | 2 +- dlls/d3dcompiler_39/Makefile.in | 2 +- dlls/d3dcompiler_40/Makefile.in | 2 +- dlls/d3dcompiler_41/Makefile.in | 2 +- dlls/d3dcompiler_42/Makefile.in | 2 +- dlls/d3dcompiler_43/Makefile.in | 2 +- dlls/d3dcompiler_43/asmparser.c | 22 ++++---- dlls/d3dcompiler_43/blob.c | 26 ++++----- dlls/d3dcompiler_43/bytecodewriter.c | 81 ++++++++++++++-------------- dlls/d3dcompiler_43/compiler.c | 16 +++--- dlls/d3dcompiler_43/reflection.c | 43 +++++++-------- dlls/d3dcompiler_43/utils.c | 49 ++++++++--------- dlls/d3dcompiler_46/Makefile.in | 2 +- dlls/d3dcompiler_47/Makefile.in | 2 +- 19 files changed, 129 insertions(+), 134 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c14c691bcd3..7130fb48376 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_33.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=33 +EXTRADEFS = -DD3D_COMPILER_VERSION=33 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9f861992476..e4dfc72cae8 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_34.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=34 +EXTRADEFS = -DD3D_COMPILER_VERSION=34 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 775ba345800..56c87186c2e 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_35.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=35 +EXTRADEFS = -DD3D_COMPILER_VERSION=35 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 9ca476790d4..f23ac2cb990 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_36.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=36 +EXTRADEFS = -DD3D_COMPILER_VERSION=36 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index a7d001d0f7c..331f5f5f068 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_37.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=37 +EXTRADEFS = -DD3D_COMPILER_VERSION=37 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index 7c4e49b6911..b34c2322aae 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_38.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=38 +EXTRADEFS = -DD3D_COMPILER_VERSION=38 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 92b8053ea54..cf4dc2cdd83 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_39.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=39 +EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 8e98ae6bfc6..c8d415baf83 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_40.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=40 +EXTRADEFS = -DD3D_COMPILER_VERSION=40 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 43c5672c90b..2fa69b5a18d 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_41.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=41 +EXTRADEFS = -DD3D_COMPILER_VERSION=41 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index e550851fcfd..d821b888bde 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_42.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=42 +EXTRADEFS = -DD3D_COMPILER_VERSION=42 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index aff97a6d3e8..b527f1681d7 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_43.dll IMPORTLIB = d3dcompiler_43 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 7a901576181..fff11969581 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -73,8 +73,8 @@ static void asmparser_end(struct asm_parser *This) { static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float y, float z, float w) { if(!This->shader) return; - TRACE("Adding float constant %u at pos %u\n", reg, This->shader->num_cf); - TRACE_(parsed_shader)("def c%u, %f, %f, %f, %f\n", reg, x, y, z, w); + TRACE("Adding float constant %lu at pos %u.\n", reg, This->shader->num_cf); + TRACE_(parsed_shader)("def c%lu, %f, %f, %f, %f\n", reg, x, y, z, w); if(!add_constF(This->shader, reg, x, y, z, w)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -83,8 +83,8 @@ static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { if(!This->shader) return; - TRACE("Adding boolean constant %u at pos %u\n", reg, This->shader->num_cb); - TRACE_(parsed_shader)("def b%u, %s\n", reg, x ? "true" : "false"); + TRACE("Adding boolean constant %lu at pos %u.\n", reg, This->shader->num_cb); + TRACE_(parsed_shader)("def b%lu, %s\n", reg, x ? "true" : "false"); if(!add_constB(This->shader, reg, x)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -93,8 +93,8 @@ static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { static void asmparser_constI(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w) { if(!This->shader) return; - TRACE("Adding integer constant %u at pos %u\n", reg, This->shader->num_ci); - TRACE_(parsed_shader)("def i%u, %d, %d, %d, %d\n", reg, x, y, z, w); + TRACE("Adding integer constant %lu at pos %u.\n", reg, This->shader->num_ci); + TRACE_(parsed_shader)("def i%lu, %d, %d, %d, %d\n", reg, x, y, z, w); if(!add_constI(This->shader, reg, x, y, z, w)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -240,7 +240,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t case 6: ret.regnum = T6_VARYING; break; case 7: ret.regnum = T7_VARYING; break; default: - FIXME("Unexpected TEXTURE register t%u\n", reg->regnum); + FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum); return *reg; } return ret; @@ -253,7 +253,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t case 2: ret.regnum = T2_REG; break; case 3: ret.regnum = T3_REG; break; default: - FIXME("Unexpected TEXTURE register t%u\n", reg->regnum); + FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum); return *reg; } return ret; @@ -620,7 +620,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { ret.u.writemask = OPTS_WRITEMASK; break; default: - FIXME("Unhandled RASTOUT register %u\n", reg->regnum); + FIXME("Unhandled RASTOUT register %lu.\n", reg->regnum); return *reg; } return ret; @@ -638,7 +638,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { case 6: ret.regnum = OT6_REG; break; case 7: ret.regnum = OT7_REG; break; default: - FIXME("Unhandled TEXCRDOUT regnum %u\n", reg->regnum); + FIXME("Unhandled TEXCRDOUT regnum %lu.\n", reg->regnum); return *reg; } return ret; @@ -650,7 +650,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { case 0: ret.regnum = OD0_REG; break; case 1: ret.regnum = OD1_REG; break; default: - FIXME("Unhandled ATTROUT regnum %u\n", reg->regnum); + FIXME("Unhandled ATTROUT regnum %lu.\n", reg->regnum); return *reg; } return ret; diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index ee23893576d..c8c198fb520 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface) struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedIncrement(&blob->refcount); - TRACE("%p increasing refcount to %u\n", blob, refcount); + TRACE("%p increasing refcount to %lu.\n", blob, refcount); return refcount; } @@ -72,7 +72,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedDecrement(&blob->refcount); - TRACE("%p decreasing refcount to %u\n", blob, refcount); + TRACE("%p decreasing refcount to %lu.\n", blob, refcount); if (!refcount) { @@ -135,7 +135,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) struct d3dcompiler_blob *object; HRESULT hr; - TRACE("data_size %lu, blob %p\n", data_size, blob); + TRACE("data_size %Iu, blob %p.\n", data_size, blob); if (!blob) { @@ -150,7 +150,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) hr = d3dcompiler_blob_init(object, data_size); if (FAILED(hr)) { - WARN("Failed to initialize blob, hr %#x.\n", hr); + WARN("Failed to initialize blob, hr %#lx.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } @@ -222,7 +222,7 @@ static HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D if (!data || !data_size || flags || !blob) { - WARN("Invalid arguments: data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + WARN("Invalid arguments: data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return D3DERR_INVALIDCALL; } @@ -369,7 +369,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT if (!data || !data_size) { - WARN("Invalid arguments: data %p, data_size %lu\n", data, data_size); + WARN("Invalid arguments: data %p, data_size %Iu.\n", data, data_size); return D3DERR_INVALIDCALL; } @@ -420,7 +420,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data, + TRACE("data %p, data_size %Iu, part %s, flags %#x, blob %p.\n", data, data_size, debug_d3dcompiler_d3d_blob_part(part), flags, blob); return d3dcompiler_get_blob_part(data, data_size, part, flags, blob); @@ -428,35 +428,35 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); } HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob) { - TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + TRACE("data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return d3dcompiler_strip_shader(data, data_size, flags, blob); } @@ -490,7 +490,7 @@ HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) if (FAILED(hr = d3dcompiler_blob_init(object, data_size))) { - WARN("Failed to initialize blob, hr %#x.\n", hr); + WARN("Failed to initialise blob, hr %#lx.\n", hr); CloseHandle(file); heap_free(object); return hr; diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index d5e55e2c4ed..2e5e24ea884 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -245,7 +245,7 @@ BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, struct declaration *newdecl; for(i = 0; i < *num; i++) { if((*decl)[i].regnum == regnum && ((*decl)[i].writemask & writemask)) { - WARN("Declaration of register %u already exists, writemask match 0x%x\n", + WARN("Declaration of register %lu already exists, writemask match %#lx.\n", regnum, (*decl)[i].writemask & writemask); } } @@ -285,7 +285,7 @@ BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD mod, DW for(i = 0; i < shader->num_samplers; i++) { if(shader->samplers[i].regnum == regnum) { - WARN("Sampler %u already declared\n", regnum); + WARN("Sampler %lu already declared.\n", regnum); /* This is not an error as far as the assembler is concerned. * Direct3D might refuse to load the compiled shader though */ @@ -456,7 +456,7 @@ static DWORD d3d9_srcmod(DWORD bwriter_srcmod) case BWRITERSPSM_ABSNEG: return D3DSPSM_ABSNEG; case BWRITERSPSM_NOT: return D3DSPSM_NOT; default: - FIXME("Unhandled BWRITERSPSM token %#x.\n", bwriter_srcmod); + FIXME("Unhandled BWRITERSPSM token %#lx.\n", bwriter_srcmod); return 0; } } @@ -483,7 +483,7 @@ static DWORD d3d9_comparetype(DWORD asmshader_comparetype) case BWRITER_COMPARISON_NE: return D3DSPC_NE; case BWRITER_COMPARISON_LE: return D3DSPC_LE; default: - FIXME("Unexpected BWRITER_COMPARISON type %#x.\n", asmshader_comparetype); + FIXME("Unexpected BWRITER_COMPARISON type %#lx.\n", asmshader_comparetype); return 0; } } @@ -495,7 +495,7 @@ static DWORD d3d9_sampler(DWORD bwriter_sampler) if (bwriter_sampler == BWRITERSTT_2D) return D3DSTT_2D; if (bwriter_sampler == BWRITERSTT_CUBE) return D3DSTT_CUBE; if (bwriter_sampler == BWRITERSTT_VOLUME) return D3DSTT_VOLUME; - FIXME("Unexpected BWRITERSAMPLER_TEXTURE_TYPE type %#x.\n", bwriter_sampler); + FIXME("Unexpected BWRITERSAMPLER_TEXTURE_TYPE type %#lx.\n", bwriter_sampler); return 0; } @@ -521,7 +521,7 @@ static DWORD d3d9_register(DWORD bwriter_register) if (bwriter_register == BWRITERSPR_LABEL) return D3DSPR_LABEL; if (bwriter_register == BWRITERSPR_PREDICATE) return D3DSPR_PREDICATE; - FIXME("Unexpected BWRITERSPR %#x.\n", bwriter_register); + FIXME("Unexpected BWRITERSPR %#lx.\n", bwriter_register); return ~0U; } @@ -620,7 +620,7 @@ static DWORD d3d9_opcode(DWORD bwriter_opcode) case BWRITERSIO_TEXLDB: return D3DSIO_TEX | D3DSI_TEXLD_BIAS; default: - FIXME("Unhandled BWRITERSIO token %#x.\n", bwriter_opcode); + FIXME("Unhandled BWRITERSIO token %#lx.\n", bwriter_opcode); return ~0U; } } @@ -715,29 +715,29 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr case BWRITERDECLUSAGE_POSITION: case BWRITERDECLUSAGE_POSITIONT: if(usage_idx > 0) { - WARN("dcl_position%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_position%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } - TRACE("o%u is oPos\n", regnum); + TRACE("o%lu is oPos.\n", regnum); This->oPos_regnum = regnum; break; case BWRITERDECLUSAGE_COLOR: if(usage_idx > 1) { - WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_ALL) { WARN("Only WRITEMASK_ALL is supported on color in sm 1/2\n"); return E_INVALIDARG; } - TRACE("o%u is oD%u\n", regnum, usage_idx); + TRACE("o%lu is oD%lu.\n", regnum, usage_idx); This->oD_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_TEXCOORD: if(usage_idx >= 8) { - WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != (BWRITERSP_WRITEMASK_0) && @@ -747,23 +747,23 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr WARN("Partial writemasks not supported on texture coordinates in sm 1 and 2\n"); return E_INVALIDARG; } - TRACE("o%u is oT%u\n", regnum, usage_idx); + TRACE("o%lu is oT%lu.\n", regnum, usage_idx); This->oT_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_PSIZE: if(usage_idx > 0) { - WARN("dcl_psize%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_psize%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } - TRACE("o%u writemask 0x%08x is oPts\n", regnum, writemask); + TRACE("o%lu writemask 0x%08lx is oPts.\n", regnum, writemask); This->oPts_regnum = regnum; This->oPts_mask = writemask; break; case BWRITERDECLUSAGE_FOG: if(usage_idx > 0) { - WARN("dcl_fog%u not supported in sm 1 shaders\n", usage_idx); + WARN("dcl_fog%lu not supported in sm 1 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_0 && writemask != BWRITERSP_WRITEMASK_1 && @@ -771,13 +771,13 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr WARN("Unsupported fog writemask\n"); return E_INVALIDARG; } - TRACE("o%u writemask 0x%08x is oFog\n", regnum, writemask); + TRACE("o%lu writemask 0x%08lx is oFog.\n", regnum, writemask); This->oFog_regnum = regnum; This->oFog_mask = writemask; break; default: - WARN("Varying type %u is not supported in shader model 1.x\n", usage); + WARN("Varying type %lu is not supported in shader model 1.x.\n", usage); return E_INVALIDARG; } } @@ -825,20 +825,20 @@ static HRESULT find_ps_builtin_semantics(struct bc_writer *This, switch(usage) { case BWRITERDECLUSAGE_COLOR: if(usage_idx > 1) { - WARN("dcl_color%u not supported in sm 1 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1 shaders\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_ALL) { WARN("Only WRITEMASK_ALL is supported on color in sm 1\n"); return E_INVALIDARG; } - TRACE("v%u is v%u\n", regnum, usage_idx); + TRACE("v%lu is v%lu\n", regnum, usage_idx); This->v_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_TEXCOORD: if(usage_idx > texcoords) { - WARN("dcl_texcoord%u not supported in this shader version\n", usage_idx); + WARN("dcl_texcoord%lu not supported in this shader version\n", usage_idx); return E_INVALIDARG; } if(writemask != (BWRITERSP_WRITEMASK_0) && @@ -849,12 +849,12 @@ static HRESULT find_ps_builtin_semantics(struct bc_writer *This, } else { writemask = BWRITERSP_WRITEMASK_ALL; } - TRACE("v%u is t%u\n", regnum, usage_idx); + TRACE("v%lu is t%lu\n", regnum, usage_idx); This->t_regnum[usage_idx] = regnum; break; default: - WARN("Varying type %u is not supported in shader model 1.x\n", usage); + WARN("Varying type %lu is not supported in shader model 1.x\n", usage); return E_INVALIDARG; } } @@ -934,7 +934,7 @@ static DWORD map_vs_output(struct bc_writer *This, DWORD regnum, DWORD mask, DWO /* The varying must be undeclared - if an unsupported varying was declared, * the vs_find_builtin_varyings function would have caught it and this code * would not run */ - WARN("Undeclared varying %u\n", regnum); + WARN("Undeclared varying %lu.\n", regnum); This->state = E_INVALIDARG; return -1; } @@ -961,7 +961,7 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1050,7 +1050,7 @@ static void vs_1_x_srcreg(struct bc_writer *This, const struct shader_reg *reg, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1163,7 +1163,7 @@ static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *re if(reg->srcmod == BWRITERSPSM_DZ || reg->srcmod == BWRITERSPSM_DW || reg->srcmod == BWRITERSPSM_ABS || reg->srcmod == BWRITERSPSM_ABSNEG || reg->srcmod == BWRITERSPSM_NOT) { - WARN("Invalid source modifier %u for <= ps_1_3\n", reg->srcmod); + WARN("Invalid source modifier %lu for <= ps_1_3.\n", reg->srcmod); This->state = E_INVALIDARG; return; } @@ -1292,7 +1292,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, if(instr->src[1].type != BWRITERSPR_SAMPLER || instr->src[1].regnum > 3) { - WARN("Unsupported sampler type %u regnum %u\n", + WARN("Unsupported sampler type %lu regnum %lu.\n", instr->src[1].type, instr->src[1].regnum); This->state = E_INVALIDARG; return; @@ -1307,7 +1307,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, (idx == 1 && instr->dst.regnum != T1_REG) || (idx == 2 && instr->dst.regnum != T2_REG) || (idx == 3 && instr->dst.regnum != T3_REG)) { - WARN("Sampling from sampler s%u to register r%u is not possible in ps_1_x\n", + WARN("Sampling from sampler s%lu to register r%lu is not possible in ps_1_x.\n", idx, instr->dst.regnum); This->state = E_INVALIDARG; return; @@ -1315,7 +1315,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, if(instr->src[0].type == BWRITERSPR_INPUT) { /* A simple non-dependent read tex instruction */ if(instr->src[0].regnum != This->t_regnum[idx]) { - WARN("Cannot sample from s%u with texture address data from interpolator %u\n", + WARN("Cannot sample from s%lu with texture address data from interpolator %lu.\n", idx, instr->src[0].regnum); This->state = E_INVALIDARG; return; @@ -1337,7 +1337,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, TRACE("writing texreg2gb\n"); This->funcs->opcode(This, instr, D3DSIO_TEXREG2GB & D3DSI_OPCODE_MASK, buffer); } else { - WARN("Unsupported src addr swizzle in dependent texld: 0x%08x\n", instr->src[0].u.swizzle); + WARN("Unsupported src addr swizzle in dependent texld: 0x%08lx.\n", instr->src[0].u.swizzle); This->state = E_INVALIDARG; return; } @@ -1462,7 +1462,7 @@ static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, if(reg->srcmod == BWRITERSPSM_ABS || reg->srcmod == BWRITERSPSM_ABSNEG || reg->srcmod == BWRITERSPSM_NOT) { - WARN("Invalid source modifier %u for ps_1_4\n", reg->srcmod); + WARN("Invalid source modifier %lu for ps_1_4.\n", reg->srcmod); This->state = E_INVALIDARG; return; } @@ -1538,7 +1538,7 @@ static void instr_ps_1_4_texld(struct bc_writer *This, struct bytecode_buffer *buffer) { if(instr->src[1].type != BWRITERSPR_SAMPLER || instr->src[1].regnum > 5) { - WARN("Unsupported sampler type %u regnum %u\n", + WARN("Unsupported sampler type %lu regnum %lu.\n", instr->src[1].type, instr->src[1].regnum); This->state = E_INVALIDARG; return; @@ -1549,7 +1549,7 @@ static void instr_ps_1_4_texld(struct bc_writer *This, } if(instr->src[1].regnum != instr->dst.regnum) { - WARN("Sampling from sampler s%u to register r%u is not possible in ps_1_4\n", + WARN("Sampling from sampler s%lu to register r%lu is not possible in ps_1_4.\n", instr->src[1].regnum, instr->dst.regnum); This->state = E_INVALIDARG; return; @@ -1654,7 +1654,7 @@ static void vs_2_srcreg(struct bc_writer *This, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1920,8 +1920,9 @@ static void ps_2_srcreg(struct bc_writer *This, WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } - if(reg->regnum) { - WARN("Predicate register with regnum %u not supported\n", + if (reg->regnum) + { + WARN("Predicate register with regnum %lu not supported.\n", reg->regnum); This->state = E_INVALIDARG; } @@ -2130,7 +2131,7 @@ static void sm_3_srcreg(struct bc_writer *This, if(reg->rel_reg) { if (reg->type == BWRITERSPR_CONST && shader->type == ST_PIXEL) { - WARN("c%u[...] is unsupported in ps_3_0\n", reg->regnum); + WARN("c%lu[...] is unsupported in ps_3_0.\n", reg->regnum); This->state = E_INVALIDARG; return; } @@ -2359,7 +2360,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, while(writer->funcs->instructions[i].opcode != BWRITERSIO_END) { if(instr->opcode == writer->funcs->instructions[i].opcode) { if(!writer->funcs->instructions[i].func) { - WARN("Opcode %u not supported by this profile\n", instr->opcode); + WARN("Opcode %lu not supported by this profile.\n", instr->opcode); return E_INVALIDARG; } writer->funcs->instructions[i].func(writer, instr, buffer); @@ -2368,7 +2369,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, i++; } - FIXME("Unhandled instruction %u - %s\n", instr->opcode, + FIXME("Unhandled instruction %lu - %s.\n", instr->opcode, debug_print_opcode(instr->opcode)); return E_INVALIDARG; } diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 112e82d6d44..d7d2e1e681d 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -689,7 +689,7 @@ static HRESULT assemble_shader(const char *preproc_shader, SlDeleteShader(shader); if (FAILED(hr)) { - ERR("Failed to write bytecode, hr %#x.\n", hr); + ERR("Failed to write bytecode, hr %#lx.\n", hr); return D3DXERR_INVALIDDATA; } @@ -716,7 +716,7 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena { HRESULT hr; - TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x, " + TRACE("data %p, datasize %Iu, filename %s, defines %p, include %p, sflags %#x, " "shader %p, error_messages %p.\n", data, datasize, debugstr_a(filename), defines, include, flags, shader, error_messages); @@ -745,9 +745,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { HRESULT hr; - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, " - "secondary_data_size %lu, shader %p, error_messages %p.\n", + "secondary_data_size %Iu, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, secondary_data_size, shader, error_messages); @@ -776,7 +776,7 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages); @@ -792,7 +792,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; ID3DBlob *buffer; - TRACE("data %p, size %lu, filename %s, defines %p, include %p, shader %p, error_messages %p\n", + TRACE("data %p, size %Iu, filename %s, defines %p, include %p, shader %p, error_messages %p.\n", data, size, debugstr_a(filename), defines, include, shader, error_messages); if (!data) @@ -827,7 +827,7 @@ cleanup: HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly) { - FIXME("data %p, size %lu, flags %#x, comments %p, disassembly %p stub!\n", + FIXME("data %p, size %Iu, flags %#x, comments %p, disassembly %p stub!\n", data, size, flags, comments, disassembly); return E_NOTIMPL; } @@ -881,6 +881,6 @@ end: HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) { - FIXME("data %p, size %lu, module %p stub!\n", data, size, module); + FIXME("data %p, size %Iu, module %p stub!\n", data, size, module); return E_NOTIMPL; } diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 69970136390..cbcf8246b70 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,9 +18,6 @@ * */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #include "initguid.h" #include "d3dcompiler_private.h" #include "d3d10.h" @@ -365,7 +362,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11Shader struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu.\n", This, refcount); return refcount; } @@ -375,7 +372,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&This->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %lu.\n", This, refcount); if (!refcount) { @@ -1095,7 +1092,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c const char *ptr = data; DWORD size = data_size >> 2; - TRACE("Size %u\n", size); + TRACE("Size %lu\n", size); r->instruction_count = read_dword(&ptr); TRACE("InstructionCount: %u\n", r->instruction_count); @@ -1202,7 +1199,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c /* dx11 stat size */ if (size == 37) return S_OK; - FIXME("Unhandled size %u\n", size); + FIXME("Unhandled size %lu.\n", size); return E_FAIL; } @@ -1221,7 +1218,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti TRACE("Member name: %s.\n", debugstr_a(member->name)); offset = read_dword(ptr); - TRACE("Member type offset: %x\n", offset); + TRACE("Member type offset: %#lx\n", offset); member->type = get_reflection_type(ref, data, offset); if (!member->type) @@ -1232,7 +1229,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti } member->offset = read_dword(ptr); - TRACE("Member offset %x\n", member->offset); + TRACE("Member offset %#lx\n", member->offset); return S_OK; } @@ -1266,7 +1263,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type TRACE("Elements %u, Members %u\n", desc->Elements, desc->Members); member_offset = read_dword(&ptr); - TRACE("Member Offset %u\n", member_offset); + TRACE("Member Offset %lu\n", member_offset); if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); @@ -1344,7 +1341,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d hr = d3dcompiler_parse_type(type, data, offset); if (FAILED(hr)) { - ERR("Failed to parse type info, hr %#x.\n", hr); + ERR("Failed to parse type info, hr %#lx.\n", hr); HeapFree(GetProcessHeap(), 0, type); return NULL; } @@ -1401,7 +1398,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ TRACE("Variable flags: %u\n", v->flags); offset = read_dword(&ptr); - TRACE("Variable type offset: %x\n", offset); + TRACE("Variable type offset: %#lx.\n", offset); v->type = get_reflection_type(cb->reflection, data, offset); if (!v->type) { @@ -1411,7 +1408,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ } offset = read_dword(&ptr); - TRACE("Variable default value offset: %x\n", offset); + TRACE("Variable default value offset: %#lx.\n", offset); if (!copy_value(data + offset, &v->default_value, offset ? v->size : 0)) { ERR("Failed to copy name.\n"); @@ -1448,29 +1445,29 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c DWORD target_version; HRESULT hr; - TRACE("Size %u\n", size); + TRACE("Size %lu\n", size); r->constant_buffer_count = read_dword(&ptr); TRACE("Constant buffer count: %u\n", r->constant_buffer_count); cbuffer_offset = read_dword(&ptr); - TRACE("Constant buffer offset: %#x\n", cbuffer_offset); + TRACE("Constant buffer offset: %#lx\n", cbuffer_offset); r->bound_resource_count = read_dword(&ptr); TRACE("Bound resource count: %u\n", r->bound_resource_count); resource_offset = read_dword(&ptr); - TRACE("Bound resource offset: %#x\n", resource_offset); + TRACE("Bound resource offset: %#lx\n", resource_offset); r->target = read_dword(&ptr); - TRACE("Target: %#x\n", r->target); + TRACE("Target: %#lx\n", r->target); target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; #if D3D_COMPILER_VERSION < 47 if (target_version >= 0x501) { - WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); + WARN("Target version %#lx is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); return E_INVALIDARG; } #endif @@ -1479,7 +1476,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Flags: %u\n", r->flags); creator_offset = read_dword(&ptr); - TRACE("Creator at offset %#x.\n", creator_offset); + TRACE("Creator at offset %#lx.\n", creator_offset); if (!copy_name(data + creator_offset, &creator)) { @@ -1594,7 +1591,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Variable count: %u\n", cb->variable_count); offset = read_dword(&ptr); - TRACE("Variable offset: %x\n", offset); + TRACE("Variable offset: %#lx\n", offset); hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); if (hr != S_OK) @@ -1664,7 +1661,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * } count = read_dword(&ptr); - TRACE("%u elements\n", count); + TRACE("%lu elements\n", count); skip_dword_unknown(&ptr, 1); @@ -1901,7 +1898,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&reflection->refcount); - TRACE("%p increasing refcount to %u.\n", reflection, refcount); + TRACE("%p increasing refcount to %lu.\n", reflection, refcount); return refcount; } @@ -1911,7 +1908,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&reflection->refcount); - TRACE("%p decreasing refcount to %u.\n", reflection, refcount); + TRACE("%p decreasing refcount to %lu.\n", reflection, refcount); if (!refcount) heap_free(reflection); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 84f776626ba..7d5c5395d6a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -21,9 +21,6 @@ * */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #include <stdio.h> #include "d3dcompiler_private.h" @@ -146,7 +143,7 @@ const char *debug_print_srcmod(DWORD mod) WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_ABSNEG); WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_NOT); default: - FIXME("Unrecognized source modifier %#x.\n", mod); + FIXME("Unrecognized source modifier %#lx.\n", mod); return "unrecognized_src_mod"; } } @@ -207,15 +204,15 @@ static const char *get_regname(const struct shader_reg *reg) switch (reg->type) { case BWRITERSPR_TEMP: - return wine_dbg_sprintf("r%u", reg->regnum); + return wine_dbg_sprintf("r%lu", reg->regnum); case BWRITERSPR_INPUT: - return wine_dbg_sprintf("v%u", reg->regnum); + return wine_dbg_sprintf("v%lu", reg->regnum); case BWRITERSPR_CONST: - return wine_dbg_sprintf("c%u", reg->regnum); + return wine_dbg_sprintf("c%lu", reg->regnum); case BWRITERSPR_ADDR: - return wine_dbg_sprintf("a%u", reg->regnum); + return wine_dbg_sprintf("a%lu", reg->regnum); case BWRITERSPR_TEXTURE: - return wine_dbg_sprintf("t%u", reg->regnum); + return wine_dbg_sprintf("t%lu", reg->regnum); case BWRITERSPR_RASTOUT: switch (reg->regnum) { @@ -225,21 +222,21 @@ static const char *get_regname(const struct shader_reg *reg) default: return "Unexpected RASTOUT"; } case BWRITERSPR_ATTROUT: - return wine_dbg_sprintf("oD%u", reg->regnum); + return wine_dbg_sprintf("oD%lu", reg->regnum); case BWRITERSPR_TEXCRDOUT: - return wine_dbg_sprintf("oT%u", reg->regnum); + return wine_dbg_sprintf("oT%lu", reg->regnum); case BWRITERSPR_OUTPUT: - return wine_dbg_sprintf("o%u", reg->regnum); + return wine_dbg_sprintf("o%lu", reg->regnum); case BWRITERSPR_CONSTINT: - return wine_dbg_sprintf("i%u", reg->regnum); + return wine_dbg_sprintf("i%lu", reg->regnum); case BWRITERSPR_COLOROUT: - return wine_dbg_sprintf("oC%u", reg->regnum); + return wine_dbg_sprintf("oC%lu", reg->regnum); case BWRITERSPR_DEPTHOUT: return "oDepth"; case BWRITERSPR_SAMPLER: - return wine_dbg_sprintf("s%u", reg->regnum); + return wine_dbg_sprintf("s%lu", reg->regnum); case BWRITERSPR_CONSTBOOL: - return wine_dbg_sprintf("b%u", reg->regnum); + return wine_dbg_sprintf("b%lu", reg->regnum); case BWRITERSPR_LOOP: return "aL"; case BWRITERSPR_MISCTYPE: @@ -250,11 +247,11 @@ static const char *get_regname(const struct shader_reg *reg) default: return "unexpected misctype"; } case BWRITERSPR_LABEL: - return wine_dbg_sprintf("l%u", reg->regnum); + return wine_dbg_sprintf("l%lu", reg->regnum); case BWRITERSPR_PREDICATE: - return wine_dbg_sprintf("p%u", reg->regnum); + return wine_dbg_sprintf("p%lu", reg->regnum); default: - return wine_dbg_sprintf("unknown regname %#x", reg->type); + return wine_dbg_sprintf("unknown regname %#lx", reg->type); } } @@ -323,7 +320,7 @@ static const char *debug_print_relarg(const struct shader_reg *reg) short_swizzle = debug_print_swizzle(reg->rel_reg->u.swizzle); if (reg->rel_reg->type == BWRITERSPR_ADDR) - return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle); + return wine_dbg_sprintf("[a%lu%s]", reg->rel_reg->regnum, short_swizzle); else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) return wine_dbg_sprintf("[aL%s]", short_swizzle); else @@ -519,19 +516,19 @@ void skip_dword_unknown(const char **ptr, unsigned int count) for (i = 0; i < count; ++i) { d = read_dword(ptr); - FIXME("\t0x%08x\n", d); + FIXME("\t0x%08lx\n", d); } } static void write_dword_unknown(char **ptr, DWORD d) { - FIXME("Writing unknown DWORD 0x%08x\n", d); + FIXME("Writing unknown DWORD 0x%08lx.\n", d); write_dword(ptr, d); } HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) { - TRACE("dxbc %p, tag %s, size %#x.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size); + TRACE("dxbc %p, tag %s, size %#lx.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size); if (dxbc->count >= dxbc->size) { @@ -605,7 +602,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) skip_dword_unknown(&ptr, 1); total_size = read_dword(&ptr); - TRACE("total size: %#x\n", total_size); + TRACE("total size: %#lx\n", total_size); if (data_size != total_size) { @@ -614,7 +611,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) } chunk_count = read_dword(&ptr); - TRACE("chunk count: %#x\n", chunk_count); + TRACE("chunk count: %#lx\n", chunk_count); hr = dxbc_init(dxbc, chunk_count); if (FAILED(hr)) @@ -630,7 +627,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DWORD chunk_offset; chunk_offset = read_dword(&ptr); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); + TRACE("chunk %u at offset %#lx\n", i, chunk_offset); chunk_ptr = data + chunk_offset; diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index b3bdcb6a630..066bd6fdd1c 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_46.dll IMPORTLIB = d3dcompiler_46 IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index b19b6d5fe39..379f0aa4b3a 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_47.dll IMPORTLIB = d3dcompiler IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native -- 2.30.2

1 0

[PATCH 5/6] d3d10: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10_main.c | 24 ++-- dlls/d3d10/effect.c | 228 +++++++++++++++---------------- dlls/d3d10/shader.c | 2 +- dlls/d3d10/stateblock.c | 4 +- dlls/d3dcompiler_43/reflection.c | 7 +- dlls/d3dcompiler_43/utils.c | 3 + 7 files changed, 138 insertions(+), 132 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 38d2055ecd9..1b869f47f6c 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3d10.dll IMPORTLIB = d3d10 IMPORTS = uuid d3d10core d3dcompiler dxgi -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../d3dcompiler_43 C_SRCS = \ diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6961589ca31..82c2ecc2ec9 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -64,7 +64,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to get dxgi factory, returning %#x.\n", hr); + WARN("Failed to get dxgi factory, returning %#lx.\n", hr); return hr; } } @@ -73,7 +73,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to create dxgi factory, returning %#x.\n", hr); + WARN("Failed to create dxgi factory, returning %#lx.\n", hr); return hr; } @@ -86,7 +86,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (FAILED(hr)) { - WARN("No adapters found, returning %#x.\n", hr); + WARN("No adapters found, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -109,7 +109,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv FreeLibrary(refrast); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x.\n", hr); + WARN("Failed to create a software adapter, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -127,7 +127,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x.\n", hr); + WARN("Failed to create a software adapter, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -146,7 +146,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a device, returning %#x.\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); return hr; } @@ -178,7 +178,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER * hooking these entry-points. */ if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { - WARN("Failed to create a device, returning %#x\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); *device = NULL; return hr; } @@ -188,7 +188,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER hr = ID3D10Device_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device); if (FAILED(hr)) { - ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr); + ERR("Failed to get a dxgi device from the d3d10 device, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -198,7 +198,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - ERR("Failed to get the device adapter, returning %#x\n", hr); + ERR("Failed to get the device adapter, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -208,7 +208,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIAdapter_Release(adapter); if (FAILED(hr)) { - ERR("Failed to get the adapter factory, returning %#x\n", hr); + ERR("Failed to get the adapter factory, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -221,7 +221,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER ID3D10Device_Release(*device); *device = NULL; - WARN("Failed to create a swapchain, returning %#x\n", hr); + WARN("Failed to create a swapchain, returning %#lx.\n", hr); return hr; } @@ -234,7 +234,7 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, " "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 68afc061d1e..bb105beee6d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -778,7 +778,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende if (FAILED(hr = d3d10_effect_preshader_eval(&d->index_expr.index))) { - WARN("Failed to evaluate index expression, hr %#x.\n", hr); + WARN("Failed to evaluate index expression, hr %#lx.\n", hr); return; } @@ -786,7 +786,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende if (variable_idx >= v->type->element_count) { - WARN("Expression evaluated to invalid index value %u, array %s of size %u.\n", + WARN("Expression evaluated to invalid index value %u, array %s of size %lu.\n", variable_idx, debugstr_a(v->name), v->type->element_count); variable_idx = 0; } @@ -861,7 +861,7 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned for (i = 0; i < count; ++i) { d = read_dword(ptr); - FIXME("\t0x%08x\n", d); + FIXME("\t0x%08lx\n", d); } } @@ -894,15 +894,15 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, skip_dword_unknown("DXBC checksum", &ptr, 4); version = read_dword(&ptr); - TRACE("version: %#x.\n", version); + TRACE("version: %#lx.\n", version); if (version != 0x00000001) { - WARN("Got unexpected DXBC version %#x.\n", version); + WARN("Got unexpected DXBC version %#lx.\n", version); return E_FAIL; } total_size = read_dword(&ptr); - TRACE("total size: %#x\n", total_size); + TRACE("total size: %#lx\n", total_size); if (data_size != total_size) { @@ -911,7 +911,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, } chunk_count = read_dword(&ptr); - TRACE("chunk count: %#x\n", chunk_count); + TRACE("chunk count: %#lx\n", chunk_count); for (i = 0; i < chunk_count; ++i) { @@ -920,11 +920,11 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_offset; chunk_offset = read_dword(&ptr); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); + TRACE("chunk %u at offset %#lx\n", i, chunk_offset); if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + WARN("Invalid chunk offset %#lx (data size %#Ix).\n", chunk_offset, data_size); return E_FAIL; } @@ -935,7 +935,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", + WARN("Invalid chunk size %#lx (data size %#Ix, chunk offset %#lx).\n", chunk_size, data_size, chunk_offset); return E_FAIL; } @@ -953,7 +953,7 @@ static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, co if (offset >= data_size) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return FALSE; } @@ -1264,17 +1264,17 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } ptr = data + offset; dxbc_size = read_dword(&ptr); - TRACE("dxbc size: %#x\n", dxbc_size); + TRACE("dxbc size: %#lx\n", dxbc_size); if (!require_space(ptr - data, 1, dxbc_size, data_size)) { - WARN("Invalid dxbc size %#x (data size %#lx, offset %#x).\n", offset, (long)data_size, offset); + WARN("Invalid dxbc size %#lx (data size %#Ix, offset %#lx).\n", offset, data_size, offset); return E_FAIL; } @@ -1311,7 +1311,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (FAILED(hr = d3d10_effect_parse_stream_output_declaration(v->u.shader.stream_output_declaration, &so_decl))) { - WARN("Failed to parse stream output declaration, hr %#x.\n", hr); + WARN("Failed to parse stream output declaration, hr %#lx.\n", hr); break; } @@ -1341,7 +1341,7 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ case 3: if (is_column_major) return D3D10_SVC_MATRIX_COLUMNS; else return D3D10_SVC_MATRIX_ROWS; default: - FIXME("Unknown variable class %#x.\n", c); + FIXME("Unknown variable class %#lx.\n", c); return 0; } } @@ -1381,7 +1381,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, case 21: return D3D10_SVT_SAMPLER; case 22: return D3D10_SVT_BUFFER; default: - FIXME("Unknown variable type %#x.\n", t); + FIXME("Unknown variable type %#lx.\n", t); return D3D10_SVT_VOID; } } @@ -1394,7 +1394,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, case 3: return D3D10_SVT_UINT; case 4: return D3D10_SVT_BOOL; default: - FIXME("Unknown variable type %#x.\n", t); + FIXME("Unknown variable type %#lx.\n", t); return D3D10_SVT_VOID; } } @@ -1408,13 +1408,13 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } ptr = data + offset; offset = read_dword(&ptr); - TRACE("Type name at offset %#x.\n", offset); + TRACE("Type name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) { @@ -1427,16 +1427,16 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Kind: %u.\n", type_kind); t->element_count = read_dword(&ptr); - TRACE("Element count: %u.\n", t->element_count); + TRACE("Element count: %lu.\n", t->element_count); t->size_unpacked = read_dword(&ptr); - TRACE("Unpacked size: %#x.\n", t->size_unpacked); + TRACE("Unpacked size: %#lx.\n", t->size_unpacked); t->stride = read_dword(&ptr); - TRACE("Stride: %#x.\n", t->stride); + TRACE("Stride: %#lx.\n", t->stride); t->size_packed = read_dword(&ptr); - TRACE("Packed size %#x.\n", t->size_packed); + TRACE("Packed size %#lx.\n", t->size_packed); switch (type_kind) { @@ -1445,7 +1445,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } @@ -1457,8 +1457,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); - TRACE("\tcolumns: %u.\n", t->column_count); - TRACE("\trows: %u.\n", t->row_count); + TRACE("\tcolumns: %lu.\n", t->column_count); + TRACE("\trows: %lu.\n", t->row_count); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", typeinfo & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK @@ -1470,7 +1470,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } @@ -1493,12 +1493,12 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(t->member_count), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } t->member_count = read_dword(&ptr); - TRACE("Member count: %u.\n", t->member_count); + TRACE("Member count: %lu.\n", t->member_count); t->column_count = 0; t->row_count = 0; @@ -1513,8 +1513,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, t->member_count, 4 * sizeof(DWORD), data_size)) { - WARN("Invalid member count %#x (data size %#lx, offset %#x).\n", - t->member_count, (long)data_size, offset); + WARN("Invalid member count %#lx (data size %#Ix, offset %#lx).\n", + t->member_count, data_size, offset); return E_FAIL; } @@ -1523,7 +1523,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type_member *typem = &t->members[i]; offset = read_dword(&ptr); - TRACE("Member name at offset %#x.\n", offset); + TRACE("Member name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->name)) { @@ -1533,7 +1533,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Member name: %s.\n", debugstr_a(typem->name)); offset = read_dword(&ptr); - TRACE("Member semantic at offset %#x.\n", offset); + TRACE("Member semantic at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->semantic)) { @@ -1543,10 +1543,10 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); typem->buffer_offset = read_dword(&ptr); - TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); + TRACE("Member offset in struct: %#lx.\n", typem->buffer_offset); offset = read_dword(&ptr); - TRACE("Member type info at offset %#x.\n", offset); + TRACE("Member type info at offset %#lx.\n", offset); if (!(typem->type = get_fx10_type(t->effect, data, data_size, offset))) { @@ -1563,7 +1563,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (t->element_count) { - TRACE("Elementtype for type at offset: %#x\n", t->id); + TRACE("Elementtype for type at offset: %#lx\n", t->id); /* allocate elementtype - we need only one, because all elements have the same type */ if (!(t->elementtype = heap_alloc_zero(sizeof(*t->elementtype)))) @@ -1584,29 +1584,29 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("\tType name: %s.\n", debugstr_a(t->elementtype->name)); t->elementtype->element_count = 0; - TRACE("\tElement count: %u.\n", t->elementtype->element_count); + TRACE("\tElement count: %lu.\n", t->elementtype->element_count); /* * Not sure if this calculation is 100% correct, but a test * shows that these values work. */ t->elementtype->size_unpacked = t->size_packed / t->element_count; - TRACE("\tUnpacked size: %#x.\n", t->elementtype->size_unpacked); + TRACE("\tUnpacked size: %#lx.\n", t->elementtype->size_unpacked); t->elementtype->stride = t->stride; - TRACE("\tStride: %#x.\n", t->elementtype->stride); + TRACE("\tStride: %#lx.\n", t->elementtype->stride); t->elementtype->size_packed = t->size_packed / t->element_count; - TRACE("\tPacked size: %#x.\n", t->elementtype->size_packed); + TRACE("\tPacked size: %#lx.\n", t->elementtype->size_packed); t->elementtype->member_count = t->member_count; - TRACE("\tMember count: %u.\n", t->elementtype->member_count); + TRACE("\tMember count: %lu.\n", t->elementtype->member_count); t->elementtype->column_count = t->column_count; - TRACE("\tColumns: %u.\n", t->elementtype->column_count); + TRACE("\tColumns: %lu.\n", t->elementtype->column_count); t->elementtype->row_count = t->row_count; - TRACE("\tRows: %u.\n", t->elementtype->row_count); + TRACE("\tRows: %lu.\n", t->elementtype->row_count); t->elementtype->basetype = t->basetype; TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(t->elementtype->basetype)); @@ -1645,7 +1645,7 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, type->effect = effect; if (FAILED(hr = parse_fx10_type(data, data_size, offset, type))) { - ERR("Failed to parse type info, hr %#x.\n", hr); + ERR("Failed to parse type info, hr %#lx.\n", hr); heap_free(type); return NULL; } @@ -1785,7 +1785,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) TRACE("Variable semantic: %s.\n", debugstr_a(var->semantic)); var->buffer_offset = v->buffer_offset + typem->buffer_offset; - TRACE("Variable buffer offset: %u.\n", var->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", var->buffer_offset); hr = copy_variableinfo_from_type(var); if (FAILED(hr)) return hr; @@ -1830,7 +1830,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) bufferoffset += v->type->stride; } var->buffer_offset = bufferoffset; - TRACE("Variable buffer offset: %u.\n", var->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", var->buffer_offset); hr = copy_variableinfo_from_type(var); if (FAILED(hr)) return hr; @@ -1846,7 +1846,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, DWORD offset; offset = read_dword(ptr); - TRACE("Variable name at offset %#x.\n", offset); + TRACE("Variable name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->name)) { @@ -1856,7 +1856,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, TRACE("Variable name: %s.\n", debugstr_a(v->name)); offset = read_dword(ptr); - TRACE("Variable type info at offset %#x.\n", offset); + TRACE("Variable type info at offset %#lx.\n", offset); if (!(v->type = get_fx10_type(v->effect, data, data_size, offset))) { @@ -1883,7 +1883,7 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, return hr; offset = read_dword(ptr); - TRACE("Annotation value is at offset %#x.\n", offset); + TRACE("Annotation value is at offset %#lx.\n", offset); switch (a->type->basetype) { @@ -2306,7 +2306,7 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si if (!require_space(header.constantinfo, header.constants, sizeof(*info), data_size)) { - WARN("Invalid constant info section offset %#x.\n", header.constantinfo); + WARN("Invalid constant info section offset %#lx.\n", header.constantinfo); return E_FAIL; } @@ -2348,7 +2348,7 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si static HRESULT fxlvm_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - TRACE("Chunk tag: %s, size: %u.\n", debugstr_an((const char *)&tag, 4), data_size); + TRACE("Chunk tag: %s, size: %lu.\n", debugstr_an((const char *)&tag, 4), data_size); switch (tag) { @@ -2510,7 +2510,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size { if (property_info->size * sizeof(float) > variable->type->size_unpacked) { - WARN("Mismatching variable size %u, property size %u.\n", + WARN("Mismatching variable size %lu, property size %u.\n", variable->type->size_unpacked, property_info->size); return E_FAIL; } @@ -2557,7 +2557,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size { if (!variable->type->element_count || variable_idx >= variable->type->element_count) { - WARN("Invalid array size %u.\n", variable->type->element_count); + WARN("Invalid array size %lu.\n", variable->type->element_count); return E_FAIL; } @@ -2663,7 +2663,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size dep.index_expr.v = variable; if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.index_expr.index))) { - WARN("Failed to parse preshader, hr %#x.\n", hr); + WARN("Failed to parse preshader, hr %#lx.\n", hr); return hr; } @@ -2691,7 +2691,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size dep.operation = operation; if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.value_expr.value))) { - WARN("Failed to parse preshader, hr %#x.\n", hr); + WARN("Failed to parse preshader, hr %#lx.\n", hr); return hr; } @@ -2771,7 +2771,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, HRESULT hr; offset = read_dword(ptr); - TRACE("Pass name at offset %#x.\n", offset); + TRACE("Pass name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &p->name)) { @@ -2781,7 +2781,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, TRACE("Pass name: %s.\n", debugstr_a(p->name)); object_count = read_dword(ptr); - TRACE("Pass has %u effect objects.\n", object_count); + TRACE("Pass has %lu effect objects.\n", object_count); p->annotations.count = read_dword(ptr); TRACE("Pass has %u annotations.\n", p->annotations.count); @@ -2789,7 +2789,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, &p->annotations))) { - ERR("Failed to parse pass annotations, hr %#x.\n", hr); + ERR("Failed to parse pass annotations, hr %#lx.\n", hr); return hr; } @@ -2802,7 +2802,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_property_assignment(data, data_size, ptr, D3D10_C_PASS, p->technique->effect, p, &p->dependencies))) { - WARN("Failed to parse pass assignment %u, hr %#x.\n", i, hr); + WARN("Failed to parse pass assignment %u, hr %#lx.\n", i, hr); return hr; } } @@ -2818,7 +2818,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, HRESULT hr; offset = read_dword(ptr); - TRACE("Technique name at offset %#x.\n", offset); + TRACE("Technique name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) { @@ -2828,7 +2828,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, TRACE("Technique name: %s.\n", debugstr_a(t->name)); t->pass_count = read_dword(ptr); - TRACE("Technique has %u passes\n", t->pass_count); + TRACE("Technique has %lu passes.\n", t->pass_count); t->annotations.count = read_dword(ptr); TRACE("Technique has %u annotations.\n", t->annotations.count); @@ -2836,7 +2836,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, &t->annotations))) { - ERR("Failed to parse technique annotations, hr %#x.\n", hr); + ERR("Failed to parse technique annotations, hr %#lx.\n", hr); return hr; } @@ -2974,7 +2974,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, { if (!require_space(default_value_offset, 1, v->type->size_packed, data_size)) { - WARN("Invalid default value offset %#x, variable packed size %u.\n", default_value_offset, + WARN("Invalid default value offset %#x, variable packed size %lu.\n", default_value_offset, v->type->size_packed); return E_FAIL; } @@ -2989,7 +2989,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, &v->annotations))) { - ERR("Failed to parse variable annotations, hr %#x.\n", hr); + ERR("Failed to parse variable annotations, hr %#lx.\n", hr); return hr; } } @@ -3052,7 +3052,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return hr; offset = read_dword(ptr); - TRACE("Variable semantic at offset %#x.\n", offset); + TRACE("Variable semantic at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) { @@ -3062,7 +3062,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); v->explicit_bind_point = read_dword(ptr); - TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); + TRACE("Variable explicit bind point %#lx.\n", v->explicit_bind_point); /* Shared variable description contains only type information. */ if (shared_type_desc) return S_OK; @@ -3114,12 +3114,12 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var = d3d10_array_get_element(v, i); shader_offset = read_dword(ptr); - TRACE("Shader offset: %#x.\n", shader_offset); + TRACE("Shader offset: %#lx.\n", shader_offset); if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { sodecl_offset = read_dword(ptr); - TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + TRACE("Stream output declaration at offset %#lx.\n", sodecl_offset); if (!fx10_copy_string(data, data_size, sodecl_offset, &var->u.shader.stream_output_declaration)) @@ -3152,7 +3152,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (storage_info->size > sizeof(v->u.state.desc)) { - ERR("Invalid storage size %#lx.\n", storage_info->size); + ERR("Invalid storage size %#Ix.\n", storage_info->size); return E_FAIL; } @@ -3221,7 +3221,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, &v->annotations))) { - ERR("Failed to parse variable annotations, hr %#x.\n", hr); + ERR("Failed to parse variable annotations, hr %#lx.\n", hr); return hr; } @@ -3292,7 +3292,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->type->effect = l->effect; offset = read_dword(ptr); - TRACE("%s buffer name at offset %#x.\n", prefix, offset); + TRACE("%s buffer name at offset %#lx.\n", prefix, offset); if (!fx10_copy_string(data, data_size, offset, &l->name)) { @@ -3302,7 +3302,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("%s buffer name: %s.\n", prefix, debugstr_a(l->name)); l->data_size = read_dword(ptr); - TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); + TRACE("%s buffer data size: %#lx.\n", prefix, l->data_size); d3d10_cbuffer_type = read_dword(ptr); TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); @@ -3333,10 +3333,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char } l->type->member_count = read_dword(ptr); - TRACE("%s buffer member count: %#x.\n", prefix, l->type->member_count); + TRACE("%s buffer member count: %#lx.\n", prefix, l->type->member_count); l->explicit_bind_point = read_dword(ptr); - TRACE("%s buffer explicit bind point: %#x.\n", prefix, l->explicit_bind_point); + TRACE("%s buffer explicit bind point: %#lx.\n", prefix, l->explicit_bind_point); if (l->effect->flags & D3D10_EFFECT_IS_POOL) l->flag |= D3D10_EFFECT_VARIABLE_POOLED; @@ -3349,7 +3349,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, &l->annotations))) { - ERR("Failed to parse buffer annotations, hr %#x.\n", hr); + ERR("Failed to parse buffer annotations, hr %#lx.\n", hr); return hr; } } @@ -3404,7 +3404,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("Variable semantic: %s.\n", debugstr_a(typem->semantic)); typem->buffer_offset = v->buffer_offset; - TRACE("Variable buffer offset: %u.\n", typem->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", typem->buffer_offset); l->type->size_packed += v->type->size_packed; @@ -3453,11 +3453,11 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("%s constant buffer:\n", prefix); TRACE("\tType name: %s.\n", debugstr_a(l->type->name)); - TRACE("\tElement count: %u.\n", l->type->element_count); - TRACE("\tMember count: %u.\n", l->type->member_count); - TRACE("\tUnpacked size: %#x.\n", l->type->size_unpacked); - TRACE("\tStride: %#x.\n", l->type->stride); - TRACE("\tPacked size %#x.\n", l->type->size_packed); + TRACE("\tElement count: %lu.\n", l->type->element_count); + TRACE("\tMember count: %lu.\n", l->type->member_count); + TRACE("\tUnpacked size: %#lx.\n", l->type->size_unpacked); + TRACE("\tStride: %#lx.\n", l->type->stride); + TRACE("\tPacked size %#lx.\n", l->type->size_packed); TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); @@ -3465,7 +3465,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char { if (FAILED(hr = create_buffer_object(l))) { - WARN("Failed to create a buffer object, hr %#x.\n", hr); + WARN("Failed to create a buffer object, hr %#lx.\n", hr); return hr; } } @@ -3574,7 +3574,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d if (e->index_offset >= data_size) { - WARN("Invalid index offset %#x (data size %#x).\n", e->index_offset, data_size); + WARN("Invalid index offset %#lx (data size %#lx).\n", e->index_offset, data_size); return E_FAIL; } ptr = data + e->index_offset; @@ -3711,43 +3711,43 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s if (!require_space(0, 19, sizeof(DWORD), data_size)) { - WARN("Invalid data size %#x.\n", data_size); + WARN("Invalid data size %#lx.\n", data_size); return E_INVALIDARG; } /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ e->version = read_dword(&ptr); - TRACE("Target: %#x\n", e->version); + TRACE("Target: %#lx\n", e->version); e->local_buffer_count = read_dword(&ptr); - TRACE("Local buffer count: %u.\n", e->local_buffer_count); + TRACE("Local buffer count: %lu.\n", e->local_buffer_count); e->variable_count = read_dword(&ptr); - TRACE("Variable count: %u\n", e->variable_count); + TRACE("Variable count: %lu\n", e->variable_count); e->local_variable_count = read_dword(&ptr); - TRACE("Object count: %u\n", e->local_variable_count); + TRACE("Object count: %lu\n", e->local_variable_count); e->shared_buffer_count = read_dword(&ptr); - TRACE("Pool buffer count: %u\n", e->shared_buffer_count); + TRACE("Pool buffer count: %lu\n", e->shared_buffer_count); unused = read_dword(&ptr); - TRACE("Pool variable count: %u\n", unused); + TRACE("Pool variable count: %lu\n", unused); e->shared_object_count = read_dword(&ptr); - TRACE("Pool objects count: %u\n", e->shared_object_count); + TRACE("Pool objects count: %lu\n", e->shared_object_count); e->technique_count = read_dword(&ptr); - TRACE("Technique count: %u\n", e->technique_count); + TRACE("Technique count: %lu\n", e->technique_count); e->index_offset = read_dword(&ptr); - TRACE("Index offset: %#x\n", e->index_offset); + TRACE("Index offset: %#lx\n", e->index_offset); unused = read_dword(&ptr); - TRACE("String count: %u\n", unused); + TRACE("String count: %lu\n", unused); e->texture_count = read_dword(&ptr); - TRACE("Texture count: %u\n", e->texture_count); + TRACE("Texture count: %lu\n", e->texture_count); e->ds_states.count = read_dword(&ptr); TRACE("Depthstencilstate count: %u\n", e->ds_states.count); @@ -3771,7 +3771,7 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Used shader count: %u\n", e->shaders.count); e->anonymous_shader_count = read_dword(&ptr); - TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); + TRACE("Anonymous shader count: %lu\n", e->anonymous_shader_count); if (!e->pool && (e->shared_object_count || e->shared_buffer_count)) { @@ -3788,7 +3788,7 @@ static HRESULT fx10_chunk_handler(const char *data, DWORD data_size, DWORD tag, TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - TRACE("chunk size: %#x\n", data_size); + TRACE("chunk size: %#lx\n", data_size); switch(tag) { @@ -4015,7 +4015,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu.\n", This, refcount); return refcount; } @@ -4025,7 +4025,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -5815,13 +5815,13 @@ static void write_variable_array_to_buffer(struct d3d10_effect_variable *variabl if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -5865,13 +5865,13 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -6617,13 +6617,13 @@ static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable * if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -6693,13 +6693,13 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -7441,13 +7441,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_SetResour if (offset >= v->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, v->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, v->type->element_count); return S_OK; } if (count > v->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, v->type->element_count); count = v->type->element_count - offset; } @@ -9600,7 +9600,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl struct d3d10_effect *object, *pool = NULL; HRESULT hr; - TRACE("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p.\n", + TRACE("data %p, data_size %Iu, flags %#x, device %p, effect_pool %p, effect %p.\n", data, data_size, flags, device, effect_pool, effect); if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool) @@ -9614,7 +9614,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr = d3d10_create_effect(data, data_size, device, pool, 0, &object))) { - WARN("Failed to create an effect, hr %#x.\n", hr); + WARN("Failed to create an effect, hr %#lx.\n", hr); return hr; } @@ -9663,13 +9663,13 @@ HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UIN struct d3d10_effect *object; HRESULT hr; - TRACE("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p.\n", + TRACE("data %p, data_size %Iu, fx_flags %#x, device %p, effect_pool %p.\n", data, data_size, fx_flags, device, effect_pool); if (FAILED(hr = d3d10_create_effect(data, data_size, device, NULL, D3D10_EFFECT_IS_POOL, &object))) { - WARN("Failed to create an effect, hr %#x.\n", hr); + WARN("Failed to create an effect, hr %#lx.\n", hr); return hr; } diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index d198689af64..761b2b3211f 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -34,7 +34,7 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, BOOL color_code, const char *comments, ID3D10Blob **disassembly) { - TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n", + TRACE("data %p, data_size %#Ix, color_code %#x, comments %p, disassembly %p.\n", data, data_size, color_code, comments, disassembly); return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index fef78872a49..ac4ddedc898 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_AddRef(ID3D10StateBlock *iface) struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); ULONG refcount = InterlockedIncrement(&stateblock->refcount); - TRACE("%p increasing refcount to %u.\n", stateblock, refcount); + TRACE("%p increasing refcount to %lu.\n", stateblock, refcount); return refcount; } @@ -304,7 +304,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); ULONG refcount = InterlockedDecrement(&stateblock->refcount); - TRACE("%p decreasing refcount to %u.\n", stateblock, refcount); + TRACE("%p decreasing refcount to %lu.\n", stateblock, refcount); if (!refcount) { diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 97abad4da30..69970136390 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,6 +18,9 @@ * */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #include "initguid.h" #include "d3dcompiler_private.h" #include "d3d10.h" @@ -2322,7 +2325,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad struct d3dcompiler_shader_reflection *object; HRESULT hr; - TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); + TRACE("data %p, data_size %Iu, reflector %p.\n", data, data_size, reflector); if (!(object = heap_alloc_zero(sizeof(*object)))) { @@ -2356,7 +2359,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void HRESULT hr; const DWORD *temp = data; - TRACE("data %p, data_size %lu, riid %s, blob %p\n", data, data_size, debugstr_guid(riid), reflector); + TRACE("data %p, data_size %Iu, riid %s, blob %p.\n", data, data_size, debugstr_guid(riid), reflector); if (!data || data_size < 32) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2c5c903106e..84f776626ba 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -21,6 +21,9 @@ * */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #include <stdio.h> #include "d3dcompiler_private.h" -- 2.30.2

1 0

[PATCH 4/6] d3d10: Store the type fields in parse_fx10_type() as uint32_t.
by Henri Verbeet 08 Feb '22

08 Feb '22

In particular, d3d10_variable_type() takes an integer flags pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4759dea5ee9..68afc061d1e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1402,7 +1402,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - DWORD typeinfo, type_flags, type_kind; + uint32_t typeinfo, type_flags, type_kind; const char *ptr; unsigned int i; -- 2.30.2

1 0

[PATCH 3/6] d3d10: Return the read value from read_dword().
by Henri Verbeet 08 Feb '22

08 Feb '22

This makes it consistent with d3dcompiler after commit e6961f6e16b35729301967b04078158cd66eaab2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/effect.c | 202 ++++++++++++++++++++++---------------------- 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e3c261d0270..4759dea5ee9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -837,10 +837,14 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S return TRUE; } -static void read_dword(const char **ptr, DWORD *d) +static inline DWORD read_dword(const char **ptr) { - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); + DWORD d; + + memcpy(&d, *ptr, sizeof(d)); + *ptr += sizeof(d); + + return d; } static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) @@ -856,7 +860,7 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); for (i = 0; i < count; ++i) { - read_dword(ptr, &d); + d = read_dword(ptr); FIXME("\t0x%08x\n", d); } } @@ -878,7 +882,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &tag); + tag = read_dword(&ptr); TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); if (tag != TAG_DXBC) @@ -889,7 +893,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, skip_dword_unknown("DXBC checksum", &ptr, 4); - read_dword(&ptr, &version); + version = read_dword(&ptr); TRACE("version: %#x.\n", version); if (version != 0x00000001) { @@ -897,7 +901,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &total_size); + total_size = read_dword(&ptr); TRACE("total size: %#x\n", total_size); if (data_size != total_size) @@ -906,7 +910,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &chunk_count); + chunk_count = read_dword(&ptr); TRACE("chunk count: %#x\n", chunk_count); for (i = 0; i < chunk_count; ++i) @@ -915,7 +919,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, const char *chunk_ptr; DWORD chunk_offset; - read_dword(&ptr, &chunk_offset); + chunk_offset = read_dword(&ptr); TRACE("chunk %u at offset %#x\n", i, chunk_offset); if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) @@ -926,8 +930,8 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, chunk_ptr = data + chunk_offset; - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); + chunk_tag = read_dword(&chunk_ptr); + chunk_size = read_dword(&chunk_ptr); if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { @@ -1265,7 +1269,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse } ptr = data + offset; - read_dword(&ptr, &dxbc_size); + dxbc_size = read_dword(&ptr); TRACE("dxbc size: %#x\n", dxbc_size); if (!require_space(ptr - data, 1, dxbc_size, data_size)) @@ -1409,7 +1413,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } ptr = data + offset; - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Type name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) @@ -1419,19 +1423,19 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Type name: %s.\n", debugstr_a(t->name)); - read_dword(&ptr, &type_kind); + type_kind = read_dword(&ptr); TRACE("Kind: %u.\n", type_kind); - read_dword(&ptr, &t->element_count); + t->element_count = read_dword(&ptr); TRACE("Element count: %u.\n", t->element_count); - read_dword(&ptr, &t->size_unpacked); + t->size_unpacked = read_dword(&ptr); TRACE("Unpacked size: %#x.\n", t->size_unpacked); - read_dword(&ptr, &t->stride); + t->stride = read_dword(&ptr); TRACE("Stride: %#x.\n", t->stride); - read_dword(&ptr, &t->size_packed); + t->size_packed = read_dword(&ptr); TRACE("Packed size %#x.\n", t->size_packed); switch (type_kind) @@ -1445,7 +1449,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &typeinfo); + typeinfo = read_dword(&ptr); t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; @@ -1470,7 +1474,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &typeinfo); + typeinfo = read_dword(&ptr); t->member_count = 0; t->column_count = 0; t->row_count = 0; @@ -1493,7 +1497,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &t->member_count); + t->member_count = read_dword(&ptr); TRACE("Member count: %u.\n", t->member_count); t->column_count = 0; @@ -1518,7 +1522,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, { struct d3d10_effect_type_member *typem = &t->members[i]; - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->name)) @@ -1528,7 +1532,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Member name: %s.\n", debugstr_a(typem->name)); - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->semantic)) @@ -1538,10 +1542,10 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); - read_dword(&ptr, &typem->buffer_offset); + typem->buffer_offset = read_dword(&ptr); TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member type info at offset %#x.\n", offset); if (!(typem->type = get_fx10_type(t->effect, data, data_size, offset))) @@ -1841,7 +1845,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, { DWORD offset; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->name)) @@ -1851,7 +1855,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, } TRACE("Variable name: %s.\n", debugstr_a(v->name)); - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable type info at offset %#x.\n", offset); if (!(v->type = get_fx10_type(v->effect, data, data_size, offset))) @@ -1878,7 +1882,7 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, a))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Annotation value is at offset %#x.\n", offset); switch (a->type->basetype) @@ -2009,7 +2013,7 @@ static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, } ptr = data + offset; - read_dword(&ptr, &count); + count = read_dword(&ptr); if (count != out_size) return FALSE; @@ -2024,8 +2028,8 @@ static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, { unsigned int out_idx = out_base * out_size + i; - read_dword(&ptr, &t); - read_dword(&ptr, &value); + t = read_dword(&ptr); + value = read_dword(&ptr); in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); @@ -2129,8 +2133,8 @@ static HRESULT parse_fx10_preshader_instr(struct d3d10_preshader_parse_context * return E_FAIL; } - read_dword(ptr, (uint32_t *)&ins); - read_dword(ptr, &input_count); + *(uint32_t *)&ins = read_dword(ptr); + input_count = read_dword(ptr); *offset += 2 * sizeof(uint32_t); if (!(op_info = d3d10_effect_get_op_info(ins.opcode))) @@ -2155,15 +2159,15 @@ static HRESULT parse_fx10_preshader_instr(struct d3d10_preshader_parse_context * { uint32_t flags, regt, param_offset; - read_dword(ptr, &flags); + flags = read_dword(ptr); if (flags) { FIXME("Arguments flags are not supported %#x.\n", flags); return E_UNEXPECTED; } - read_dword(ptr, &regt); - read_dword(ptr, &param_offset); + regt = read_dword(ptr); + param_offset = read_dword(ptr); switch (regt) { @@ -2203,7 +2207,7 @@ static HRESULT parse_fx10_fxlc(void *ctx, const char *data, unsigned int data_si memcpy(ID3D10Blob_GetBufferPointer(p->code), data, data_size); ptr = data; - read_dword(&ptr, &ins_count); + ins_count = read_dword(&ptr); TRACE("%u instructions.\n", ins_count); for (i = 0; i < ins_count; ++i) @@ -2238,7 +2242,7 @@ static HRESULT parse_fx10_cli4(void *ctx, const char *data, unsigned int data_si return E_FAIL; } - read_dword(&ptr, &count); + count = read_dword(&ptr); TRACE("%u literal constants.\n", count); @@ -2292,13 +2296,13 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si return E_FAIL; } - read_dword(&ptr, &header.size); - read_dword(&ptr, &header.creator); - read_dword(&ptr, &header.version); - read_dword(&ptr, &header.constants); - read_dword(&ptr, &header.constantinfo); - read_dword(&ptr, &header.flags); - read_dword(&ptr, &header.target); + header.size = read_dword(&ptr); + header.creator = read_dword(&ptr); + header.version = read_dword(&ptr); + header.constants = read_dword(&ptr); + header.constantinfo = read_dword(&ptr); + header.flags = read_dword(&ptr); + header.target = read_dword(&ptr); if (!require_space(header.constantinfo, header.constants, sizeof(*info), data_size)) { @@ -2421,10 +2425,10 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size HRESULT hr; void *dst; - read_dword(ptr, &id); - read_dword(ptr, &idx); - read_dword(ptr, &operation); - read_dword(ptr, &value_offset); + id = read_dword(ptr); + idx = read_dword(ptr); + operation = read_dword(ptr); + value_offset = read_dword(ptr); if (id >= ARRAY_SIZE(property_infos)) { @@ -2531,8 +2535,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &variable_idx); + value_offset = read_dword(&data_ptr); + variable_idx = read_dword(&data_ptr); if (!fx10_get_string(data, data_size, value_offset, &name, &name_len)) { @@ -2609,8 +2613,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &code_offset); + value_offset = read_dword(&data_ptr); + code_offset = read_dword(&data_ptr); if (!fx10_get_string(data, data_size, value_offset, &name, &name_len)) { @@ -2645,7 +2649,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + code_offset; - read_dword(&data_ptr, &blob_size); + blob_size = read_dword(&data_ptr); if (!require_space(code_offset, 1, sizeof(uint32_t) + blob_size, data_size)) { @@ -2674,7 +2678,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + value_offset; - read_dword(&data_ptr, &blob_size); + blob_size = read_dword(&data_ptr); if (!require_space(value_offset, 1, sizeof(uint32_t) + blob_size, data_size)) { @@ -2708,8 +2712,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &sodecl_offset); + value_offset = read_dword(&data_ptr); + sodecl_offset = read_dword(&data_ptr); TRACE("Effect object starts at offset %#x.\n", value_offset); @@ -2766,7 +2770,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, unsigned int i; HRESULT hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Pass name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &p->name)) @@ -2776,10 +2780,10 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, } TRACE("Pass name: %s.\n", debugstr_a(p->name)); - read_dword(ptr, &object_count); + object_count = read_dword(ptr); TRACE("Pass has %u effect objects.\n", object_count); - read_dword(ptr, &p->annotations.count); + p->annotations.count = read_dword(ptr); TRACE("Pass has %u annotations.\n", p->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, @@ -2813,7 +2817,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, DWORD offset; HRESULT hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Technique name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) @@ -2823,10 +2827,10 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, } TRACE("Technique name: %s.\n", debugstr_a(t->name)); - read_dword(ptr, &t->pass_count); + t->pass_count = read_dword(ptr); TRACE("Technique has %u passes\n", t->pass_count); - read_dword(ptr, &t->annotations.count); + t->annotations.count = read_dword(ptr); TRACE("Technique has %u annotations.\n", t->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, @@ -2939,7 +2943,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) @@ -2949,13 +2953,13 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &buffer_offset); + buffer_offset = read_dword(ptr); TRACE("Variable offset in buffer: %#x.\n", buffer_offset); - read_dword(ptr, &default_value_offset); + default_value_offset = read_dword(ptr); TRACE("Variable default value offset: %#x.\n", default_value_offset); - read_dword(ptr, &flags); + flags = read_dword(ptr); TRACE("Variable flags: %#x.\n", flags); v->flag |= flags; @@ -2979,7 +2983,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, parse_fx10_default_value(&data_ptr, v); } - read_dword(ptr, &v->annotations.count); + v->annotations.count = read_dword(ptr); TRACE("Variable has %u annotations.\n", v->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, @@ -3047,7 +3051,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) @@ -3057,7 +3061,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &v->explicit_bind_point); + v->explicit_bind_point = read_dword(ptr); TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); /* Shared variable description contains only type information. */ @@ -3109,12 +3113,12 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var = d3d10_array_get_element(v, i); - read_dword(ptr, &shader_offset); + shader_offset = read_dword(ptr); TRACE("Shader offset: %#x.\n", shader_offset); if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { - read_dword(ptr, &sodecl_offset); + sodecl_offset = read_dword(ptr); TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); if (!fx10_copy_string(data, data_size, sodecl_offset, @@ -3184,7 +3188,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var->u.state.index = vars->current; vars->v[vars->current++] = var; - read_dword(ptr, &prop_count); + prop_count = read_dword(ptr); TRACE("State object property count: %#x.\n", prop_count); memcpy(&var->u.state.desc, storage_info->default_state, storage_info->size); @@ -3211,7 +3215,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } - read_dword(ptr, &v->annotations.count); + v->annotations.count = read_dword(ptr); TRACE("Variable has %u annotations.\n", v->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, @@ -3287,7 +3291,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->type->type_class = D3D10_SVC_OBJECT; l->type->effect = l->effect; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("%s buffer name at offset %#x.\n", prefix, offset); if (!fx10_copy_string(data, data_size, offset, &l->name)) @@ -3297,10 +3301,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char } TRACE("%s buffer name: %s.\n", prefix, debugstr_a(l->name)); - read_dword(ptr, &l->data_size); + l->data_size = read_dword(ptr); TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); - read_dword(ptr, &d3d10_cbuffer_type); + d3d10_cbuffer_type = read_dword(ptr); TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); switch(d3d10_cbuffer_type) @@ -3328,10 +3332,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char return E_FAIL; } - read_dword(ptr, &l->type->member_count); + l->type->member_count = read_dword(ptr); TRACE("%s buffer member count: %#x.\n", prefix, l->type->member_count); - read_dword(ptr, &l->explicit_bind_point); + l->explicit_bind_point = read_dword(ptr); TRACE("%s buffer explicit bind point: %#x.\n", prefix, l->explicit_bind_point); if (l->effect->flags & D3D10_EFFECT_IS_POOL) @@ -3339,7 +3343,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (local) { - read_dword(ptr, &l->annotations.count); + l->annotations.count = read_dword(ptr); TRACE("Local buffer has %u annotations.\n", l->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, @@ -3712,61 +3716,61 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s } /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ - read_dword(&ptr, &e->version); + e->version = read_dword(&ptr); TRACE("Target: %#x\n", e->version); - read_dword(&ptr, &e->local_buffer_count); + e->local_buffer_count = read_dword(&ptr); TRACE("Local buffer count: %u.\n", e->local_buffer_count); - read_dword(&ptr, &e->variable_count); + e->variable_count = read_dword(&ptr); TRACE("Variable count: %u\n", e->variable_count); - read_dword(&ptr, &e->local_variable_count); + e->local_variable_count = read_dword(&ptr); TRACE("Object count: %u\n", e->local_variable_count); - read_dword(&ptr, &e->shared_buffer_count); + e->shared_buffer_count = read_dword(&ptr); TRACE("Pool buffer count: %u\n", e->shared_buffer_count); - read_dword(&ptr, &unused); + unused = read_dword(&ptr); TRACE("Pool variable count: %u\n", unused); - read_dword(&ptr, &e->shared_object_count); + e->shared_object_count = read_dword(&ptr); TRACE("Pool objects count: %u\n", e->shared_object_count); - read_dword(&ptr, &e->technique_count); + e->technique_count = read_dword(&ptr); TRACE("Technique count: %u\n", e->technique_count); - read_dword(&ptr, &e->index_offset); + e->index_offset = read_dword(&ptr); TRACE("Index offset: %#x\n", e->index_offset); - read_dword(&ptr, &unused); + unused = read_dword(&ptr); TRACE("String count: %u\n", unused); - read_dword(&ptr, &e->texture_count); + e->texture_count = read_dword(&ptr); TRACE("Texture count: %u\n", e->texture_count); - read_dword(&ptr, &e->ds_states.count); + e->ds_states.count = read_dword(&ptr); TRACE("Depthstencilstate count: %u\n", e->ds_states.count); - read_dword(&ptr, &e->blend_states.count); + e->blend_states.count = read_dword(&ptr); TRACE("Blendstate count: %u\n", e->blend_states.count); - read_dword(&ptr, &e->rs_states.count); + e->rs_states.count = read_dword(&ptr); TRACE("Rasterizerstate count: %u\n", e->rs_states.count); - read_dword(&ptr, &e->samplers.count); + e->samplers.count = read_dword(&ptr); TRACE("Samplerstate count: %u\n", e->samplers.count); - read_dword(&ptr, &e->rtvs.count); + e->rtvs.count = read_dword(&ptr); TRACE("Rendertargetview count: %u\n", e->rtvs.count); - read_dword(&ptr, &e->dsvs.count); + e->dsvs.count = read_dword(&ptr); TRACE("Depthstencilview count: %u\n", e->dsvs.count); - read_dword(&ptr, &e->shaders.count); + e->shaders.count = read_dword(&ptr); TRACE("Used shader count: %u\n", e->shaders.count); - read_dword(&ptr, &e->anonymous_shader_count); + e->anonymous_shader_count = read_dword(&ptr); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); if (!e->pool && (e->shared_object_count || e->shared_buffer_count)) -- 2.30.2

1 0

[PATCH 2/6] d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 58 ++--- dlls/d3dcompiler_43/tests/blob.c | 290 ++++++++++++------------- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 68 +++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 126 +++++------ dlls/d3dcompiler_43/tests/reflection.c | 205 +++++++++-------- dlls/d3dcompiler_46/tests/Makefile.in | 2 +- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 8 files changed, 378 insertions(+), 375 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 1d59b23cbdb..6584ae92bea 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_43.dll IMPORTS = d3d9 user32 d3dcompiler_43 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \ diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 27f2c5b063d..61a6f3e2bc3 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -39,7 +39,7 @@ struct shader_test { static void dump_shader(DWORD *shader) { unsigned int i = 0, j = 0; do { - trace("0x%08x ", shader[i]); + trace("0x%08lx ", shader[i]); j++; i++; if(j == 6) trace("\n"); @@ -59,7 +59,7 @@ static void exec_tests(const char *name, struct shader_test tests[], unsigned in messages = NULL; hr = D3DAssemble(tests[i].text, strlen(tests[i].text), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "Test %s, shader %d: D3DAssemble failed with error 0x%x - %d\n", name, i, hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Test %s, shader %u: D3DAssemble failed with error %#lx - %ld.\n", name, i, hr, hr & 0xffff); if(messages) { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); @@ -1413,10 +1413,9 @@ static void failure_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(tests[i], strlen(tests[i]), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "Failure test, shader %d: " - "expected D3DAssemble failure with D3DXERR_INVALIDDATA, " - "got 0x%x - %d\n", i, hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == D3DXERR_INVALIDDATA, "Test %u: Got unexpected hr %#lx.\n", i, hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1539,8 +1538,9 @@ static void assembleshader_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "defines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1549,14 +1549,16 @@ static void assembleshader_test(void) { /* NULL messages test */ shader = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, NULL); - ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(shader) ID3D10Blob_Release(shader); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (shader) + ID3D10Blob_Release(shader); /* NULL shader test */ messages = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, NULL, &messages); - ok(hr == S_OK, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1567,8 +1569,9 @@ static void assembleshader_test(void) { include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; hr = D3DAssemble(testshader, strlen(testshader), NULL, NULL, &include.ID3DInclude_iface, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "D3DInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1578,8 +1581,9 @@ static void assembleshader_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(NULL, 0, NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1638,7 +1642,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, &shader, &messages); - ok(hr == S_OK, "pDefines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1649,13 +1653,14 @@ static void d3dpreprocess_test(void) /* NULL messages test */ shader = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, &shader, NULL); - ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if (shader) ID3D10Blob_Release(shader); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (shader) + ID3D10Blob_Release(shader); /* NULL shader test */ messages = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, NULL, &messages); - ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1666,7 +1671,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(quotation_marks_test, strlen(quotation_marks_test), NULL, NULL, NULL, &shader, &messages); - todo_wine ok(hr == S_OK, "quotation marks test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1682,7 +1687,7 @@ static void d3dpreprocess_test(void) messages = NULL; hr = D3DPreprocess(include_test_shaders[i], strlen(include_test_shaders[i]), NULL, NULL, &include.ID3DInclude_iface, &shader, &messages); - ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1695,7 +1700,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(NULL, 0, NULL, NULL, NULL, &shader, &messages); - ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1727,14 +1732,13 @@ static void test_disassemble_shader(void) hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); todo_wine #if D3D_COMPILER_VERSION >= 46 - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #else - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); - todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ID3D10Blob_Release(blob); } diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 400d5940bf7..90e4ef3d7da 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -57,16 +57,16 @@ static void test_create_blob(void) ULONG refcount; hr = D3DCreateBlob(1, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DCreateBlob(0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DCreateBlob(0, &blob); - ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } static const D3D_BLOB_PART parts[] = @@ -128,55 +128,55 @@ static void test_get_blob_part(void) #endif hr = D3DCreateBlob(1, &blob2); - ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); blob = blob2; /* invalid cases */ hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 1, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], 0xffffffff, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_INPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 124, "GetBufferSize failed, got %lu, expected %u\n", size, 124); + ok(size == 124, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+9), "ISGN got %#x, expected %#x.\n", *(dword+9), TAG_ISGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 9), "ISGN got %#lx, expected %#lx.\n", *(dword + 9), TAG_ISGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -184,30 +184,30 @@ static void test_get_blob_part(void) if (parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_OUTPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 88, "GetBufferSize failed, got %lu, expected %u\n", size, 88); + ok(size == 88, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_OSGN == *(dword+9), "OSGN got %#x, expected %#x.\n", *(dword+9), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_OSGN == *(dword + 9), "OSGN got %#lx, expected %#lx.\n", *(dword + 9), TAG_OSGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -215,31 +215,31 @@ static void test_get_blob_part(void) if (parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 180, "GetBufferSize failed, got %lu, expected %u\n", size, 180); + ok(size == 180, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+10), "ISGN got %#x, expected %#x.\n", *(dword+10), TAG_ISGN); - ok(TAG_OSGN == *(dword+32), "OSGN got %#x, expected %#x.\n", *(dword+32), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 10), "ISGN got %#lx, expected %#lx.\n", *(dword + 10), TAG_ISGN); + ok(TAG_OSGN == *(dword + 32), "OSGN got %#lx, expected %#lx.\n", *(dword + 32), TAG_OSGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -249,41 +249,41 @@ static void test_get_blob_part(void) || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_DEBUG_INFO, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 92, "GetBufferSize failed, got %lu, expected %u\n", size, 92); + ok(size == 92, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -292,21 +292,21 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + ok(size == 68, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -315,21 +315,21 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + ok(size == 68, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -338,82 +338,82 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* check corner cases for D3DStripShader */ hr = D3DStripShader(test_blob_part, test_blob_part[6], 0xffffffff, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); hr = D3DStripShader(NULL, test_blob_part[6], 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, 2, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(NULL, test_blob_part[6], 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, 0, 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3DCOMPILER_STRIP_DEBUG_INFO */ hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 736, "GetBufferSize failed, got %lu, expected %u\n", size, 736); + ok(size == 736, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_XNAS == *(dword+16), "XNAS got %#x, expected %#x.\n", *(dword+16), TAG_XNAS); - ok(TAG_XNAP == *(dword+35), "XNAP got %#x, expected %#x.\n", *(dword+35), TAG_XNAP); - ok(TAG_Aon9 == *(dword+54), "Aon9 got %#x, expected %#x.\n", *(dword+54), TAG_Aon9); - ok(TAG_SHDR == *(dword+79), "SHDR got %#x, expected %#x.\n", *(dword+79), TAG_SHDR); - ok(TAG_STAT == *(dword+96), "STAT got %#x, expected %#x.\n", *(dword+96), TAG_STAT); - ok(TAG_RDEF == *(dword+127), "RDEF got %#x, expected %#x.\n", *(dword+127), TAG_RDEF); - ok(TAG_ISGN == *(dword+149), "ISGN got %#x, expected %#x.\n", *(dword+149), TAG_ISGN); - ok(TAG_OSGN == *(dword+171), "OSGN got %#x, expected %#x.\n", *(dword+171), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword + 16), "XNAS got %#lx, expected %#lx.\n", *(dword + 16), TAG_XNAS); + ok(TAG_XNAP == *(dword + 35), "XNAP got %#lx, expected %#lx.\n", *(dword + 35), TAG_XNAP); + ok(TAG_Aon9 == *(dword + 54), "Aon9 got %#lx, expected %#lx.\n", *(dword + 54), TAG_Aon9); + ok(TAG_SHDR == *(dword + 79), "SHDR got %#lx, expected %#lx.\n", *(dword + 79), TAG_SHDR); + ok(TAG_STAT == *(dword + 96), "STAT got %#lx, expected %#lx.\n", *(dword + 96), TAG_STAT); + ok(TAG_RDEF == *(dword + 127), "RDEF got %#lx, expected %#lx.\n", *(dword + 127), TAG_RDEF); + ok(TAG_ISGN == *(dword + 149), "ISGN got %#lx, expected %#lx.\n", *(dword + 149), TAG_ISGN); + ok(TAG_OSGN == *(dword + 171), "OSGN got %#lx, expected %#lx.\n", *(dword + 171), TAG_OSGN); hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3DCOMPILER_STRIP_REFLECTION_DATA */ hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 516, "GetBufferSize failed, got %lu, expected %u\n", size, 516); + ok(size == 516, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_XNAS == *(dword+14), "XNAS got %#x, expected %#x.\n", *(dword+14), TAG_XNAS); - ok(TAG_XNAP == *(dword+33), "XNAP got %#x, expected %#x.\n", *(dword+33), TAG_XNAP); - ok(TAG_Aon9 == *(dword+52), "Aon9 got %#x, expected %#x.\n", *(dword+52), TAG_Aon9); - ok(TAG_SHDR == *(dword+77), "SHDR got %#x, expected %#x.\n", *(dword+77), TAG_SHDR); - ok(TAG_ISGN == *(dword+94), "ISGN got %#x, expected %#x.\n", *(dword+94), TAG_ISGN); - ok(TAG_OSGN == *(dword+116), "OSGN got %#x, expected %#x.\n", *(dword+116), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword + 14), "XNAS got %#lx, expected %#lx.\n", *(dword + 14), TAG_XNAS); + ok(TAG_XNAP == *(dword + 33), "XNAP got %#lx, expected %#lx.\n", *(dword + 33), TAG_XNAP); + ok(TAG_Aon9 == *(dword + 52), "Aon9 got %#lx, expected %#lx.\n", *(dword + 52), TAG_Aon9); + ok(TAG_SHDR == *(dword + 77), "SHDR got %#lx, expected %#lx.\n", *(dword + 77), TAG_SHDR); + ok(TAG_ISGN == *(dword + 94), "ISGN got %#lx, expected %#lx.\n", *(dword + 94), TAG_ISGN); + ok(TAG_OSGN == *(dword + 116), "OSGN got %#lx, expected %#lx.\n", *(dword + 116), TAG_OSGN); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } /* @@ -619,14 +619,14 @@ static void test_get_blob_part2(void) /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 232, "GetBufferSize failed, got %lu, expected %u\n", size, 232); + ok(size == 232, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_PCSG == *(dword+9), "PCSG got %#x, expected %#x.\n", *(dword+9), TAG_PCSG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_PCSG == *(dword + 9), "PCSG got %#lx, expected %#lx.\n", *(dword + 9), TAG_PCSG); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -634,32 +634,32 @@ static void test_get_blob_part2(void) if (parts[i] == D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 344, "GetBufferSize failed, got %lu, expected %u\n", size, 344); + ok(size == 344, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+11), "ISGN got %#x, expected %#x.\n", *(dword+11), TAG_ISGN); - ok(TAG_OSGN == *(dword+24), "OSGN got %#x, expected %#x.\n", *(dword+24), TAG_OSGN); - ok(TAG_PCSG == *(dword+37), "PCSG got %#x, expected %#x.\n", *(dword+37), TAG_PCSG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 11), "ISGN got %#lx, expected %#lx.\n", *(dword + 11), TAG_ISGN); + ok(TAG_OSGN == *(dword + 24), "OSGN got %#lx, expected %#lx.\n", *(dword + 24), TAG_OSGN); + ok(TAG_PCSG == *(dword + 37), "PCSG got %#lx, expected %#lx.\n", *(dword + 37), TAG_PCSG); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -671,29 +671,29 @@ static void test_get_blob_part2(void) || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_DEBUG_INFO, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 4055, "GetBufferSize failed, got %lu, expected %u\n", size, 4055); + ok(size == 4055, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC != *dword, "DXBC failed got %#x.\n", *dword); + ok(TAG_DXBC != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -702,63 +702,63 @@ static void test_get_blob_part2(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3DCOMPILER_STRIP_DEBUG_INFO */ hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 952, "GetBufferSize failed, got %lu, expected %u\n", size, 952); + ok(size == 952, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_RDEF == *(dword+14), "RDEF got %#x, expected %#x.\n", *(dword+14), TAG_RDEF); - ok(TAG_ISGN == *(dword+44), "ISGN got %#x, expected %#x.\n", *(dword+44), TAG_ISGN); - ok(TAG_OSGN == *(dword+57), "OSGN got %#x, expected %#x.\n", *(dword+57), TAG_OSGN); - ok(TAG_PCSG == *(dword+70), "PCSG got %#x, expected %#x.\n", *(dword+70), TAG_PCSG); - ok(TAG_SHEX == *(dword+119), "SHEX got %#x, expected %#x.\n", *(dword+119), TAG_SHEX); - ok(TAG_STAT == *(dword+199), "STAT got %#x, expected %#x.\n", *(dword+199), TAG_STAT); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_RDEF == *(dword + 14), "RDEF got %#lx, expected %#lx.\n", *(dword + 14), TAG_RDEF); + ok(TAG_ISGN == *(dword + 44), "ISGN got %#lx, expected %#lx.\n", *(dword + 44), TAG_ISGN); + ok(TAG_OSGN == *(dword + 57), "OSGN got %#lx, expected %#lx.\n", *(dword + 57), TAG_OSGN); + ok(TAG_PCSG == *(dword + 70), "PCSG got %#lx, expected %#lx.\n", *(dword + 70), TAG_PCSG); + ok(TAG_SHEX == *(dword + 119), "SHEX got %#lx, expected %#lx.\n", *(dword + 119), TAG_SHEX); + ok(TAG_STAT == *(dword + 199), "STAT got %#lx, expected %#lx.\n", *(dword + 199), TAG_STAT); hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3DCOMPILER_STRIP_REFLECTION_DATA */ hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 4735, "GetBufferSize failed, got %lu, expected %u\n", size, 4735); + ok(size == 4735, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+13), "ISGN got %#x, expected %#x.\n", *(dword+13), TAG_ISGN); - ok(TAG_OSGN == *(dword+26), "OSGN got %#x, expected %#x.\n", *(dword+26), TAG_OSGN); - ok(TAG_PCSG == *(dword+39), "PCSG got %#x, expected %#x.\n", *(dword+39), TAG_PCSG); - ok(TAG_SHEX == *(dword+88), "SHEX got %#x, expected %#x.\n", *(dword+88), TAG_SHEX); - ok(TAG_SDBG == *(dword+168), "SDBG got %#x, expected %#x.\n", *(dword+168), TAG_SDBG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 13), "ISGN got %#lx, expected %#lx.\n", *(dword + 13), TAG_ISGN); + ok(TAG_OSGN == *(dword + 26), "OSGN got %#lx, expected %#lx.\n", *(dword + 26), TAG_OSGN); + ok(TAG_PCSG == *(dword + 39), "PCSG got %#lx, expected %#lx.\n", *(dword + 39), TAG_PCSG); + ok(TAG_SHEX == *(dword + 88), "SHEX got %#lx, expected %#lx.\n", *(dword + 88), TAG_SHEX); + ok(TAG_SDBG == *(dword + 168), "SDBG got %#lx, expected %#lx.\n", *(dword + 168), TAG_SDBG); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } #if D3D_COMPILER_VERSION >= 46 @@ -820,10 +820,10 @@ static void test_D3DReadFileToBlob(void) HRESULT hr; hr = D3DReadFileToBlob(filename, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); hr = D3DReadFileToBlob(filename, &blob); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); if (0) { @@ -839,7 +839,7 @@ static void test_D3DReadFileToBlob(void) return; } hr = D3DReadFileToBlob(filename, &blob); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data_size = ID3D10Blob_GetBufferSize(blob); ok(!data_size, "Got unexpected data size.\n"); DeleteFileW(filename); @@ -851,7 +851,7 @@ static void test_D3DReadFileToBlob(void) return; } hr = D3DReadFileToBlob(filename, &blob); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data_size = ID3D10Blob_GetBufferSize(blob); ok(data_size == ARRAY_SIZE(test_cso_data), "Got unexpected data size.\n"); data = ID3D10Blob_GetBufferPointer(blob); @@ -870,21 +870,21 @@ static void test_D3DWriteBlobToFile(void) GetTempFileNameW(temp_dir, NULL, 0, filename); hr = D3DCreateBlob(16, &blob); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); DeleteFileW(filename); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Got unexpected hr %#lx.\n", hr); DeleteFileW(filename); diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 8e19d4d5aa3..5f7846a479b 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -47,7 +47,7 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const HRESULT hr; hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, flags, 0, &blob, &errors); - ok_(__FILE__, line)(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { if (winetest_debug > 1) @@ -128,12 +128,12 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) HRESULT hr; hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIDevice_Release(dxgi_device); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); dxgi_desc.BufferDesc.Width = 640; @@ -153,7 +153,7 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) dxgi_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &dxgi_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIFactory_Release(factory); return swapchain; @@ -195,10 +195,10 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) context->swapchain = create_swapchain(context->device, context->window); hr = ID3D11Device_CreateTexture2D(context->device, &texture_desc, NULL, &context->rt); - ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); hr = ID3D11Device_CreateRenderTargetView(context->device, (ID3D11Resource *)context->rt, NULL, &context->rtv); - ok_(__FILE__, line)(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create rendertarget view, hr %#lx.\n", hr); ID3D11Device_GetImmediateContext(context->device, &context->immediate_context); @@ -234,7 +234,7 @@ static void release_test_context_(unsigned int line, struct test_context *contex DestroyWindow(context->window); ref = ID3D11Device_Release(context->device); - ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) @@ -252,7 +252,7 @@ static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, HRESULT hr; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, data ? &resource_data : NULL, &buffer); - ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr); return buffer; } @@ -289,11 +289,11 @@ static void draw_quad_(unsigned int line, struct test_context *context, ID3D10Bl hr = ID3D11Device_CreateInputLayout(device, default_layout_desc, ARRAY_SIZE(default_layout_desc), ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), &context->input_layout); - ok_(__FILE__, line)(hr == S_OK, "Failed to create input layout, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create input layout, hr %#lx.\n", hr); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &context->vs); - ok_(__FILE__, line)(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); } if (!context->vb) @@ -301,7 +301,7 @@ static void draw_quad_(unsigned int line, struct test_context *context, ID3D10Bl hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), ID3D10Blob_GetBufferSize(ps_code), NULL, &ps); - ok_(__FILE__, line)(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); ID3D11DeviceContext_IASetInputLayout(context->immediate_context, context->input_layout); ID3D11DeviceContext_IASetPrimitiveTopology(context->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -333,11 +333,11 @@ static void init_readback(struct test_context *context, struct readback *rb) texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; hr = ID3D11Device_CreateTexture2D(context->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_CopyResource(context->immediate_context, rb->resource, (ID3D11Resource *)context->rt); hr = ID3D11DeviceContext_Map(context->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); - ok(hr == S_OK, "Failed to map texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void release_readback(struct test_context *context, struct readback *rb) @@ -604,16 +604,16 @@ static void test_sampling(void) return; hr = ID3D11Device_CreateTexture2D(test_context.device, &texture_desc, &resource_data, &texture); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; srv_desc.Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(test_context.device, (ID3D11Resource *)texture, &srv_desc, &srv); - ok(hr == S_OK, "Failed to create SRV, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShaderResources(test_context.immediate_context, 0, 1, &srv); hr = ID3D11Device_CreateSamplerState(test_context.device, &sampler_desc, &sampler); - ok(hr == S_OK, "Failed to create sampler, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetSamplers(test_context.immediate_context, 0, 1, &sampler); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -831,10 +831,10 @@ static void test_reflection(void) hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ConstantBuffers == ARRAY_SIZE(vs_buffers), "Got %u buffers.\n", shader_desc.ConstantBuffers); ok(shader_desc.BoundResources == ARRAY_SIZE(vs_bindings), "Got %u resources.\n", shader_desc.BoundResources); @@ -844,7 +844,7 @@ static void test_reflection(void) cbuffer = reflection->lpVtbl->GetConstantBufferByIndex(reflection, i); hr = cbuffer->lpVtbl->GetDesc(cbuffer, &buffer_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(buffer_desc.Name, vs_buffers[i].desc.Name), "Got name %s.\n", debugstr_a(buffer_desc.Name)); ok(buffer_desc.Type == vs_buffers[i].desc.Type, "Got type %#x.\n", buffer_desc.Type); ok(buffer_desc.Variables == vs_buffers[i].desc.Variables, "Got %u variables.\n", buffer_desc.Variables); @@ -859,7 +859,7 @@ static void test_reflection(void) var = cbuffer->lpVtbl->GetVariableByIndex(cbuffer, j); hr = var->lpVtbl->GetDesc(var, &var_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, expect->var_desc.Name), "Got name %s.\n", debugstr_a(var_desc.Name)); ok(var_desc.StartOffset == expect->var_desc.StartOffset, "Got offset %u.\n", var_desc.StartOffset); ok(var_desc.Size == expect->var_desc.Size, "Got size %u.\n", var_desc.Size); @@ -868,7 +868,7 @@ static void test_reflection(void) type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_type_desc(&type_desc, &expect->type_desc); for (k = 0; k < type_desc.Members; ++k) @@ -877,7 +877,7 @@ static void test_reflection(void) field = type->lpVtbl->GetMemberTypeByIndex(type, k); hr = field->lpVtbl->GetDesc(field, &type_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_type_desc(&type_desc, &vs_buffers[i].vars[j].field_types[k]); winetest_pop_context(); @@ -896,7 +896,7 @@ static void test_reflection(void) winetest_push_context("Binding %u", i); hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_resource_binding(&desc, &vs_bindings[i]); winetest_pop_context(); @@ -904,15 +904,15 @@ static void test_reflection(void) ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); code = compile_shader_flags(ps_source, "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ConstantBuffers, "Got %u buffers.\n", shader_desc.ConstantBuffers); ok(shader_desc.BoundResources == ARRAY_SIZE(ps_bindings), "Got %u resources.\n", shader_desc.BoundResources); @@ -923,7 +923,7 @@ static void test_reflection(void) winetest_push_context("Binding %u", i); hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_resource_binding(&desc, &ps_bindings[i]); winetest_pop_context(); @@ -931,7 +931,7 @@ static void test_reflection(void) ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); } static void check_parameter_desc(const D3D11_SIGNATURE_PARAMETER_DESC *desc, @@ -1139,10 +1139,10 @@ static void test_semantic_reflection(void) hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(shader_desc.InputParameters == tests[i].input_count, "Got %u input parameters.\n", shader_desc.InputParameters); todo_wine ok(shader_desc.OutputParameters == tests[i].output_count, @@ -1152,7 +1152,7 @@ static void test_semantic_reflection(void) { winetest_push_context("Input %u", j); hr = reflection->lpVtbl->GetInputParameterDesc(reflection, j, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_parameter_desc(&desc, &tests[i].inputs[j]); winetest_pop_context(); } @@ -1161,14 +1161,14 @@ static void test_semantic_reflection(void) { winetest_push_context("Output %u", j); hr = reflection->lpVtbl->GetOutputParameterDesc(reflection, j, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_parameter_desc(&desc, &tests[i].outputs[j]); winetest_pop_context(); } ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); winetest_pop_context(); } diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index febfa5a7d4f..4461a3f869f 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -106,7 +106,7 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const HRESULT hr; hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { if (winetest_debug > 1) @@ -141,12 +141,12 @@ static IDirect3DDevice9 *create_device(HWND window) IDirect3D9_Release(d3d); if (FAILED(hr)) { - skip("Failed to create a 3D device, hr %#x.\n", hr); + skip("Failed to create a 3D device, hr %#lx.\n", hr); return NULL; } hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) { skip("No shader model 2 support.\n"); @@ -157,13 +157,13 @@ static IDirect3DDevice9 *create_device(HWND window) if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) { - skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + skip("Failed to create an A32B32G32R32F surface, hr %#lx.\n", hr); IDirect3DDevice9_Release(device); return NULL; } - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); - ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); IDirect3DSurface9_Release(rt); return device; @@ -198,7 +198,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) static void release_test_context_(unsigned int line, struct test_context *context) { ULONG ref = IDirect3DDevice9_Release(context->device); - ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); DestroyWindow(context->window); } @@ -238,33 +238,33 @@ static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob * "}"; hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#lx.\n", hr); vs_code = compile_shader(vs_source, "vs_2_0"); hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, vs); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_BeginScene(device); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(vs); @@ -285,19 +285,19 @@ static void init_readback(IDirect3DDevice9 *device, struct readback *rb) HRESULT hr; hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); - ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_GetDesc(rt, &desc); - ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); - ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); IDirect3DSurface9_Release(rt); } @@ -460,9 +460,9 @@ static void test_swizzle(void) if (i == 0) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); } draw_quad(device, ps_code); @@ -505,19 +505,19 @@ static void test_math(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(device, ps_code); @@ -661,9 +661,9 @@ static void test_float_vectors(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(device, ps_code); @@ -882,11 +882,11 @@ static void test_majority(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "r", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "c", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -902,11 +902,11 @@ static void test_majority(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "r", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "c", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -1039,9 +1039,9 @@ static void test_global_initializer(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetDefaults(constants, test_context.device); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -1104,24 +1104,24 @@ static void test_samplers(void) hr = IDirect3DDevice9_CreateTexture(test_context.device, 2, 2, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); - ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DTexture9_LockRect(texture, 0, &map_desc, NULL, D3DLOCK_DISCARD); - ok(hr == D3D_OK, "Failed to map texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); memset(map_desc.pBits, 0, 2 * map_desc.Pitch); ((DWORD *)map_desc.pBits)[1] = 0x00ff00ff; hr = IDirect3DTexture9_UnlockRect(texture, 0); - ok(hr == D3D_OK, "Failed to unmap texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetTexture(test_context.device, 0, (IDirect3DBaseTexture9 *)texture); - ok(hr == D3D_OK, "Failed to set texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetSamplerState(test_context.device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); - ok(hr == D3D_OK, "Failed to set sampler state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice9_Clear(test_context.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(255, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); todo_wine ps_code = compile_shader(tests[i], "ps_2_0"); if (ps_code) { @@ -1253,11 +1253,11 @@ static void test_constant_table(void) return; hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_GetDesc(constants, &table_desc); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); - ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got unexpected version %#lx.\n", table_desc.Version); ok(table_desc.Constants == ARRAY_SIZE(expect_constants), "Got %u constants.\n", table_desc.Constants); for (i = 0; i < table_desc.Constants; ++i) @@ -1269,7 +1269,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u", i); check_constant_desc(prefix, &desc, &expect_constants[i], FALSE); @@ -1283,7 +1283,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u, %u", i, j); check_constant_desc(prefix, &desc, &expect_fields_f[j], !!j); @@ -1296,7 +1296,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u", i); check_constant_desc(prefix, &desc, &expect_fields_j, FALSE); @@ -1434,7 +1434,7 @@ static void test_fail(void) { compiled = errors = NULL; hr = D3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); - todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); + todo_wine ok(hr == E_FAIL, "Test %u, target %s: Got unexpected hr %#lx.\n", i, targets[j], hr); if (hr == E_FAIL) { ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); @@ -1631,7 +1631,7 @@ static void test_include(void) hr = tests[i](filename_a, &include.ID3DInclude_iface, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1644,7 +1644,7 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); - todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got hr %#x.\n", hr); + todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); ID3D10Blob_Release(errors); @@ -1656,7 +1656,7 @@ static void test_include(void) hr = tests[i](filename_a, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1674,12 +1674,12 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = D3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); hr = D3DCompileFromFile(filename, NULL, NULL, "main", "ps_2_0", 0, 0, &blob, &errors); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); trace("%s.\n", (char *)ID3D10Blob_GetBufferPointer(errors)); @@ -1687,7 +1687,7 @@ static void test_include(void) errors = NULL; hr = D3DCompileFromFile(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1700,7 +1700,7 @@ static void test_include(void) * instead of using the immediate parent, as it would be the case for * standard C preprocessor includes. */ hr = D3DCompileFromFile(filename, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1712,7 +1712,7 @@ static void test_include(void) sprintf(ps_absolute_buffer, ps_absolute_template, include_filename); hr = D3DCompile(ps_absolute_buffer, sizeof(ps_absolute_buffer), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); todo_wine ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1731,7 +1731,7 @@ static void test_include(void) hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1746,7 +1746,7 @@ static void test_include(void) } hr = D3DCompileFromFile(L"source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 13769d57e34..9c8247790c5 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,9 +22,6 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" @@ -93,22 +90,22 @@ static void test_reflection_references(void) ULONG count; hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D11ShaderReflection, (void **)&ref11_test); - ok(hr == S_OK, "QueryInterface failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ref11_test->lpVtbl->Release(ref11_test); - ok(count == 1, "Release failed %u\n", count); + ok(count == 1, "Release failed %lu\n", count); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected count %lu.\n", count); /* check invalid cases */ #if D3D_COMPILER_VERSION >= 46 @@ -118,21 +115,21 @@ static void test_reflection_references(void) #endif hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, - "D3DReflect failed, got %x, expected %x\n", hr, expected); + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, - "D3DReflect failed, got %x, expected %x\n", hr, expected); + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); /* returns different errors with different sizes */ hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION >= 46 expected = D3DERR_INVALIDCALL; @@ -140,19 +137,19 @@ static void test_reflection_references(void) expected = E_FAIL; #endif hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "Got %x, expected %x.\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } #endif @@ -168,51 +165,52 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); /* Broken with older d3dcompiler_46, d3dcompiler_47. */ - ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (hr != S_OK) return; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D11ShaderReflection, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (void *)ref12, "Got unexpected interfaces %p, %p.\n", iface, ref12); hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == iunk, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iunk); iface->lpVtbl->Release(iface); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_IUnknown, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (IUnknown *)ref12, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (void *)ref11, "Got unexpected interfaces %p, %p.\n", iface, ref11); hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == iunk, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iunk); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_IUnknown, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (IUnknown *)ref11, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D10ShaderReflection, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } #endif @@ -402,15 +400,15 @@ static void test_reflection_desc_vs(void) #endif hr = call_reflect(test_reflection_desc_vs_blob, test_reflection_desc_vs_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&ref12); hr = ref11->lpVtbl->GetDesc(ref11, NULL); - ok(hr == E_FAIL, "GetDesc failed %x\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(sdesc11.Version == 65601, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65601); ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); @@ -454,7 +452,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetDesc(ref12, &sdesc12); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!memcmp(&sdesc11, &sdesc12, sizeof(sdesc12)), "D3D11 and D3D12 descs do not match.\n"); } @@ -503,7 +501,7 @@ static void test_reflection_desc_vs(void) pdesc = &test_reflection_desc_vs_resultin[i]; hr = ref11->lpVtbl->GetInputParameterDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!strcmp(desc11.SemanticName, pdesc->SemanticName), "Got unexpected SemanticName \"%s\", i %u.\n", desc11.SemanticName, i); @@ -529,7 +527,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetInputParameterDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!memcmp(&desc12, &desc11, sizeof(desc11)), "D3D11 and D3D12 descs do not match.\n"); } @@ -540,7 +538,7 @@ static void test_reflection_desc_vs(void) pdesc = &test_reflection_desc_vs_resultout[i]; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!strcmp(desc11.SemanticName, pdesc->SemanticName), "Got unexpected SemanticName \"%s\", i %u.\n", desc11.SemanticName, i); @@ -566,7 +564,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetOutputParameterDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!memcmp(&desc12, &desc11, sizeof(desc11)), "D3D11 and D3D12 descs do not match.\n"); } @@ -575,11 +573,11 @@ static void test_reflection_desc_vs(void) if (ref12) { count = ref12->lpVtbl->Release(ref12); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Got unexpected ref count %u.\n", count); + ok(count == 0, "Got unexpected ref count %lu.\n", count); } /* @@ -758,10 +756,10 @@ static void test_reflection_desc_ps(void) #endif hr = call_reflect(test_reflection_desc_ps_blob, test_reflection_desc_ps_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(sdesc11.Version == 65, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65); ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); @@ -818,20 +816,20 @@ static void test_reflection_desc_ps(void) /* check invalid Get*ParameterDesc cases*/ hr = ref11->lpVtbl->GetInputParameterDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetInputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetInputParameterDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetInputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetOutputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetOutputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION hr = ref11->lpVtbl->GetPatchConstantParameterDesc(ref11, 0, &desc); - ok(hr == E_INVALIDARG, "GetPatchConstantParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #endif /* GetIn/OutputParameterDesc */ @@ -840,7 +838,7 @@ static void test_reflection_desc_ps(void) pdesc = &test_reflection_desc_ps_resultin[i]; hr = ref11->lpVtbl->GetInputParameterDesc(ref11, i, &desc); - ok(hr == S_OK, "GetInputParameterDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "GetInputParameterDesc(%u) SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -868,7 +866,7 @@ static void test_reflection_desc_ps(void) pdesc = &test_reflection_desc_ps_resultout[i]; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, i, &desc); - ok(hr == S_OK, "GetOutputParameterDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "GetOutputParameterDesc(%u) SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -898,7 +896,7 @@ static void test_reflection_desc_ps(void) } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected count %lu.\n", count); } /* The following shaders are stripped, in order to show that the correct @@ -1038,17 +1036,17 @@ static void test_reflection_desc_ps_output(void) hr = call_reflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); if (!D3D_COMPILER_VERSION) { - todo_wine ok(hr == E_INVALIDARG, "(%u): got unexpected hr %x.\n", i, hr); + todo_wine ok(hr == E_INVALIDARG, "%u: Got unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(hr)) ref11->lpVtbl->Release(ref11); continue; } - ok(hr == S_OK, "(%u): got unexpected hr %x.\n", i, hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); pdesc = &tests[i].desc; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, &desc); - ok(hr == S_OK, "(%u): GetOutputParameterDesc failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "(%u): GetOutputParameterDesc SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -1077,7 +1075,7 @@ static void test_reflection_desc_ps_output(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "(%u): Release failed %u\n", i, count); + ok(!count, "%u: Got unexpected count %lu.\n", i, count); } } @@ -1181,7 +1179,8 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE expected_hr = D3D_COMPILER_VERSION < 47 && target_version >= 0x501 ? E_INVALIDARG : S_OK; /* Older d3dcompiler_47 does not support sm5.1. */ - ok(hr == expected_hr || broken(hr == E_INVALIDARG && target_version >= 0x501), "Got unexpected hr %x.\n", hr); + ok(hr == expected_hr || broken(hr == E_INVALIDARG && target_version >= 0x501), + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (hr == E_INVALIDARG) return; @@ -1204,23 +1203,23 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE /* check invalid cases */ hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0xffffffff, &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, NULL, &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "sam", NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #endif /* GetResourceBindingDesc */ @@ -1229,7 +1228,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE pdesc = &result[i]; hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc11.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc11.Name, i); ok(desc11.Type == pdesc->Type, "Got unexpected Type %#x, i %u.\n", desc11.Type, i); @@ -1253,7 +1252,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.uID = 0xdeadbeef; hr = ref12->lpVtbl->GetResourceBindingDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1265,7 +1264,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref12_from_d3d11->lpVtbl->GetResourceBindingDesc(ref12_from_d3d11, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1283,7 +1282,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref11_from_d3d12->lpVtbl->GetResourceBindingDesc(ref11_from_d3d12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), "D3D11 and D3D12 descs do not match.\n"); @@ -1299,7 +1298,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE pdesc = &result[i]; hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, pdesc->Name, &desc11); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc11.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc11.Name, i); ok(desc11.Type == pdesc->Type, "Got unexpected Type %#x, i %u.\n", desc11.Type, i); @@ -1317,7 +1316,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.uID = 0xdeadbeef; hr = ref12->lpVtbl->GetResourceBindingDescByName(ref12, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1329,7 +1328,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref12_from_d3d11->lpVtbl->GetResourceBindingDescByName(ref12_from_d3d11, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1344,7 +1343,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref11_from_d3d12->lpVtbl->GetResourceBindingDescByName(ref11_from_d3d12, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), "D3D11 and D3D12 descs do not match.\n"); @@ -1357,17 +1356,17 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE if (ref12) { count = ref11_from_d3d12->lpVtbl->Release(ref11_from_d3d12); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); count = ref12_from_d3d11->lpVtbl->Release(ref12_from_d3d11); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } #if D3D_COMPILER_VERSION @@ -1618,7 +1617,7 @@ static void test_reflection_constant_buffer(void) hr = call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], @@ -1626,7 +1625,7 @@ static void test_reflection_constant_buffer(void) #endif hr = ref11->lpVtbl->GetDesc(ref11, &sdesc); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected = D3D_COMPILER_VERSION ? 80 : 64; ok(sdesc.Version == expected, "Got unexpected version %u.\n", sdesc.Version); @@ -1758,33 +1757,33 @@ static void test_reflection_constant_buffer(void) } hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, &cbdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = cb11_valid->lpVtbl->GetDesc(cb11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* variable calls */ hr = v11_dummy->lpVtbl->GetDesc(v11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = v11_dummy->lpVtbl->GetDesc(v11_dummy, &vdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = v11_valid->lpVtbl->GetDesc(v11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* type calls */ hr = t11_dummy->lpVtbl->GetDesc(t11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_dummy->lpVtbl->GetDesc(t11_dummy, &tdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->GetDesc(t11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = t11_dummy->lpVtbl->GetMemberTypeName(t11_dummy, 0xffffffff); ok(!strcmp(string, "$Invalid"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "$Invalid"); @@ -1812,16 +1811,16 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_dummy); - ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_dummy); - ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_valid); - ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_valid); - ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #endif /* constant buffers */ @@ -1833,7 +1832,7 @@ static void test_reflection_constant_buffer(void) ok(cb11_dummy != cb11, "Got dummy constant buffer, i %u.\n", i); hr = cb11->lpVtbl->GetDesc(cb11, &cbdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(cbdesc.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); @@ -1847,7 +1846,7 @@ static void test_reflection_constant_buffer(void) ok(cb12_dummy != cb12, "Got dummy constant buffer, i %u.\n", i); hr = cb12->lpVtbl->GetDesc(cb12, &cbdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(cbdesc12.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); @@ -1881,7 +1880,7 @@ static void test_reflection_constant_buffer(void) } hr = v11->lpVtbl->GetDesc(v11, &vdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(vdesc.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc.Name, i); ok(vdesc.StartOffset == pvdesc->StartOffset, "Got unexpected StartOffset %u, i %u.\n", @@ -1900,7 +1899,7 @@ static void test_reflection_constant_buffer(void) v12 = ref12->lpVtbl->GetVariableByName(ref12, pvdesc->Name); ok(v12_dummy != v12, "Test %u, got unexpected variable %p.\n", i, v12); hr = v12->lpVtbl->GetDesc(v12, &vdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(vdesc12.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc12.Name, i); ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, sizeof(vdesc) - offsetof(D3D11_SHADER_VARIABLE_DESC, StartOffset)), @@ -1919,7 +1918,7 @@ static void test_reflection_constant_buffer(void) ok(t11_dummy != t11, "Got unexpected type %p, i %u.\n", t11, i); hr = t11->lpVtbl->GetDesc(t11, &tdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(tdesc.Class == ptdesc->Class, "Got unexpected Class %u, i %u.\n", tdesc.Class, i); ok(tdesc.Type == ptdesc->Type, "Got unexpected Type %u, i %u.\n", tdesc.Type, i); @@ -1936,7 +1935,7 @@ static void test_reflection_constant_buffer(void) ok(t12_dummy != t12, "Got unexpected type %p, i %u.\n", t12, i); hr = t12->lpVtbl->GetDesc(t12, &tdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(&tdesc12, &tdesc, offsetof(D3D11_SHADER_TYPE_DESC, Name)), "D3D11 and D3D12 descs do not match.\n"); ok(!strcmp(tdesc12.Name, ptdesc->Name), "Got unexpected Name %s, i %u.\n", debugstr_a(tdesc12.Name), i); @@ -1974,10 +1973,10 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION /* float vs float (in struct) */ hr = t11->lpVtbl->IsEqual(t11, t11_valid); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); /* float vs float */ t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); @@ -1987,7 +1986,7 @@ static void test_reflection_constant_buffer(void) ok(t2 != t11_dummy, "Got unexpected type %p.\n", t2); hr = t->lpVtbl->IsEqual(t, t2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #endif if (ref12) @@ -2017,10 +2016,10 @@ static void test_reflection_constant_buffer(void) ok(!strcmp(string, "b"), "Got unexpected string \"%s\".\n", string); hr = t12->lpVtbl->IsEqual(t12, t12_valid); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t12_valid->lpVtbl->IsEqual(t12_valid, t12); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); mt12 = t12->lpVtbl->GetMemberTypeByIndex(t12, 0); ok(mt12 != t12_dummy, "Got unexpected type %p.\n", mt12); @@ -2029,13 +2028,13 @@ static void test_reflection_constant_buffer(void) ok(mt12_2 != t12_dummy, "Got unexpected type %p.\n", mt12_2); hr = mt12->lpVtbl->IsEqual(mt12, mt12_2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } /* diff --git a/dlls/d3dcompiler_46/tests/Makefile.in b/dlls/d3dcompiler_46/tests/Makefile.in index c2effd862cf..7d2b899c0eb 100644 --- a/dlls/d3dcompiler_46/tests/Makefile.in +++ b/dlls/d3dcompiler_46/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_46.dll IMPORTS = d3d9 user32 d3dcompiler_46 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 14732c65fd7..6e40550e777 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_47.dll IMPORTS = d3d9 user32 d3dcompiler -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ -- 2.30.2

1 0

[PATCH 1/6] d3d10/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/tests/Makefile.in | 2 +- dlls/d3d10/tests/device.c | 54 +- dlls/d3d10/tests/effect.c | 1168 ++++++++++++------------ dlls/d3dcompiler_43/tests/reflection.c | 3 + 4 files changed, 614 insertions(+), 613 deletions(-) diff --git a/dlls/d3d10/tests/Makefile.in b/dlls/d3d10/tests/Makefile.in index ed342153184..e3849ec634b 100644 --- a/dlls/d3d10/tests/Makefile.in +++ b/dlls/d3d10/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3d10.dll IMPORTS = d3d10 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index bb4bff51bdb..9307cc4713d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -38,7 +38,7 @@ static void test_create_device(void) if (i == D3D10_SDK_VERSION) continue; hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, i, &device); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for SDK version %#x.\n", hr, i); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx for SDK version %#x.\n", hr, i); } } @@ -85,80 +85,80 @@ static void test_stateblock_mask(void) mask_y.Predication = 0xaa; hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDifference failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", @@ -169,7 +169,7 @@ static void test_stateblock_mask(void) memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index b5df2fd8538..3bd6d6d0ecc 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -119,13 +119,13 @@ static void test_effect_constant_buffer_type(void) } hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -138,14 +138,14 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -159,7 +159,7 @@ static void test_effect_constant_buffer_type(void) ok(type_desc.Stride == 0x10, "Stride is %#x, expected 0x10\n", type_desc.Stride); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDesc(buffer, &buffer_desc); ok(buffer_desc.ByteWidth == type_desc.UnpackedSize, "Unexpected buffer size %u.\n", buffer_desc.ByteWidth); ok(!buffer_desc.Usage, "Unexpected buffer usage %u.\n", buffer_desc.Usage); @@ -170,7 +170,7 @@ static void test_effect_constant_buffer_type(void) ID3D10Buffer_Release(buffer); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 0); ok(strcmp(string, "f1") == 0, "GetMemberName is \"%s\", expected \"f1\"\n", string); @@ -191,7 +191,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "SV_POSITION"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -209,7 +209,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "COLOR0"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -225,14 +225,14 @@ static void test_effect_constant_buffer_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); null_type = type->lpVtbl->GetMemberTypeByIndex(type, 3); hr = null_type->lpVtbl->GetDesc(null_type, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_type->lpVtbl->GetDesc(null_type, NULL); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); ok(type2 == null_type, "GetMemberTypeByName got wrong type %p, expected %p\n", type2, null_type); @@ -255,7 +255,7 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); v = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.BufferOffset == 0x20, "Unexpected buffer offset %#x.\n", var_desc.BufferOffset); @@ -264,14 +264,14 @@ static void test_effect_constant_buffer_type(void) /* Invalid buffer variable */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 100); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -343,10 +343,10 @@ static void test_effect_variable_type(void) } hr = create_effect(fx_test_evt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -359,7 +359,7 @@ static void test_effect_variable_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -376,7 +376,7 @@ static void test_effect_variable_type(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test1") == 0, "TypeName is \"%s\", expected \"test1\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -400,7 +400,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -415,7 +415,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 1); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -430,7 +430,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 2); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -451,7 +451,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "sv_POSITION"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -471,7 +471,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "color0"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -488,27 +488,27 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByIndex(type, 4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 4); ok(string == NULL, "GetMemberName is \"%s\", expected NULL\n", string); @@ -519,7 +519,7 @@ static void test_effect_variable_type(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -588,10 +588,10 @@ static void test_effect_variable_member(void) } hr = create_effect(fx_test_evm, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -605,7 +605,7 @@ static void test_effect_variable_member(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -616,16 +616,16 @@ static void test_effect_variable_member(void) null_variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 1); hr = null_variable->lpVtbl->GetDesc(null_variable, &desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); ok(variable == variable2, "GetMemberByName got %p, expected %p\n", variable2, variable); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -649,7 +649,7 @@ static void test_effect_variable_member(void) /* check members of "t1" */ variable2 = variable->lpVtbl->GetMemberByName(variable, "f1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -663,7 +663,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "f2"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -677,7 +677,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "t"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -692,7 +692,7 @@ static void test_effect_variable_member(void) /* check members of "t" */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f3"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -712,7 +712,7 @@ static void test_effect_variable_member(void) variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f4"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -733,7 +733,7 @@ static void test_effect_variable_member(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -809,10 +809,10 @@ static void test_effect_variable_element(void) } hr = create_effect(fx_test_eve, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -826,7 +826,7 @@ static void test_effect_variable_element(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -837,7 +837,7 @@ static void test_effect_variable_element(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", @@ -845,7 +845,7 @@ static void test_effect_variable_element(void) variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable2->lpVtbl->GetParentConstantBuffer(variable2); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -853,7 +853,7 @@ static void test_effect_variable_element(void) /* check variable f1 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f1"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -868,7 +868,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -884,7 +884,7 @@ static void test_effect_variable_element(void) /* check variable f2 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f2"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -899,7 +899,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -914,7 +914,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -929,7 +929,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -944,7 +944,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -959,7 +959,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -975,7 +975,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 2); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -990,7 +990,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -1007,7 +1007,7 @@ static void test_effect_variable_element(void) /* check variable t */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "t"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1022,7 +1022,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1037,7 +1037,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1052,7 +1052,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1067,7 +1067,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1081,7 +1081,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1096,7 +1096,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1110,7 +1110,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1125,7 +1125,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1139,7 +1139,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1154,7 +1154,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1169,7 +1169,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1184,7 +1184,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1198,7 +1198,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1213,7 +1213,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1227,7 +1227,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1242,7 +1242,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1256,7 +1256,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1272,7 +1272,7 @@ static void test_effect_variable_element(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -1390,7 +1390,7 @@ static void check_as(ID3D10EffectVariable *variable) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = (ID3D10EffectVariable *)variable->lpVtbl->AsConstantBuffer(variable); is_valid = variable2->lpVtbl->IsValid(variable2); @@ -1487,10 +1487,10 @@ static void test_effect_variable_type_class(void) } hr = create_effect(fx_test_evtc, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -1508,7 +1508,7 @@ static void test_effect_variable_type_class(void) /* check constantbuffer cb */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1524,7 +1524,7 @@ static void test_effect_variable_type_class(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1539,7 +1539,7 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "s") == 0, "Name is \"%s\", expected \"s\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1555,7 +1555,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "String") == 0, "TypeName is \"%s\", expected \"String\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1570,15 +1570,15 @@ static void test_effect_variable_type_class(void) string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, &str2); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(str2 != str1, "Unexpected string pointer.\n"); ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); @@ -1586,16 +1586,16 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 2); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); str1 = (void *)0xdeadbeef; hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(str1 == (void *)0xdeadbeef, "Unexpected pointer.\n"); /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "f") == 0, "Name is \"%s\", expected \"f\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1611,7 +1611,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", td.TypeName); ok(td.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_SCALAR); @@ -1627,7 +1627,7 @@ static void test_effect_variable_type_class(void) /* check int2 i */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "i") == 0, "Name is \"%s\", expected \"i\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1643,7 +1643,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "int2") == 0, "TypeName is \"%s\", expected \"int2\"\n", td.TypeName); ok(td.Class == D3D10_SVC_VECTOR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_VECTOR); @@ -1659,7 +1659,7 @@ static void test_effect_variable_type_class(void) /* check uint2x3 u */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "u") == 0, "Name is \"%s\", expected \"u\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1675,7 +1675,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "uint2x3") == 0, "TypeName is \"%s\", expected \"uint2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_COLUMNS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_COLUMNS); @@ -1691,7 +1691,7 @@ static void test_effect_variable_type_class(void) /* check bool2x3 b */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "b") == 0, "Name is \"%s\", expected \"b\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1707,7 +1707,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "bool2x3") == 0, "TypeName is \"%s\", expected \"bool2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_ROWS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_ROWS); @@ -1723,7 +1723,7 @@ static void test_effect_variable_type_class(void) /* check BlendState blend */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "blend") == 0, "Name is \"%s\", expected \"blend\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1739,7 +1739,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "BlendState") == 0, "TypeName is \"%s\", expected \"BlendState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1755,7 +1755,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilState depthstencil */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "depthstencil") == 0, "Name is \"%s\", expected \"depthstencil\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1771,7 +1771,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilState") == 0, "TypeName is \"%s\", expected \"DepthStencilState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1787,7 +1787,7 @@ static void test_effect_variable_type_class(void) /* check RasterizerState rast */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rast") == 0, "Name is \"%s\", expected \"rast\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1803,7 +1803,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RasterizerState") == 0, "TypeName is \"%s\", expected \"RasterizerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1819,7 +1819,7 @@ static void test_effect_variable_type_class(void) /* check SamplerState sam */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "sam") == 0, "Name is \"%s\", expected \"sam\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1835,7 +1835,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "SamplerState") == 0, "TypeName is \"%s\", expected \"SamplerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1851,7 +1851,7 @@ static void test_effect_variable_type_class(void) /* check RenderTargetView rtv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rtv") == 0, "Name is \"%s\", expected \"rtv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1867,7 +1867,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RenderTargetView") == 0, "TypeName is \"%s\", expected \"RenderTargetView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1883,7 +1883,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilView dsv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "dsv") == 0, "Name is \"%s\", expected \"dsv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1899,7 +1899,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilView") == 0, "TypeName is \"%s\", expected \"DepthStencilView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1915,7 +1915,7 @@ static void test_effect_variable_type_class(void) /* check Texture t0 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(vd.Name, "t0"), "Unexpected Name \"%s\".\n", vd.Name); ok(!vd.Semantic, "Unexpected Semantic \"%s\".\n", vd.Semantic); @@ -1931,7 +1931,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(td.TypeName, "texture"), "Unexpected TypeName \"%s\".\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Unexpected Class %x.\n", td.Class); @@ -1947,7 +1947,7 @@ static void test_effect_variable_type_class(void) /* check Texture1D t1 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1963,7 +1963,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1D") == 0, "TypeName is \"%s\", expected \"Texture1D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1979,7 +1979,7 @@ static void test_effect_variable_type_class(void) /* check Texture1DArray t1a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1a") == 0, "Name is \"%s\", expected \"t1a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1995,7 +1995,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1DArray") == 0, "TypeName is \"%s\", expected \"Texture1DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2011,7 +2011,7 @@ static void test_effect_variable_type_class(void) /* check Texture2D t2 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2") == 0, "Name is \"%s\", expected \"t2\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2027,7 +2027,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2D") == 0, "TypeName is \"%s\", expected \"Texture2D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2043,7 +2043,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMS t2dms */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dms") == 0, "Name is \"%s\", expected \"t2dms\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2059,7 +2059,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMS") == 0, "TypeName is \"%s\", expected \"Texture2DMS\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2075,7 +2075,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DArray t2a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2a") == 0, "Name is \"%s\", expected \"t2a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2091,7 +2091,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DArray") == 0, "TypeName is \"%s\", expected \"Texture2DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2107,7 +2107,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMSArray t2dmsa */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dmsa") == 0, "Name is \"%s\", expected \"t2dmsa\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2123,7 +2123,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMSArray") == 0, "TypeName is \"%s\", expected \"TTexture2DMSArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2139,7 +2139,7 @@ static void test_effect_variable_type_class(void) /* check Texture3D t3 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t3") == 0, "Name is \"%s\", expected \"t3\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2155,7 +2155,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture3D") == 0, "TypeName is \"%s\", expected \"Texture3D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2171,7 +2171,7 @@ static void test_effect_variable_type_class(void) /* check TextureCube tq */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "tq") == 0, "Name is \"%s\", expected \"tq\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2187,7 +2187,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "TextureCube") == 0, "TypeName is \"%s\", expected \"TextureCube\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2203,7 +2203,7 @@ static void test_effect_variable_type_class(void) /* check GeometryShader gs[2] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "gs") == 0, "Name is \"%s\", expected \"gs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2219,7 +2219,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2235,7 +2235,7 @@ static void test_effect_variable_type_class(void) /* check PixelShader ps */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "ps") == 0, "Name is \"%s\", expected \"ps\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2251,7 +2251,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2267,7 +2267,7 @@ static void test_effect_variable_type_class(void) /* check VertexShader vs[1] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "vs") == 0, "Name is \"%s\", expected \"vs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2283,7 +2283,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2299,7 +2299,7 @@ static void test_effect_variable_type_class(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -2579,10 +2579,10 @@ static void test_effect_constant_buffer_stride(void) } hr = create_effect(fx_test_ecbs, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 15, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2600,7 +2600,7 @@ static void test_effect_constant_buffer_stride(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &tdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(tdesc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", tdesc.TypeName); ok(tdesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", tdesc.Class, D3D10_SVC_OBJECT); @@ -2617,7 +2617,7 @@ static void test_effect_constant_buffer_stride(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -2948,10 +2948,10 @@ static void test_effect_local_shader(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2998,22 +2998,22 @@ if (0) /* check for invalid arguments */ hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* check valid pass arguments */ t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); @@ -3023,19 +3023,19 @@ if (0) ok(p2 == p, "GetPassByName got %p, expected %p\n", p2, p); hr = p->lpVtbl->GetVertexShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetVertexShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetPixelShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "p"); ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); @@ -3046,9 +3046,9 @@ if (0) /* Pass without Set*Shader() instructions */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(!ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3058,52 +3058,52 @@ if (0) ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps_d3d_2); hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(!ps_d3d_2, "Unexpected shader object.\n"); /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3120,7 +3120,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexhader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3134,12 +3134,12 @@ if (0) /* pass 1 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3156,7 +3156,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3170,12 +3170,12 @@ if (0) /* pass 1 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3192,7 +3192,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3206,9 +3206,9 @@ if (0) /* Pass is using Set*Shader(NULL) */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3221,12 +3221,12 @@ if (0) /* pass 2 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3237,12 +3237,12 @@ if (0) /* pass 2 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3253,12 +3253,12 @@ if (0) /* pass 2 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3272,12 +3272,12 @@ if (0) /* pass 3 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3294,7 +3294,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3308,12 +3308,12 @@ if (0) /* pass 3 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3330,7 +3330,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3344,12 +3344,12 @@ if (0) /* pass 3 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3366,7 +3366,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3383,12 +3383,12 @@ if (0) /* pass 4 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3405,7 +3405,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3419,12 +3419,12 @@ if (0) /* pass 4 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3441,7 +3441,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3455,12 +3455,12 @@ if (0) /* pass 4 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %x\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3477,7 +3477,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3494,11 +3494,11 @@ if (0) /* pass 5 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v0") == 0, "Name is \"%s\", expected \"v0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3515,7 +3515,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3529,11 +3529,11 @@ if (0) /* pass 5 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p0") == 0, "Name is \"%s\", expected \"p0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3550,7 +3550,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3564,11 +3564,11 @@ if (0) /* pass 5 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g0") == 0, "Name is \"%s\", expected \"g0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3585,7 +3585,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3602,12 +3602,12 @@ if (0) /* pass 6 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3624,7 +3624,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3638,18 +3638,18 @@ if (0) /* Get input signature from vertex shader set from array element. */ hr = p->lpVtbl->GetDesc(p, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Expected input signature.\n"); ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size.\n"); /* pass 6 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3666,7 +3666,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3680,12 +3680,12 @@ if (0) /* pass 6 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3702,7 +3702,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3719,12 +3719,12 @@ if (0) /* pass 7 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_vs); ok(pdesc.ShaderIndex == 1, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 1); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3741,7 +3741,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3755,12 +3755,12 @@ if (0) /* pass 7 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3777,7 +3777,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3791,12 +3791,12 @@ if (0) /* pass 7 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3813,7 +3813,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3830,9 +3830,9 @@ if (0) /* Inline variant */ p = t->lpVtbl->GetPassByName(t, "P8"); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3840,7 +3840,7 @@ if (0) v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3850,25 +3850,25 @@ if (0) ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); todo_wine ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3876,24 +3876,24 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3902,31 +3902,31 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3935,7 +3935,7 @@ if (0) ID3D10PixelShader_Release(ps_d3d); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -3989,10 +3989,10 @@ static void test_effect_get_variable_by(void) } hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4091,7 +4091,7 @@ static void test_effect_get_variable_by(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4423,9 +4423,9 @@ static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderRes tex_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &tex_desc, NULL, tex); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)*tex, NULL, srv); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void test_effect_state_groups(void) @@ -4465,10 +4465,10 @@ static void test_effect_state_groups(void) } hr = create_effect(fx_test_state_groups, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(!effect_desc.ConstantBuffers, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4498,7 +4498,7 @@ static void test_effect_state_groups(void) ok(sampler_desc.MinLOD == 6.0f, "Got unexpected MinLOD %.8e.\n", sampler_desc.MinLOD); ok(sampler_desc.MaxLOD == 5.0f, "Got unexpected MaxLOD %.8e.\n", sampler_desc.MaxLOD); hr = s->lpVtbl->GetSampler(s, 0, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.Filter == D3D10_FILTER_MIN_MAG_MIP_LINEAR, "Got unexpected Filter %#x.\n", sampler_desc.Filter); ID3D10SamplerState_Release(sampler); @@ -4506,7 +4506,7 @@ static void test_effect_state_groups(void) s->lpVtbl->GetBackingStore(s, 1, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); hr = s->lpVtbl->GetSampler(s, 1, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); ID3D10SamplerState_Release(sampler); @@ -4531,14 +4531,14 @@ static void test_effect_state_groups(void) ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); /* We can't check the SrcBlend value from the ID3D10BlendState object * descriptor because BlendEnable[0] is effectively false, which forces @@ -4574,14 +4574,14 @@ static void test_effect_state_groups(void) ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); hr = d->lpVtbl->GetDepthStencilState(d, 0, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); d->lpVtbl->GetBackingStore(d, 1, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); hr = d->lpVtbl->GetDepthStencilState(d, 1, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); @@ -4603,7 +4603,7 @@ static void test_effect_state_groups(void) ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); hr = r->lpVtbl->GetRasterizerState(r, 0, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4611,7 +4611,7 @@ static void test_effect_state_groups(void) r->lpVtbl->GetBackingStore(r, 1, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); hr = r->lpVtbl->GetRasterizerState(r, 1, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4621,7 +4621,7 @@ static void test_effect_state_groups(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(!pass_desc.Annotations, "Got unexpected Annotations %#x.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4633,9 +4633,9 @@ static void test_effect_state_groups(void) ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); @@ -4644,7 +4644,7 @@ static void test_effect_state_groups(void) ok(ret, "Unexpected mask.\n"); hr = pass->lpVtbl->Apply(pass, 0); - ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -4722,15 +4722,15 @@ static void test_effect_state_groups(void) create_effect_texture_resource(device, &srv0, &tex0); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS_SHADER_RESOURCES, 0); ok(!ret, "Unexpected mask.\n"); ID3D10Device_PSSetShaderResources(device, 0, 1, &srv0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv1); ok(!srv1, "Unexpected resource pointer.\n"); @@ -4744,7 +4744,7 @@ static void test_effect_state_groups(void) ID3D10Device_OMSetDepthStencilState(device, ds_state, 0); ID3D10Device_OMSetBlendState(device, blend_state, NULL, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state2, &stencil_ref); ok(!ds_state2, "Unexpected depth stencil state.\n"); ID3D10Device_OMGetBlendState(device, &blend_state2, blend_factor, &sample_mask); @@ -4755,7 +4755,7 @@ static void test_effect_state_groups(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4820,10 +4820,10 @@ static void test_effect_state_group_defaults(void) } hr = create_effect(fx_test_state_group_defaults, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4924,7 +4924,7 @@ static void test_effect_state_group_defaults(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Failed to get pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(pass_desc.Annotations == 1, "Got unexpected Annotations %u.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4938,7 +4938,7 @@ static void test_effect_state_group_defaults(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -4987,68 +4987,68 @@ static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VA HRESULT hr; hr = var->lpVtbl->SetFloat(var, 5.0f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 5.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetInt(var, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 2.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 2; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 1 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 32); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 32 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); } @@ -5064,10 +5064,10 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_f[0] = 10.0f; set_f[1] = 20.0f; hr = var->lpVtbl->SetFloatArray(var, set_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5075,7 +5075,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5083,16 +5083,16 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5100,7 +5100,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5108,26 +5108,26 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 1; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5136,20 +5136,20 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_b[0] = 10; set_b[1] = 20; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5159,15 +5159,15 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Array offset tests. Offset argument goes unused for scalar arrays. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* After this, if offset is in use, return should be { 0, 5 }. */ set_i[0] = 5; hr = var->lpVtbl->SetIntArray(var, set_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b_a[0] = -1; expected_b_a[1] = 0; expected_i_a[0] = 5; expected_i_a[1] = 0; for (i = 0; i < 2; ++i) @@ -5179,29 +5179,29 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Test the offset on GetArray methods. If offset was in use, we'd get * back 5 given that the variable was previously set to { 0, 5 }. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); /* Try setting offset larger than number of elements. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_i[0] = 1; hr = var->lpVtbl->SetIntArray(var, set_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* Since offset goes unused, a larger offset than the number of elements * in the array should have no effect. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); @@ -5211,11 +5211,11 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA * ends up writing over into the adjacent variables in the local buffer. */ set_i[0] = 1; set_i[1] = 2; set_i[2] = 3; set_i[3] = 4; set_i[4] = 5; set_i[5] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = 1; expected_i_a[1] = 2; expected_i_a[2] = 0; expected_i_a[3] = 0; expected_i_a[4] = 0; expected_i_a[5] = 0; @@ -5267,10 +5267,10 @@ static void test_effect_scalar_variable(void) } hr = create_effect(fx_test_scalar_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5290,7 +5290,7 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); s_v = var->lpVtbl->AsScalar(var); @@ -5303,22 +5303,22 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "f0"); s_v = var->lpVtbl->AsScalar(var); hr = s_v->lpVtbl->SetFloat(s_v, 1.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var2 = effect->lpVtbl->GetVariableByName(effect, "f_a"); var2 = var2->lpVtbl->GetElement(var2, 0); s_v2 = var->lpVtbl->AsScalar(var2); hr = s_v2->lpVtbl->SetFloat(s_v2, 2.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s_v->lpVtbl->GetFloat(s_v, &f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5381,10 +5381,10 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_f[0] = 1.0f; set_f[1] = 2.0f; set_f[2] = 3.0f; set_f[3] = 4.0f; hr = var->lpVtbl->SetFloatVector(var, set_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5392,7 +5392,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5400,16 +5400,16 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; set_i[2] = 7; set_i[3] = 8; hr = var->lpVtbl->SetIntVector(var, set_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5417,7 +5417,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5425,28 +5425,28 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 0; set_b[2] = 1; set_b[3] = 0; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_v[0] = -1.0f; expected_f_v[1] = 0.0f; expected_f_v[2] = -1.0f; expected_f_v[3] = 0.0f; for (i = 0; i < components; ++i) ok(ret_f[i] == expected_f_v[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_v[0] = -1; expected_i_v[1] = 0; expected_i_v[2] = -1; expected_i_v[3] = 0; for (i = 0; i < components; ++i) ok(ret_i[i] == expected_i_v[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_v[i]; @@ -5455,20 +5455,20 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_b[0] = 5; set_b[1] = 10; set_b[2] = 15; set_b[3] = 20; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5489,10 +5489,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_f[4] = 5.0f; set_f[5] = 6.0f; set_f[6] = 7.0f; set_f[7] = 8.0f; set_f[8] = 9.0f; hr = var->lpVtbl->SetFloatVectorArray(var, set_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5500,7 +5500,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5508,7 +5508,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5516,10 +5516,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_i[4] = 14; set_i[5] = 15; set_i[6] = 16; set_i[7] = 17; set_i[8] = 18; hr = var->lpVtbl->SetIntVectorArray(var, set_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5527,7 +5527,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5535,7 +5535,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5543,10 +5543,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 1; set_b[5] = 0; set_b[6] = 0; set_b[7] = 1; set_b[8] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_a[0] = -1.0f; expected_f_a[1] = 0.0f; expected_f_a[2] = -1.0f; expected_f_a[3] = -1.0f; expected_f_a[4] = -1.0f; expected_f_a[5] = 0.0f; expected_f_a[6] = 0.0f; expected_f_a[7] = -1.0f; expected_f_a[8] = -1.0f; @@ -5554,7 +5554,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_f[i] == expected_f_a[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = -1; expected_i_a[1] = 0; expected_i_a[2] = -1; expected_i_a[3] = -1; expected_i_a[4] = -1; expected_i_a[5] = 0; expected_i_a[6] = 0; expected_i_a[7] = -1; expected_i_a[8] = -1; @@ -5562,7 +5562,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_i[i] == expected_i_a[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_a[i]; @@ -5573,20 +5573,20 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 25; set_b[5] = 30; set_b[6] = 35; set_b[7] = 40; set_b[8] = 45; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5600,43 +5600,43 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 0; set_b[5] = 0; set_b[6] = 0; set_b[7] = 0; set_b[8] = 0; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_b[0] = 1; set_b[1] = 1; set_b[2] = 1; set_b[3] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* If the previous offset of 1 worked, then the first vector value of the * array should still be false. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == 0, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == 0, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(!ret_b[i], "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); /* Test the GetFloatVectorArray offset argument. If it works, we should * get a vector with all values set to true. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5648,10 +5648,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA /* Windows array setting function has no bounds checking on offset values * either, so this ends up writing into adjacent variables. */ hr = var->lpVtbl->SetBoolVectorArray(var, set_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5696,10 +5696,10 @@ static void test_effect_vector_variable(void) } hr = create_effect(fx_test_vector_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5716,7 +5716,7 @@ static void test_effect_vector_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); v_var = var->lpVtbl->AsVector(var); @@ -5728,7 +5728,7 @@ static void test_effect_vector_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5888,31 +5888,31 @@ static void test_matrix_methods(ID3D10EffectMatrixVariable *var, D3D10_SHADER_VA set_test_matrix(&m_set, type, row_count, col_count, 1); hr = var->lpVtbl->SetMatrix(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, FALSE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTranspose(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret, &m_set, row_count, col_count, TRUE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); memset(&m_expected.m[0][0], 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); transpose_matrix(&m_set, &m_expected, row_count, col_count); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret, row_count, col_count, TRUE); } @@ -5926,33 +5926,33 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA set_test_matrix(&m_set[0], type, row_count, col_count, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_ret[i], &m_set[i], row_count, col_count, TRUE); memset(m_ret, 0, sizeof(m_ret)); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) { memset(&m_expected, 0, sizeof(m_expected)); @@ -5965,21 +5965,21 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret[0], &m_set[0], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); @@ -5988,19 +5988,19 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA /* Like vector array functions, matrix array functions will allow for * writing out of bounds into adjacent memory. */ hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); } @@ -6042,10 +6042,10 @@ static void test_effect_matrix_variable(void) } hr = create_effect(fx_test_matrix_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6062,7 +6062,7 @@ static void test_effect_matrix_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); m_var = var->lpVtbl->AsMatrix(var); @@ -6075,7 +6075,7 @@ static void test_effect_matrix_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -6225,7 +6225,7 @@ static ID3D10EffectShaderResourceVariable *get_effect_shader_resource_variable_( type = var->lpVtbl->GetType(var); ok_(__FILE__, line)(!!type, "Got unexpected type %p.\n", type); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok_(__FILE__, line)(type_desc.Type == D3D10_SVT_TEXTURE2D, "Type is %x, expected %x.\n", type_desc.Type, D3D10_SVT_TEXTURE2D); return var->lpVtbl->AsShaderResource(var); @@ -6257,10 +6257,10 @@ static void test_effect_resource_variable(void) } hr = create_effect(fx_test_resource_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6278,19 +6278,19 @@ static void test_effect_resource_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "dummy name"); t0 = var->lpVtbl->AsShaderResource(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t0"); t0 = get_effect_shader_resource_variable(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t_a"); t_a = get_effect_shader_resource_variable(var); for (i = 0; i < 2; ++i) create_effect_texture_resource(device, &srv_a[i], &tex_a[i]); hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 0, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Apply the pass to bind the resource to the shader. */ technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); @@ -6298,13 +6298,13 @@ static void test_effect_resource_variable(void) pass = technique->lpVtbl->GetPassByName(technique, "p0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n"); - ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size %lu.\n", + ok(pass_desc.IAInputSignatureSize == 88, "Got unexpected input signature size %Iu.\n", pass_desc.IAInputSignatureSize); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv_tmp[0]); ok(srv_tmp[0] == srv0, "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6321,10 +6321,10 @@ static void test_effect_resource_variable(void) var = t_a->lpVtbl->GetElement(t_a, 1); t_a_0 = get_effect_shader_resource_variable(var); hr = t_a_0->lpVtbl->SetResource(t_a_0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6334,10 +6334,10 @@ static void test_effect_resource_variable(void) /* Test offset. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 1, 1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6349,7 +6349,7 @@ static void test_effect_resource_variable(void) { /* This crashes on Windows. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 2, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } ID3D10ShaderResourceView_Release(srv0); @@ -6363,7 +6363,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); hr = create_effect(fx_test_resource_variable2, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); @@ -6377,12 +6377,12 @@ static void test_effect_resource_variable(void) ok(s->lpVtbl->IsValid(s), "Expected valid sample variable.\n"); hr = s->lpVtbl->GetSampler(s, 0, &sampler[0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s->lpVtbl->GetSampler(s, 1, &sampler[1]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetSamplers(device, 0, ARRAY_SIZE(samplers), samplers); for (i = 0; i < ARRAY_SIZE(samplers); ++i) @@ -6402,7 +6402,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -6492,7 +6492,7 @@ static void test_effect_annotations(void) } hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); a = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6505,7 +6505,7 @@ static void test_effect_annotations(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6530,7 +6530,7 @@ static void test_effect_annotations(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_optimize(void) @@ -6558,23 +6558,23 @@ static void test_effect_optimize(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "P0"), "Unexpected pass name %s.\n", pass_desc.Name); v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!!shaderdesc.pBytecode, "Expected bytecode.\n"); @@ -6588,13 +6588,13 @@ static void test_effect_optimize(void) ok(!ret, "Unexpected return value.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = effect->lpVtbl->IsOptimized(effect); ok(ret, "Unexpected return value.\n"); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!shaderdesc.pBytecode, "Unexpected bytecode.\n"); @@ -6604,11 +6604,11 @@ static void test_effect_optimize(void) ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!pass_desc.Name, "Unexpected pass name %p.\n", pass_desc.Name); pass = tech->lpVtbl->GetPassByName(tech, "P0"); @@ -6622,17 +6622,17 @@ static void test_effect_optimize(void) /* Already optimized */ hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); /* Annotations are stripped. */ hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6643,7 +6643,7 @@ static void test_effect_optimize(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6651,7 +6651,7 @@ static void test_effect_optimize(void) tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(tech_desc.Annotations == 1, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6659,17 +6659,17 @@ static void test_effect_optimize(void) pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.Annotations == 1, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6682,7 +6682,7 @@ todo_wine { { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); @@ -6692,7 +6692,7 @@ todo_wine { tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!tech_desc.Annotations, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); @@ -6702,7 +6702,7 @@ todo_wine { pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!pass_desc.Annotations, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); @@ -6712,7 +6712,7 @@ todo_wine { effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_description(void) @@ -6732,40 +6732,40 @@ static void test_effect_shader_description(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); /* GetShaderDesc() is indexing through all shaders in the effect.*/ s = v->lpVtbl->AsShader(v); hr = s->lpVtbl->GetShaderDesc(s, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 1, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 2, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 3, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 4, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 5, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 420, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 6, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!shaderdesc.SODecl, "Unexpected SO declaration %p.\n", shaderdesc.SODecl); hr = s->lpVtbl->GetShaderDesc(s, 7, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), @@ -6774,7 +6774,7 @@ static void test_effect_shader_description(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_object(void) @@ -6796,7 +6796,7 @@ static void test_effect_shader_object(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -6804,108 +6804,108 @@ static void test_effect_shader_object(void) vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 0, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 1, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 2, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 3, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 4, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 0, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 1, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 2, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 3, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 4, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = NULL; hr = s->lpVtbl->GetPixelShader(s, 5, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!ps, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 0, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 1, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 2, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 3, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 4, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 5, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 6, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 7, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7115,44 +7115,44 @@ static void test_effect_pool(void) hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); todo_wine - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect_pool(fx_test_pool, device, &pool); - ok(hr == S_OK, "Failed to create effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); effect = pool->lpVtbl->AsEffect(pool); ok(!!effect, "Expected effect pointer.\n"); effect->lpVtbl->AddRef(effect); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); effect->lpVtbl->Release(effect); hr = pool->lpVtbl->QueryInterface(pool, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10EffectPool, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)pool, "Unexpected pointer.\n"); IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10EffectPool, (void **)&pool2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pool2 == pool, "Unexpected pool pointer.\n"); pool2->lpVtbl->Release(pool2); @@ -7160,7 +7160,7 @@ static void test_effect_pool(void) ok(ret, "Expected pool.\n"); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7171,13 +7171,13 @@ static void test_effect_pool(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); a = cb->lpVtbl->GetAnnotationByIndex(cb, 0); ok(a->lpVtbl->IsValid(a), "Expected valid annotation.\n"); hr = a->lpVtbl->GetDesc(a, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == (D3D10_EFFECT_VARIABLE_POOLED | D3D10_EFFECT_VARIABLE_ANNOTATION), "Unexpected flags %#x.\n", var_desc.Flags); @@ -7186,70 +7186,68 @@ static void test_effect_pool(void) pass = t->lpVtbl->GetPassByName(t, "P1"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = shader_desc.pShaderVariable->lpVtbl->GetDesc(shader_desc.pShaderVariable, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_blendstate"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_blendstate"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "ps"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "ps"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = t->lpVtbl->GetPassByIndex(t, 0); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); sv = shader_desc.pShaderVariable; hr = sv->lpVtbl->GetDesc(sv, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); /* Create standalone effect from the same blob used for pool, */ hr = create_effect(fx_test_pool, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool, 0, device, NULL, &effect2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10Effect, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); /* For regular effects querying for ID3D10EffectPool is broken */ hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10EffectPool, (void **)&unk); -todo_wine { - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(unk == (IUnknown *)effect2, "Unexpected pointer.\n"); -} + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(unk == (IUnknown *)effect2, "Got unexpected pointer %p.\n", unk); if (SUCCEEDED(hr)) IUnknown_Release(unk); ret = effect2->lpVtbl->IsPool(effect2); ok(!ret, "Unexpected pool.\n"); hr = effect2->lpVtbl->GetDesc(effect2, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7260,7 +7258,7 @@ todo_wine { cb = effect2->lpVtbl->GetConstantBufferByIndex(effect2, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7268,13 +7266,13 @@ todo_wine { /* Pool and child that use different devices. */ hr = create_effect_pool(fx_test_pool, device2, &pool2); - ok(hr == S_OK, "Failed to create an effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool2, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = child_effect->lpVtbl->GetDevice(child_effect, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(device3 == device, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7282,7 +7280,7 @@ todo_wine { ok(cb->lpVtbl->IsValid(cb), "Expected valid constant buffer.\n"); hr = cb->lpVtbl->GetConstantBuffer(cb, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDevice(buffer, &device3); ok(device3 == device2, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7293,22 +7291,22 @@ todo_wine { /* When pool is specified, corresponding flag has to be set. */ hr = create_effect(fx_test_pool_child, 0, device, pool, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); hr = child_effect->lpVtbl->GetDesc(child_effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 2, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 1, "Unexpected shared buffer count %u.\n", @@ -7323,7 +7321,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7332,7 +7330,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb2"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7341,7 +7339,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7355,49 +7353,49 @@ todo_wine { /* Local variables first */ v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 1); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 2); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "vs"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 3); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f1"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 4); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR0"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR1"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7406,10 +7404,10 @@ todo_wine { pool->lpVtbl->Release(pool); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = ID3D10Device_Release(device2); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7495,13 +7493,13 @@ static void test_effect_default_variable_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(float_v, 0, sizeof(float_v)); v = effect->lpVtbl->GetVariableByName(effect, "f4"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 3.0f && float_v[3] == 4.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7510,7 +7508,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f2"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7519,7 +7517,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f1"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 5.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7527,32 +7525,32 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "i"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetInt(scalar, &int_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_s == 10, "Unexpected value %d.\n", int_s); memset(int_v, 0, sizeof(int_v)); v = effect->lpVtbl->GetVariableByName(effect, "i2"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetIntArray(scalar, int_v, 0, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 0); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 1); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 48, "Unexpected offset %u.\n", var_desc.BufferOffset); float_s = 0.0f; v = effect->lpVtbl->GetVariableByName(effect, "f"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == 0.2f, "Unexpected value %.8e.\n", float_s); /* Matrix */ @@ -7561,7 +7559,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m1", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7571,7 +7569,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m2", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7581,7 +7579,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(&m_set, 0, sizeof(m_set)); *(unsigned int *)&m_set.m[0][0] = 1; @@ -7597,7 +7595,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_FLOAT, 2, 2, 1); compare_matrix("m4", __LINE__, &m_set, &m_ret, 2, 2, FALSE); @@ -7610,27 +7608,27 @@ static void test_effect_default_variable_value(void) ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(ret == 1, "Unexpected value.\n"); m = v->lpVtbl->GetMemberByName(v, "f2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == -0.2f, "Unexpected value %f.\n", float_s); m = v->lpVtbl->GetMemberByName(v, "b2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ret, "Unexpected value.\n"); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_raw_value(void) @@ -7652,29 +7650,29 @@ static void test_effect_raw_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Read 1 float at a time, from float4 vector. */ v = effect->lpVtbl->GetVariableByName(effect, "f4"); for (i = 0; i < 4; ++i) { hr = v->lpVtbl->GetRawValue(v, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } /* Offset outside of variable storage, returns adjacent memory contents. */ hr = v->lpVtbl->GetRawValue(v, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Array */ v = effect->lpVtbl->GetVariableByName(effect, "i2"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = v->lpVtbl->GetRawValue(v, i_v, 0, 8 * sizeof(float)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(i_v[0] == 9, "Unexpected value %d.\n", i_v[0]); ok(i_v[1] == 0, "Unexpected value %d.\n", i_v[1]); ok(i_v[2] == 0, "Unexpected value %d.\n", i_v[2]); @@ -7682,7 +7680,7 @@ static void test_effect_raw_value(void) ok(i_v[4] == 12, "Unexpected value %d.\n", i_v[4]); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 0.2f, "Unexpected value %f.\n", f); /* Matrix */ @@ -7715,25 +7713,25 @@ static void test_effect_raw_value(void) for (i = 0; i < 4; ++i) { hr = cb->lpVtbl->GetRawValue(cb, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } hr = cb->lpVtbl->GetRawValue(cb, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = cb->lpVtbl->GetRawValue(cb, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Invalid variable */ v = effect->lpVtbl->GetVariableByName(effect, "invalid"); hr = v->lpVtbl->GetRawValue(v, &f, 0, sizeof(f)); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7816,7 +7814,7 @@ static void test_effect_dynamic_numeric_field(void) } hr = create_effect(fx_test_effect_dynamic_numeric_field, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); ok(tech->lpVtbl->IsValid(tech), "Expected valid technique.\n"); @@ -7828,7 +7826,7 @@ static void test_effect_dynamic_numeric_field(void) memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(!stencil_ref, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7841,17 +7839,17 @@ static void test_effect_dynamic_numeric_field(void) v = effect->lpVtbl->GetVariableByName(effect, "i1"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); hr = scalar->lpVtbl->SetInt(scalar, 3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.StencilRef == 0x3, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); @@ -7862,13 +7860,13 @@ static void test_effect_dynamic_numeric_field(void) v = v->lpVtbl->GetElement(v, 1); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMSetDepthStencilState(device, NULL, 0x1); memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x4, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7881,7 +7879,7 @@ static void test_effect_dynamic_numeric_field(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8000,13 +7998,13 @@ static void test_effect_index_expression(void) } hr = create_effect(fx_test_index_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Initial index */ tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index.\n"); v = effect->lpVtbl->GetVariableByName(effect, "g_var"); @@ -8014,14 +8012,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8029,10 +8027,10 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8041,14 +8039,14 @@ static void test_effect_index_expression(void) /* Out of bounds index */ set_vec4(val, 0.0f, 0.0f, 2.0f, 2.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8056,14 +8054,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 3.0f, 3.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8071,14 +8069,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -1.0f, -1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8086,50 +8084,50 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -11.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); ID3D10BlendState_Release(bs); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.9f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); v = effect->lpVtbl->GetVariableByName(effect, "g_var2"); vector = v->lpVtbl->AsVector(v); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.0f, 1.0f, 0.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8201,12 +8199,12 @@ static void test_effect_value_expression(void) } hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8238,12 +8236,12 @@ static void test_effect_fx_4_1(void) } hr = create_effect(fx_test_fx_4_1, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } START_TEST(effect) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 6d6173824a2..13769d57e34 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,6 +22,9 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" -- 2.30.2

1 0

[PATCH v3 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v3 4/5] msvcrt: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH v3 3/5] msvcrt: Use %#I64x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/except_x86_64.c | 4 ++-- dlls/msvcrt/file.c | 33 +++++++++++++++------------------ dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/string.c | 10 +++++----- dlls/msvcrt/wcs.c | 14 +++++++------- 7 files changed, 36 insertions(+), 39 deletions(-)

1 0

[PATCH v3 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

1 0

[PATCH v3 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - use I64 instead of ll printf format dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++++--------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 ++++++++++---------- dlls/msvcp90/misc.c | 18 +++++++++--------- dlls/msvcp90/msvcp_main.c | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-)

1 0

[PATCH v2 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2 (supersedes 225926) - split the patch into msvcrt and msvcp part - use %llx format in msvcrt/except_x86_64.c when printing ULONG64 - add some whitespace changes dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++++--------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 ++++++++++---------- dlls/msvcp90/misc.c | 18 +++++++++--------- dlls/msvcp90/msvcp_main.c | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-)

1 1

[PATCH v2 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v2 4/5] msvcrt: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH v2 3/5] msvcrt: Use %#llx format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/except_x86_64.c | 4 ++-- dlls/msvcrt/file.c | 33 +++++++++++++++------------------ dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/string.c | 10 +++++----- dlls/msvcrt/wcs.c | 14 +++++++------- 7 files changed, 36 insertions(+), 39 deletions(-)

1 0

[PATCH v2 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

1 0

[PATCH] winegstreamer: Handle EnableDiscreteOutput and SpeakerConfig settings in WMSyncReader_SetOutputSetting().
by Andrey Gusev 08 Feb '22

08 Feb '22

Resident Evil 5 cutscenes have audio and don't hang. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winegstreamer/wm_syncreader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index e86645a207a..55940e2b370 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -271,6 +271,16 @@ static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD FIXME("Ignoring VideoSampleDurations setting.\n"); return S_OK; } + if (!wcscmp(name, L"EnableDiscreteOutput")) + { + FIXME("Ignoring EnableDiscreteOutput setting.\n"); + return S_OK; + } + if (!wcscmp(name, L"SpeakerConfig")) + { + FIXME("Ignoring SpeakerConfig setting.\n"); + return S_OK; + } else { FIXME("Unknown setting %s; returning E_NOTIMPL.\n", debugstr_w(name)); -- 2.34.1

2 1

[PATCH vkd3d 2/2] vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 54542331bed6..20cb0c357611 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -22,6 +22,8 @@ #include "preproc.tab.h" +#undef ERROR /* defined in wingdi.h */ + #define YYSTYPE PREPROC_YYSTYPE #define YYLTYPE PREPROC_YYLTYPE -- 2.34.1

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Define S_ISREG if necessary for the Windows build.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index ac6f6479c4c2..3f02ac03612b 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -48,6 +48,10 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, #define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) +#ifndef S_ISREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) { -- 2.34.1

2 1

[PATCH v2 8/8] server: Don't allow creating children of orphaned windows.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 33 +++++++++++++++++++++++++++++++-- server/window.c | 10 +++++++++- 2 files changed, 40 insertions(+), 3 deletions(-)

2 1

[PATCH v2 7/8] server: Orphan child windows when unlinking them from parent.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ server/window.c | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-)

2 1

[PATCH v2 6/8] server: Don't allow orphaned windows in set_parent request.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- server/window.c | 10 +++++++++- 3 files changed, 10 insertions(+), 5 deletions(-)

2 1

[PATCH v2 5/8] user32/tests: Add a test for child window destruction on thread exit.
by Jacek Caban 08 Feb '22

08 Feb '22

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 235 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+)

2 1

[PATCH] ddraw/tests: Skip a crashy test on WARP (v2).
by Stefan Dösinger 08 Feb '22

08 Feb '22

ddraw1 doesn't draw, so presumably not affected. Can't find any crashes in the testbot history http://test.winehq.org/data/4364ff8d5c0387edd6fae142affe8e844b291518/win81_… http://test.winehq.org/data/d03984709d87d6eaa0e2e7746f0db5d8fdf81b5a/win150… I haven't found any examples of ddraw7 crashing in this test. Doesn't mean there aren't any. Let's wait and see. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 2: Fixed the skip path, somehow releasing the uninitialized surface slipped through. --- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 625776c652c..1285fa1b682 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1076,6 +1076,17 @@ static void test_coop_level_d3d_state(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw2 crashes in EndScene, and if it doesn't crash it fails with + * DDERR_SURFACELOST on WARP. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); @@ -1159,12 +1170,9 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); - if (hr == DD_OK) - { - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b8acb674e3..399ef157497 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1301,6 +1301,14 @@ static void test_coop_level_d3d_state(void) hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw4 occasionally crashes in GetRenderTarget. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + goto done; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); @@ -1324,6 +1332,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); + IDirectDrawSurface4_Release(surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); @@ -1349,8 +1358,8 @@ static void test_coop_level_d3d_state(void) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), "Got unexpected color 0x%08x.\n", color); +done: destroy_viewport(device, viewport); - IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); IDirectDraw4_Release(ddraw); -- 2.34.1

3 2

[PATCH 2/2] winealsa: Remove alsa-pulse handle underrun workaround.
by Huw Davies 08 Feb '22

08 Feb '22

Pulse-based systems should be using winepulse.drv. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 102 +---------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8713b6153ce..0c4bd786342 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #include <alsa/asoundlib.h> WINE_DEFAULT_DEBUG_CHANNEL(alsa); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -613,89 +612,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -/* Using the pulse PCM device from alsa-plugins 1.0.24 triggers a bug - * which causes audio to cease playing after a few minutes of playback. - * Setting handle_underrun=1 on pulse-backed ALSA devices seems to work - * around this issue. */ -static snd_config_t *make_handle_underrun_config(const char *name) -{ - snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[260]; - const char *type_str; - int err; - - snd_config_update(); - - if((err = snd_config_copy(&lconf, snd_config)) < 0){ - WARN("snd_config_copy failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - sprintf(dev_node_name, "pcm.%s", name); - err = snd_config_search(lconf, dev_node_name, &dev_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - /* ALSA is extremely fragile. If it runs into a config setting it doesn't - * recognize, it tends to fail or assert. So we only want to inject - * handle_underrun=1 on devices that we know will recognize it. */ - err = snd_config_search(dev_node, "type", &type_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_get_string(type_node, &type_str)) < 0){ - snd_config_delete(lconf); - return NULL; - } - - if(strcmp(type_str, "pulse") != 0){ - snd_config_delete(lconf); - return NULL; - } - - err = snd_config_search(dev_node, "handle_underrun", &hu_node); - if(err >= 0){ - /* user already has an explicit handle_underrun setting, so don't - * use a local config */ - snd_config_delete(lconf); - return NULL; - } - if(err != -ENOENT){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_imake_integer(&hu_node, "handle_underrun", 1)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_imake_integer failed: %d (%s)\n", err, - snd_strerror(err)); - return NULL; - } - - if((err = snd_config_add(dev_node, hu_node)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_add failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - return lconf; -} - static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) { HKEY devices_key; @@ -762,8 +678,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int err; snd_pcm_stream_t stream; - snd_config_t *lconf; - static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -800,21 +714,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ - err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); - TRACE("Opening PCM device \"%s\" with handle_underrun: %d\n", alsa_name, err); - snd_config_delete(lconf); - /* Pulse <= 2010 returns EINVAL, it does not know handle_underrun. */ - if(err == -EINVAL){ - ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." - " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = FALSE; - } - }else - err = -EINVAL; - if(err == -EINVAL){ - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); - } + err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); -- 2.25.1

1 0

[PATCH v2 4/8] server: Don't immediately destroy child windows belonging to different thread in free_window_handle.
by Jacek Caban 08 Feb '22

08 Feb '22

Notify their thread instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_private.h | 18 ------------------ dlls/user32/win.c | 12 +----------- include/ntuser.h | 19 +++++++++++++++++++ server/window.c | 14 +++++++++----- 4 files changed, 29 insertions(+), 34 deletions(-)

1 0

[PATCH v2 3/8] server: Keep a reference to parent in window objects.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/window.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)

1 0

[PATCH v2 2/8] server: Make window struct a server object.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Tests show that orphaned windows' parents handles are no longer valid, but a number of operations of children still need to work, even things like MoveWindow(). For that to work, we still need to have parent object around. Following patches will use that for ref-counting, while having full server object is nice for things like leak detection. We could avoid making window object ref-counted by detecting if we're the last child alive when freeing its handle (and then destroying parent), but that doesn't seem cleaner. server/user.h | 2 +- server/window.c | 94 ++++++++++++++++++++++++++++++++++----------- server/winstation.c | 4 +- 3 files changed, 75 insertions(+), 25 deletions(-)

1 0

[PATCH v2 1/8] server: Allocate extra_bytes separatelly from window struct.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: fixed issues spotted by Huw server/window.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)

1 0

[PATCH 1/8] server: Allocate extra_bytes separatelly from window struct.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We will eventually use window_shared for that when it's ready. server/window.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

2 2

[PATCH] combase: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov 08 Feb '22

08 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 1 - dlls/combase/apartment.c | 18 +++--- dlls/combase/combase.c | 60 +++++++++---------- dlls/combase/errorinfo.c | 10 ++-- dlls/combase/hglobalstream.c | 10 ++-- dlls/combase/malloc.c | 4 +- dlls/combase/marshal.c | 111 +++++++++++++++++------------------ dlls/combase/roapi.c | 4 +- dlls/combase/rpc.c | 60 +++++++++---------- dlls/combase/stubmanager.c | 22 +++---- dlls/combase/usrmarshal.c | 18 +++--- 11 files changed, 157 insertions(+), 161 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index da83ab6154c..987616773dd 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = combase.dll IMPORTLIB = combase IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 690bc69db1b..c1b381879d3 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -264,7 +264,7 @@ static ULONG WINAPI local_server_AddRef(IServiceProvider *iface) struct local_server *local_server = impl_from_IServiceProvider(iface); LONG refcount = InterlockedIncrement(&local_server->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -274,7 +274,7 @@ static ULONG WINAPI local_server_Release(IServiceProvider *iface) struct local_server *local_server = impl_from_IServiceProvider(iface); LONG refcount = InterlockedDecrement(&local_server->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) { @@ -355,7 +355,7 @@ HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) LeaveCriticalSection(&apt->cs); if (FAILED(hr)) - ERR("Failed: %#x\n", hr); + ERR("Failed: %#lx\n", hr); return hr; } @@ -365,7 +365,7 @@ static struct apartment *apartment_construct(DWORD model) { struct apartment *apt; - TRACE("creating new apartment, model %d\n", model); + TRACE("creating new apartment, model %ld\n", model); apt = heap_alloc_zero(sizeof(*apt)); apt->tid = GetCurrentThreadId(); @@ -450,7 +450,7 @@ void apartment_release(struct apartment *apt) EnterCriticalSection(&apt_cs); refcount = InterlockedDecrement(&apt->refs); - TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), refcount); + TRACE("%s: after = %ld\n", wine_dbgstr_longlong(apt->oxid), refcount); if (apt->being_destroyed) { @@ -544,7 +544,7 @@ void apartment_release(struct apartment *apt) static DWORD apartment_addref(struct apartment *apt) { DWORD refs = InterlockedIncrement(&apt->refs); - TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1); + TRACE("%s: before = %ld\n", wine_dbgstr_longlong(apt->oxid), refs - 1); return refs; } @@ -779,7 +779,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = p_ole32_DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); + ERR("DllGetClassObject returned error %#lx for dll %s\n", hr, debugstr_w(dllpath)); return hr; } @@ -828,7 +828,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); + ERR("DllGetClassObject returned error %#lx for dll %s\n", hr, debugstr_w(dllpath)); } return hr; @@ -1260,7 +1260,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) hwnd = CreateWindowW(aptwinclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hProxyDll, NULL); if (!hwnd) { - ERR("CreateWindow failed with error %d\n", GetLastError()); + ERR("CreateWindow failed with error %ld\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } if (InterlockedCompareExchangePointer((void **)&apt->win, hwnd, NULL)) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4677972656f..3ffd08ab635 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -465,7 +465,7 @@ static ULONG WINAPI global_options_AddRef(IGlobalOptions *iface) struct global_options *options = impl_from_IGlobalOptions(iface); LONG refcount = InterlockedIncrement(&options->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -475,7 +475,7 @@ static ULONG WINAPI global_options_Release(IGlobalOptions *iface) struct global_options *options = impl_from_IGlobalOptions(iface); LONG refcount = InterlockedDecrement(&options->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) heap_free(options); @@ -485,7 +485,7 @@ static ULONG WINAPI global_options_Release(IGlobalOptions *iface) static HRESULT WINAPI global_options_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) { - FIXME("%p, %u, %lx.\n", iface, property, value); + FIXME("%p, %u, %Ix.\n", iface, property, value); return S_OK; } @@ -587,7 +587,7 @@ HRESULT WINAPI FreePropVariantArray(ULONG count, PROPVARIANT *rgvars) { ULONG i; - TRACE("%u, %p.\n", count, rgvars); + TRACE("%lu, %p.\n", count, rgvars); if (!rgvars) return E_INVALIDARG; @@ -1030,7 +1030,7 @@ HRESULT WINAPI CoQueryProxyBlanket(IUnknown *proxy, DWORD *authn_service, IClientSecurity_Release(client_security); } - if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + if (FAILED(hr)) ERR("-- failed with %#lx.\n", hr); return hr; } @@ -1043,7 +1043,7 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD aut IClientSecurity *client_security; HRESULT hr; - TRACE("%p, %u, %u, %p, %u, %u, %p, %#x.\n", proxy, authn_service, authz_service, servername, + TRACE("%p, %lu, %lu, %p, %lu, %lu, %p, %#lx.\n", proxy, authn_service, authz_service, servername, authn_level, imp_level, auth_info, capabilities); hr = IUnknown_QueryInterface(proxy, &IID_IClientSecurity, (void **)&client_security); @@ -1054,7 +1054,7 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD aut IClientSecurity_Release(client_security); } - if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + if (FAILED(hr)) ERR("-- failed with %#lx.\n", hr); return hr; } @@ -1075,7 +1075,7 @@ HRESULT WINAPI CoCopyProxy(IUnknown *proxy, IUnknown **proxy_copy) IClientSecurity_Release(client_security); } - if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + if (FAILED(hr)) ERR("-- failed with %#lx.\n", hr); return hr; } @@ -1149,7 +1149,7 @@ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR sd, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE *asAuthSvc, void *reserved1, DWORD authn_level, DWORD imp_level, void *reserved2, DWORD capabilities, void *reserved3) { - FIXME("%p, %d, %p, %p, %d, %d, %p, %d, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level, + FIXME("%p, %ld, %p, %p, %ld, %ld, %p, %ld, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level, imp_level, reserved2, capabilities, reserved3); return S_OK; @@ -1198,7 +1198,7 @@ HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2) */ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) { - FIXME("%s, %x, %p.\n", debugstr_guid(&guid), arg2, arg3); + FIXME("%s, %lx, %p.\n", debugstr_guid(&guid), arg2, arg3); return E_NOTIMPL; } @@ -1235,7 +1235,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, CLSID *clsidNew) hr = CLSIDFromString(buffW, clsidNew); if (FAILED(hr)) - ERR("Failed to get CLSID from string %s, hr %#x.\n", debugstr_w(buffW), hr); + ERR("Failed to get CLSID from string %s, hr %#lx.\n", debugstr_w(buffW), hr); done: if (hkey) RegCloseKey(hkey); return hr; @@ -1667,7 +1667,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out MULTI_QI multi_qi = { .pIID = riid }; HRESULT hr; - TRACE("%s, %p, %#x, %s, %p.\n", debugstr_guid(rclsid), outer, cls_context, debugstr_guid(riid), obj); + TRACE("%s, %p, %#lx, %s, %p.\n", debugstr_guid(rclsid), outer, cls_context, debugstr_guid(riid), obj); if (!obj) return E_POINTER; @@ -1683,7 +1683,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out HRESULT WINAPI CoCreateInstanceFromApp(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, void *server_info, ULONG count, MULTI_QI *results) { - TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, + TRACE("%s, %p, %#lx, %p, %lu, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); return CoCreateInstanceEx(rclsid, outer, cls_context | CLSCTX_APPCONTAINER, server_info, @@ -1850,7 +1850,7 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, } if (FAILED(hr)) - ERR("no class object %s could be created for context %#x\n", debugstr_guid(rclsid), clscontext); + ERR("no class object %s could be created for context %#lx\n", debugstr_guid(rclsid), clscontext); return hr; } @@ -1866,7 +1866,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o CLSID clsid; HRESULT hr; - TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); + TRACE("%s, %p, %#lx, %p, %lu, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); if (!count || !results) return E_INVALIDARG; @@ -1890,7 +1890,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o if (hr == CLASS_E_NOAGGREGATION && outer) FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); else - FIXME("no instance created for interface %s of class %s, hr %#x.\n", + FIXME("no instance created for interface %s of class %s, hr %#lx.\n", debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); return hr; } @@ -1904,7 +1904,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscontext, COSERVERINFO *server_info, REFIID riid, void **obj) { - TRACE("%s, %#x, %s\n", debugstr_guid(rclsid), clscontext, debugstr_guid(riid)); + TRACE("%s, %#lx, %s\n", debugstr_guid(rclsid), clscontext, debugstr_guid(riid)); return com_get_class_object(rclsid, clscontext, server_info, riid, obj); } @@ -2053,7 +2053,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD flags, DWORD timeout, ULONG handle UINT exit_code; HRESULT hr; - TRACE("%#x, %#x, %u, %p, %p\n", flags, timeout, handle_count, handles, index); + TRACE("%#lx, %#lx, %lu, %p, %p\n", flags, timeout, handle_count, handles, index); if (!index) return E_INVALIDARG; @@ -2118,7 +2118,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD flags, DWORD timeout, ULONG handle PENDINGTYPE pendingtype = tlsdata->pending_call_count_server ? PENDINGTYPE_NESTED : PENDINGTYPE_TOPLEVEL; DWORD be_handled = IMessageFilter_MessagePending(apt->filter, 0 /* FIXME */, now - start_time, pendingtype); - TRACE("IMessageFilter_MessagePending returned %d\n", be_handled); + TRACE("IMessageFilter_MessagePending returned %ld\n", be_handled); switch (be_handled) { @@ -2188,7 +2188,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD flags, DWORD timeout, ULONG handle } if (post_quit) PostQuitMessage(exit_code); - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx\n", hr); return hr; } @@ -2562,7 +2562,7 @@ static ULONG WINAPI thread_object_context_Release(IObjContext *iface) static HRESULT WINAPI thread_object_context_SetProperty(IObjContext *iface, REFGUID propid, CPFLAGS flags, IUnknown *punk) { - FIXME("%p, %s, %x, %p\n", iface, debugstr_guid(propid), flags, punk); + FIXME("%p, %s, %lx, %p\n", iface, debugstr_guid(propid), flags, punk); return E_NOTIMPL; } @@ -2771,7 +2771,7 @@ static void unlock_init_spies(struct tlsdata *tlsdata) */ HRESULT WINAPI CoInitializeWOW(DWORD arg1, DWORD arg2) { - FIXME("%#x, %#x\n", arg1, arg2); + FIXME("%#lx, %#lx\n", arg1, arg2); return S_OK; } @@ -2785,7 +2785,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(void *reserved, DWORD model) struct init_spy *cursor; HRESULT hr; - TRACE("%p, %#x\n", reserved, model); + TRACE("%p, %#lx\n", reserved, model); if (reserved) WARN("Unexpected reserved argument %p\n", reserved); @@ -2868,7 +2868,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) } else if (lockcount < 1) { - ERR("Unbalanced lock count %d\n", lockcount); + ERR("Unbalanced lock count %ld\n", lockcount); InterlockedExchangeAdd(&com_lockcount, 1); } @@ -2956,7 +2956,7 @@ HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid, IUnknown *object, DWORD cl struct apartment *apt; HRESULT hr = S_OK; - TRACE("%s, %p, %#x, %#x, %p\n", debugstr_guid(rclsid), object, clscontext, flags, cookie); + TRACE("%s, %p, %#lx, %#lx, %p\n", debugstr_guid(rclsid), object, clscontext, flags, cookie); if (!cookie || !object) return E_INVALIDARG; @@ -3089,7 +3089,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoRevokeClassObject(DWORD cookie) struct registered_class *cur; struct apartment *apt; - TRACE("%#x\n", cookie); + TRACE("%#lx\n", cookie); if (!(apt = apartment_get_current_or_mta())) { @@ -3137,7 +3137,7 @@ ULONG WINAPI CoAddRefServerProcess(void) refs = ++com_server_process_refcount; LeaveCriticalSection(&registered_classes_cs); - TRACE("refs before: %d\n", refs - 1); + TRACE("refs before: %ld\n", refs - 1); return refs; } @@ -3158,7 +3158,7 @@ ULONG WINAPI CoReleaseServerProcess(void) LeaveCriticalSection(&registered_classes_cs); - TRACE("refs after: %d\n", refs); + TRACE("refs after: %ld\n", refs); return refs; } @@ -3173,7 +3173,7 @@ HRESULT WINAPI CoDisconnectObject(IUnknown *object, DWORD reserved) IMarshal *marshal; HRESULT hr; - TRACE("%p, %#x\n", object, reserved); + TRACE("%p, %#lx\n", object, reserved); if (!object) return E_INVALIDARG; @@ -3360,7 +3360,7 @@ HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("%p 0x%x %p\n", hinstDLL, reason, reserved); + TRACE("%p, %#lx, %p\n", hinstDLL, reason, reserved); switch (reason) { diff --git a/dlls/combase/errorinfo.c b/dlls/combase/errorinfo.c index 83e2f0b7103..4ce9117d50d 100644 --- a/dlls/combase/errorinfo.c +++ b/dlls/combase/errorinfo.c @@ -111,7 +111,7 @@ static ULONG WINAPI errorinfo_AddRef(IErrorInfo *iface) struct error_info *error_info = impl_from_IErrorInfo(iface); ULONG refcount = InterlockedIncrement(&error_info->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -121,7 +121,7 @@ static ULONG WINAPI errorinfo_Release(IErrorInfo *iface) struct error_info *error_info = impl_from_IErrorInfo(iface); ULONG refcount = InterlockedDecrement(&error_info->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -275,7 +275,7 @@ static HRESULT WINAPI create_errorinfo_SetHelpContext(ICreateErrorInfo *iface, D { struct error_info *error_info = impl_from_ICreateErrorInfo(iface); - TRACE("%p, %#x.\n", iface, help_context); + TRACE("%p, %#lx.\n", iface, help_context); error_info->help_context = help_context; @@ -365,7 +365,7 @@ HRESULT WINAPI GetErrorInfo(ULONG reserved, IErrorInfo **error_info) struct tlsdata *tlsdata; HRESULT hr; - TRACE("%u, %p\n", reserved, error_info); + TRACE("%lu, %p\n", reserved, error_info); if (reserved || !error_info) return E_INVALIDARG; @@ -393,7 +393,7 @@ HRESULT WINAPI SetErrorInfo(ULONG reserved, IErrorInfo *error_info) struct tlsdata *tlsdata; HRESULT hr; - TRACE("%u, %p\n", reserved, error_info); + TRACE("%lu, %p\n", reserved, error_info); if (reserved) return E_INVALIDARG; diff --git a/dlls/combase/hglobalstream.c b/dlls/combase/hglobalstream.c index d957fae2c7d..3dc770a47ac 100644 --- a/dlls/combase/hglobalstream.c +++ b/dlls/combase/hglobalstream.c @@ -146,7 +146,7 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea ULONG dummy, len; char *buffer; - TRACE("%p, %p, %d, %p\n", iface, pv, cb, read_len); + TRACE("%p, %p, %ld, %p\n", iface, pv, cb, read_len); if (!read_len) read_len = &dummy; @@ -178,7 +178,7 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO ULONG dummy = 0; char *buffer; - TRACE("%p, %p, %d, %p\n", iface, pv, cb, written); + TRACE("%p, %p, %ld, %p\n", iface, pv, cb, written); if (!written) written = &dummy; @@ -197,7 +197,7 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO HRESULT hr = IStream_SetSize(iface, size); if (FAILED(hr)) { - ERR("IStream_SetSize failed with error 0x%08x\n", hr); + ERR("IStream_SetSize failed with error %#lx\n", hr); return hr; } } @@ -227,7 +227,7 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD orig ULARGE_INTEGER position = stream->position; HRESULT hr = S_OK; - TRACE("%p, %s, %d, %p\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, pos); + TRACE("%p, %s, %ld, %p\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, pos); switch (origin) { @@ -289,7 +289,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE HRESULT hr = S_OK; BYTE buffer[128]; - TRACE("%p, %p, %d, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written); + TRACE("%p, %p, %ld, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written); if (!dest) return STG_E_INVALIDPOINTER; diff --git a/dlls/combase/malloc.c b/dlls/combase/malloc.c index 2be03ae1e31..f31e1ef7705 100644 --- a/dlls/combase/malloc.c +++ b/dlls/combase/malloc.c @@ -144,7 +144,7 @@ static void * WINAPI allocator_Alloc(IMalloc *iface, SIZE_T cb) { void *addr; - TRACE("%ld.\n", cb); + TRACE("%Id.\n", cb); if (allocator.spy) { @@ -178,7 +178,7 @@ static void * WINAPI allocator_Realloc(IMalloc *iface, void *pv, SIZE_T cb) { void *addr; - TRACE("%p, %ld.\n",pv,cb); + TRACE("%p, %Id.\n", pv, cb); if (allocator.spy) { diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index f3ea3fcad50..b943c0dd6fa 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -206,7 +206,7 @@ static ULONG WINAPI ftmarshaler_inner_AddRef(IUnknown *iface) struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&marshaler->refcount); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); return refcount; } @@ -216,7 +216,7 @@ static ULONG WINAPI ftmarshaler_inner_Release(IUnknown *iface) struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&marshaler->refcount); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); if (!refcount) heap_free(marshaler); @@ -261,7 +261,7 @@ static ULONG WINAPI ftmarshaler_Release(IMarshal *iface) static HRESULT WINAPI ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid); + TRACE("%s, %p, %#lx, %p, %#lx, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid); if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX) *clsid = CLSID_InProcFreeMarshaler; @@ -283,7 +283,7 @@ static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid IMarshal *marshal = NULL; HRESULT hr; - TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size); + TRACE("%s, %p, %#lx, %p, %#lx, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size); /* If the marshalling happens inside the same process the interface pointer is copied between the apartments */ @@ -306,7 +306,7 @@ static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *str IMarshal *marshal = NULL; HRESULT hr; - TRACE("%p, %s, %p, %#x, %p, %#x\n", stream, debugstr_guid(riid), pv, + TRACE("%p, %s, %p, %#lx, %p, %#lx\n", stream, debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags); /* If the marshalling happens inside the same process the interface pointer is @@ -488,7 +488,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, IMarshal *marshal; HRESULT hr; - TRACE("%p, %s, %p, %x, %p, ", stream, debugstr_guid(riid), unk, dest_context, pvDestContext); + TRACE("%p, %s, %p, %lx, %p, ", stream, debugstr_guid(riid), unk, dest_context, pvDestContext); dump_mshflags(mshlFlags); TRACE("\n"); @@ -500,7 +500,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal); if (hr != S_OK) { - ERR("Failed to get marshaller, %#x\n", hr); + ERR("Failed to get marshaller, %#lx\n", hr); return hr; } @@ -508,7 +508,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, &marshaler_clsid); if (hr != S_OK) { - ERR("IMarshal::GetUnmarshalClass failed, %#x\n", hr); + ERR("IMarshal::GetUnmarshalClass failed, %#lx\n", hr); goto cleanup; } @@ -532,14 +532,14 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, &objref.u_objref.u_custom.size); if (hr != S_OK) { - ERR("Failed to get max size of marshal data, error %#x\n", hr); + ERR("Failed to get max size of marshal data, error %#lx\n", hr); goto cleanup; } /* write constant sized common header and OR_CUSTOM data into stream */ hr = IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_custom.pData), NULL); if (hr != S_OK) { - ERR("Failed to write OR_CUSTOM header to stream with %#x\n", hr); + ERR("Failed to write OR_CUSTOM header to stream with %#lx\n", hr); goto cleanup; } } @@ -549,14 +549,14 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, hr = IMarshal_MarshalInterface(marshal, stream, riid, unk, dest_context, pvDestContext, mshlFlags); if (hr != S_OK) { - ERR("Failed to marshal the interface %s, hr %#x\n", debugstr_guid(riid), hr); + ERR("Failed to marshal the interface %s, hr %#lx\n", debugstr_guid(riid), hr); goto cleanup; } cleanup: IMarshal_Release(marshal); - TRACE("completed with hr %#x\n", hr); + TRACE("completed with hr %#lx\n", hr); return hr; } @@ -575,14 +575,14 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + ERR("Failed to read common OBJREF header, %#lx\n", hr); return STG_E_READFAULT; } /* sanity check on header */ if (objref.signature != OBJREF_SIGNATURE) { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + ERR("Bad OBJREF signature %#lx\n", objref.signature); return RPC_E_INVALID_OBJREF; } @@ -605,7 +605,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, custom_header_size, &res); if (hr != S_OK || (res != custom_header_size)) { - ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); + ERR("Failed to read OR_CUSTOM header, %#lx\n", hr); return STG_E_READFAULT; } /* now create the marshaler specified in the stream */ @@ -615,13 +615,12 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, } else { - FIXME("Invalid or unimplemented marshaling type specified: %x\n", - objref.flags); + FIXME("Invalid or unimplemented marshaling type specified: %lx\n", objref.flags); return RPC_E_INVALID_OBJREF; } if (hr != S_OK) - ERR("Failed to create marshal, 0x%08x\n", hr); + ERR("Failed to create marshal, %#lx\n", hr); return hr; } @@ -684,7 +683,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *stream) { hr = std_release_marshal_data(stream); if (hr != S_OK) - ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr); + ERR("StdMarshal ReleaseMarshalData failed with error %#lx\n", hr); return hr; } if (hr != S_OK) @@ -693,7 +692,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *stream) /* call the helper object to do the releasing of marshal data */ hr = IMarshal_ReleaseMarshalData(marshal, stream); if (hr != S_OK) - ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr); + ERR("IMarshal::ReleaseMarshalData failed with error %#lx\n", hr); IMarshal_Release(marshal); return hr; @@ -780,7 +779,7 @@ static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_d if (stubmgr) stub_manager_int_release(stubmgr); if (stub_apt) apartment_release(stub_apt); - if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres); + if (hres != S_OK) WARN("Failed with error %#lx\n", hres); else TRACE("Successfully created proxy %p\n", *ppv); apartment_release(apt); @@ -807,7 +806,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) { hr = std_unmarshal_interface(0, NULL, stream, &iid, (void **)&object); if (hr != S_OK) - ERR("StdMarshal UnmarshalInterface failed, hr %#x\n", hr); + ERR("StdMarshal UnmarshalInterface failed, hr %#lx\n", hr); } else if (hr == S_OK) { @@ -815,7 +814,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) hr = IMarshal_UnmarshalInterface(marshal, stream, &iid, (void **)&object); IMarshal_Release(marshal); if (hr != S_OK) - ERR("IMarshal::UnmarshalInterface failed, hr %#x\n", hr); + ERR("IMarshal::UnmarshalInterface failed, hr %#lx\n", hr); } if (hr == S_OK) @@ -826,7 +825,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) TRACE("requested interface != marshalled interface, additional QI needed\n"); hr = IUnknown_QueryInterface(object, riid, ppv); if (hr != S_OK) - ERR("Couldn't query for interface %s, hr %#x\n", debugstr_guid(riid), hr); + ERR("Couldn't query for interface %s, hr %#lx\n", debugstr_guid(riid), hr); IUnknown_Release(object); } else @@ -835,7 +834,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) } } - TRACE("completed with hr 0x%x\n", hr); + TRACE("completed with hr %#lx\n", hr); return hr; } @@ -909,7 +908,7 @@ HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub); IPSFactoryBuffer_Release(psfb); if (hr != S_OK) - ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", + ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error %#lx\n", debugstr_guid(riid), hr); }else { WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); @@ -981,7 +980,7 @@ static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID rii static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) { struct proxy_manager *This = impl_from_IMultiQI(iface); - TRACE("%p - before %d\n", iface, This->refs); + TRACE("%p - before %ld\n", iface, This->refs); return InterlockedIncrement(&This->refs); } @@ -989,7 +988,7 @@ static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) { struct proxy_manager *This = impl_from_IMultiQI(iface); ULONG refs = InterlockedDecrement(&This->refs); - TRACE("%p - after %d\n", iface, refs); + TRACE("%p - after %ld\n", iface, refs); if (!refs) proxy_manager_destroy(This); return refs; @@ -1006,13 +1005,13 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL /* mapping of RemQueryInterface index to QueryMultipleInterfaces index */ ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping)); - TRACE("cMQIs: %d\n", cMQIs); + TRACE("cMQIs: %ld\n", cMQIs); /* try to get a local interface - this includes already active proxy * interfaces and also interfaces exposed by the proxy manager */ for (i = 0; i < cMQIs; i++) { - TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID)); + TRACE("iid[%ld] = %s\n", i, debugstr_guid(pMQIs[i].pIID)); pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf); if (pMQIs[i].hr == S_OK) successful_mqis++; @@ -1024,7 +1023,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL } } - TRACE("%d interfaces not found locally\n", nonlocal_mqis); + TRACE("%ld interfaces not found locally\n", nonlocal_mqis); /* if we have more than one interface not found locally then we must try * to query the remote object for it */ @@ -1048,7 +1047,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL nonlocal_mqis, iids, &qiresults); IRemUnknown_Release(remunk); if (FAILED(hr)) - WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + WARN("IRemUnknown_RemQueryInterface failed with error %#lx\n", hr); } /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of @@ -1083,7 +1082,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL CoTaskMemFree(qiresults); } - TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs); + TRACE("%ld/%ld successfully queried\n", successful_mqis, cMQIs); HeapFree(GetProcessHeap(), 0, iids); HeapFree(GetProcessHeap(), 0, mapping); @@ -1208,7 +1207,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( stdobjref.cPublicRefs = rif.cPublicRefs; } else - ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); + ERR("IRemUnknown_RemAddRef returned with %#lx, hrref = %#lx\n", hr, hrref); } } @@ -1216,7 +1215,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( { OBJREF objref; - TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", + TRACE("writing stdobjref: flags = %#lx cPublicRefs = %ld oxid = %s oid = %s ipid = %s\n", stdobjref.flags, stdobjref.cPublicRefs, wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid), @@ -1265,7 +1264,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( CoTaskMemFree(qiresults); } else - ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + ERR("IRemUnknown_RemQueryInterface failed with error %#lx\n", hr); IRemUnknown_Release(remunk); } } @@ -1316,7 +1315,7 @@ static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved) IMarshal *marshal; HRESULT hr; - TRACE("(%p, %x)\n", This, dwReserved); + TRACE("%p, %#lx\n", This, dwReserved); hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, This->dest_context_data, (void**)&marshal); @@ -1399,7 +1398,7 @@ static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, void *pAuthInfo, DWORD Capabilities) { - FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc, + FIXME("%p, %ld, %ld, %s, %ld, %ld, %p, %#lx: stub\n", pProxy, AuthnSvc, AuthzSvc, pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); return E_NOTIMPL; @@ -1452,7 +1451,7 @@ static HRESULT ifproxy_get_public_ref(struct ifproxy * This) if (hr == S_OK && hrref == S_OK) InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS); else - ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); + ERR("IRemUnknown_RemAddRef returned with %#lx, hrref = %#lx\n", hr, hrref); } } ReleaseMutex(This->parent->remoting_mutex); @@ -1476,7 +1475,7 @@ static HRESULT ifproxy_release_public_refs(struct ifproxy * This) { IRemUnknown *remunk = NULL; - TRACE("releasing %d refs\n", public_refs); + TRACE("releasing %ld refs\n", public_refs); hr = proxy_manager_get_remunknown(This->parent, &remunk); if (hr == S_OK) @@ -1495,7 +1494,7 @@ static HRESULT ifproxy_release_public_refs(struct ifproxy * This) wine_dbgstr_longlong(This->parent->oxid), wine_dbgstr_longlong(This->parent->oid)); else - ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr); + ERR("IRemUnknown_RemRelease failed with error %#lx\n", hr); } } ReleaseMutex(This->parent->remoting_mutex); @@ -1754,12 +1753,10 @@ static HRESULT proxy_manager_create_ifproxy( &ifproxy->proxy, &ifproxy->iface); IPSFactoryBuffer_Release(psfb); if (hr != S_OK) - ERR("Could not create proxy for interface %s, error 0x%08x\n", - debugstr_guid(riid), hr); + ERR("Could not create proxy for interface %s, error %#lx\n", debugstr_guid(riid), hr); } else - ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n", - debugstr_guid(riid), hr); + ERR("Could not get IPSFactoryBuffer for interface %s, error %#lx\n", debugstr_guid(riid), hr); if (hr == S_OK) hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan); @@ -1772,7 +1769,7 @@ static HRESULT proxy_manager_create_ifproxy( LeaveCriticalSection(&This->cs); *iif_out = ifproxy; - TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n", + TRACE("ifproxy %p created for IPID %s, interface %s with %lu public refs\n", ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs); } else @@ -1886,7 +1883,7 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk LeaveCriticalSection(&This->cs); apartment_release(apt); - TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr); + TRACE("got IRemUnknown* pointer %p, hr = %#lx\n", *remunk, hr); return hr; } @@ -2061,7 +2058,7 @@ static HRESULT WINAPI StdMarshalImpl_MarshalInterface(IMarshal *iface, IStream * apartment_release(apt); if (hr != S_OK) { - ERR("Failed to create ifstub, hr %#x\n", hr); + ERR("Failed to create ifstub, hr %#lx\n", hr); return hr; } @@ -2079,7 +2076,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *ap assert(apt); - TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", + TRACE("stdobjref: flags = %#lx cPublicRefs = %ld oxid = %s oid = %s ipid = %s\n", stdobjref->flags, stdobjref->cPublicRefs, wine_dbgstr_longlong(stdobjref->oxid), wine_dbgstr_longlong(stdobjref->oid), @@ -2145,19 +2142,19 @@ static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + ERR("Failed to read common OBJREF header, %#lx\n", hr); return STG_E_READFAULT; } if (objref.signature != OBJREF_SIGNATURE) { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + ERR("Bad OBJREF signature %#lx\n", objref.signature); return RPC_E_INVALID_OBJREF; } if (!(objref.flags & OBJREF_STANDARD)) { - FIXME("unsupported objref.flags = %x\n", objref.flags); + FIXME("unsupported objref.flags = %lx\n", objref.flags); return E_NOTIMPL; } @@ -2175,19 +2172,19 @@ static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + ERR("Failed to read common OBJREF header, %#lx\n", hr); return STG_E_READFAULT; } if (objref.signature != OBJREF_SIGNATURE) { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + ERR("Bad OBJREF signature %#lx\n", objref.signature); return RPC_E_INVALID_OBJREF; } if (!(objref.flags & OBJREF_STANDARD)) { - FIXME("unsupported objref.flags = %x\n", objref.flags); + FIXME("unsupported objref.flags = %lx\n", objref.flags); return E_NOTIMPL; } @@ -2246,11 +2243,11 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestCon { if (pUnk == NULL) { - FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", debugstr_guid(riid), dwDestContext, + FIXME("%s, NULL, %lx, %p, %lx, %p, unimplemented yet.\n", debugstr_guid(riid), dwDestContext, dest_context, flags, marshal); return E_NOTIMPL; } - TRACE("%s, %p, %x, %p, %x, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal); + TRACE("%s, %p, %lx, %p, %lx, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal); return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, dest_context, (void **)marshal); } diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 7d871fb885c..0a17f02b776 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -286,7 +286,7 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info) */ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception) { - FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); + FIXME("%#lx, %s, %p: stub\n", error, debugstr_hstring(message), language_exception); return FALSE; } @@ -295,7 +295,7 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow */ BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) { - FIXME("(%x %s) stub\n", error, debugstr_hstring(message)); + FIXME("%#lx, %s: stub\n", error, debugstr_hstring(message)); return FALSE; } diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 7337498e9fa..0a86183030a 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -224,7 +224,7 @@ static BOOL start_rpcss(void) } while (status.dwCurrentState == SERVICE_START_PENDING); if (status.dwCurrentState != SERVICE_RUNNING) - WARN("RpcSs failed to start %u\n", status.dwCurrentState); + WARN("RpcSs failed to start %lu\n", status.dwCurrentState); } else ERR("Failed to start RpcSs service\n"); @@ -388,7 +388,7 @@ static DWORD start_local_service(const WCHAR *name, DWORD num, LPCWSTR *params) SC_HANDLE handle, hsvc; DWORD r = ERROR_FUNCTION_FAILED; - TRACE("Starting service %s %d params\n", debugstr_w(name), num); + TRACE("Starting service %s %ld params\n", debugstr_w(name), num); handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (!handle) @@ -408,7 +408,7 @@ static DWORD start_local_service(const WCHAR *name, DWORD num, LPCWSTR *params) r = GetLastError(); CloseServiceHandle(handle); - TRACE("StartService returned error %u (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); + TRACE("StartService returned error %lu (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); return r; } @@ -601,7 +601,7 @@ HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, SIZE_T size; HRESULT hr; - TRACE("%s, %#x\n", debugstr_guid(clsid), flags); + TRACE("%s, %#lx\n", debugstr_guid(clsid), flags); hr = GetHGlobalFromStream(stream, &hmem); if (FAILED(hr)) return hr; @@ -652,7 +652,7 @@ static ULONG ChannelHooks_ClientGetSize(SChannelHookCallInfo *info, struct chann IChannelHook_ClientGetSize(entry->hook, &entry->id, &info->iid, &extension_size); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); extension_size = (extension_size+7)&~7; (*data)[hook_index].id = entry->id; @@ -698,7 +698,7 @@ static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info, IChannelHook_ClientFillBuffer(entry->hook, &entry->id, &info->iid, &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0])); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ @@ -771,7 +771,7 @@ static ULONG ChannelHooks_ServerGetSize(SChannelHookCallInfo *info, IChannelHook_ServerGetSize(entry->hook, &entry->id, &info->iid, S_OK, &extension_size); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); extension_size = (extension_size+7)&~7; (*data)[hook_index].id = entry->id; @@ -818,7 +818,7 @@ static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info, &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]), S_OK); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ @@ -1033,7 +1033,7 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, /* save away the message state again */ msg->Handle = message_state; - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1216,7 +1216,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, HeapFree(GetProcessHeap(), 0, channel_hook_data); - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1236,7 +1236,7 @@ static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) * RPC functions do */ data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); - TRACE("completed with status 0x%x\n", data->status); + TRACE("completed with status %#lx\n", data->status); SetEvent(data->handle); @@ -1267,7 +1267,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac struct apartment *apt = apartment_get_current_or_mta(); struct tlsdata *tlsdata; - TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod); + TRACE("%p, iMethod %ld\n", olemsg, olemsg->iMethod); hr = ClientRpcChannelBuffer_IsCorrectApartment(This, apt); if (hr != S_OK) @@ -1311,14 +1311,14 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac message_state->params.msg = olemsg; if (message_state->params.bypass_rpcrt) { - TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); + TRACE("Calling apartment thread %#lx...\n", message_state->target_tid); msg->ProcNum &= ~RPC_FLAGS_VALID_BIT; if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0, (LPARAM)&message_state->params)) { - ERR("PostMessage failed with error %u\n", GetLastError()); + ERR("PostMessage failed with error %lu\n", GetLastError()); /* Note: message_state->params.iface doesn't have a reference and * so doesn't need to be released */ @@ -1336,7 +1336,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac */ if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT)) { - ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); + ERR("QueueUserWorkItem failed with error %lu\n", GetLastError()); hr = E_UNEXPECTED; } else @@ -1363,11 +1363,11 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - TRACE("RPC call status: 0x%x\n", status); + TRACE("RPC call status: %#lx\n", status); if (status != RPC_S_OK) hr = HRESULT_FROM_WIN32(status); - TRACE("hrFault = 0x%08x\n", hrFault); + TRACE("hrFault = %#lx\n", hrFault); /* FIXME: this condition should be * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)" @@ -1407,7 +1407,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac if (hr == S_OK) hr = hrFault; - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx\n", hr); apartment_release(apt); return hr; @@ -1438,7 +1438,7 @@ static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface msg->Handle = message_state; - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1474,7 +1474,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface IRpcChannelBuffer_Release(message_state->params.chan); HeapFree(GetProcessHeap(), 0, message_state); - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1575,7 +1575,7 @@ HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid, if (status != RPC_S_OK) { - ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status); + ERR("Couldn't get binding for endpoint %s, status = %ld\n", debugstr_w(endpoint), status); return HRESULT_FROM_WIN32(status); } @@ -1649,7 +1649,7 @@ static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, /* arbitrary limit for security (don't know what native does) */ if (extensions->size > 256) { - ERR("too many extensions: %d\n", extensions->size); + ERR("too many extensions: %ld\n", extensions->size); return RPC_S_INVALID_BOUND; } @@ -1662,7 +1662,7 @@ static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, return RPC_S_INVALID_BOUND; if ((const char *)&wire_orpc_extent->data[wire_orpc_extent->conformance] > end) return RPC_S_INVALID_BOUND; - TRACE("size %u, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id)); + TRACE("size %lu, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id)); wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]; } msg->Buffer = wire_orpc_extent; @@ -1716,7 +1716,7 @@ static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis, if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) { - ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); + ERR("invalid flags %#lx\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); return RPC_E_INVALID_HEADER; } @@ -1759,7 +1759,7 @@ static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) { - ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); + ERR("invalid flags %#lx\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); return RPC_E_INVALID_HEADER; } @@ -1842,7 +1842,7 @@ void rpc_execute_call(struct dispatch_params *params) UlongToHandle(GetCurrentProcessId()), 0 /* FIXME */, &interface_info); - TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall); + TRACE("IMessageFilter_HandleInComingCall returned %ld\n", handlecall); switch (handlecall) { case SERVERCALL_REJECTED: @@ -1931,13 +1931,13 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); - TRACE("Calling apartment thread 0x%08x...\n", apt->tid); + TRACE("Calling apartment thread %#lx...\n", apt->tid); if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) WaitForSingleObject(params->handle, INFINITE); else { - ERR("PostMessage failed with error %u\n", GetLastError()); + ERR("PostMessage failed with error %lu\n", GetLastError()); IRpcChannelBuffer_Release(params->chan); IRpcStubBuffer_Release(params->stub); } @@ -2022,7 +2022,7 @@ HRESULT rpc_register_interface(REFIID riid) list_add_tail(&registered_interfaces, &rif->entry); else { - ERR("RpcServerRegisterIfEx failed with error %d\n", status); + ERR("RpcServerRegisterIfEx failed with error %ld\n", status); HeapFree(GetProcessHeap(), 0, rif); hr = HRESULT_FROM_WIN32(status); } @@ -2115,6 +2115,6 @@ BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args) */ HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info) { - FIXME("%x %s %p\n", client_pid, wine_dbgstr_longlong(proxy_addr), server_info); + FIXME("%lx, %s, %p.\n", client_pid, wine_dbgstr_longlong(proxy_addr), server_info); return E_NOTIMPL; } diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index e9f20962e3b..931d32f7f2e 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -74,7 +74,7 @@ struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer * struct ifstub *stub; HRESULT hr; - TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%x\n", wine_dbgstr_longlong(m->oid), sb, + TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%lx\n", wine_dbgstr_longlong(m->oid), sb, debugstr_guid(iid), dest_context); stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); @@ -300,7 +300,7 @@ static ULONG stub_manager_int_addref(struct stub_manager *m) refs = ++m->refs; LeaveCriticalSection(&m->apt->cs); - TRACE("before %d\n", refs - 1); + TRACE("before %ld\n", refs - 1); return refs; } @@ -314,7 +314,7 @@ ULONG stub_manager_int_release(struct stub_manager *m) EnterCriticalSection(&apt->cs); refs = --m->refs; - TRACE("after %d\n", refs); + TRACE("after %ld\n", refs); /* remove from apartment so no other thread can access it... */ if (!refs) @@ -341,7 +341,7 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno hres = IUnknown_QueryInterface(obj, &IID_IUnknown, (void**)&object); if (FAILED(hres)) { - ERR("QueryInterface(IID_IUnknown failed): %08x\n", hres); + ERR("QueryInterface(IID_IUnknown failed): %#lx\n", hres); return NULL; } @@ -421,7 +421,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak LeaveCriticalSection(&m->lock); - TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); + TRACE("added %lu refs to %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc); /* * NOTE: According to tests, creating a stub causes two AddConnection calls followed by @@ -454,7 +454,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea LeaveCriticalSection(&m->lock); - TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); + TRACE("removed %lu refs from %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc); if (last_extern_ref && m->extern_conn) IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); @@ -672,7 +672,7 @@ static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) refs = InterlockedIncrement(&remunk->refs); - TRACE("%p before: %d\n", iface, refs-1); + TRACE("%p before: %ld\n", iface, refs-1); return refs; } @@ -685,7 +685,7 @@ static ULONG WINAPI RemUnknown_Release(IRemUnknown *iface) if (!refs) HeapFree(GetProcessHeap(), 0, remunk); - TRACE("%p after: %d\n", iface, refs); + TRACE("%p after: %ld\n", iface, refs); return refs; } @@ -702,7 +702,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, DWORD dest_context; void *dest_context_data; - TRACE("%p, %s, %d, %d, %p, %p\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); + TRACE("%p, %s, %ld, %d, %p, %p.\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return hr; @@ -755,7 +755,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface, stub_manager_ext_addref(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE); if (InterfaceRefs[i].cPrivateRefs) - FIXME("Adding %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); + FIXME("Adding %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); stub_manager_int_release(stubmgr); apartment_release(apt); @@ -788,7 +788,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface, stub_manager_ext_release(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE, TRUE); if (InterfaceRefs[i].cPrivateRefs) - FIXME("Releasing %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); + FIXME("Releasing %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); stub_manager_int_release(stubmgr); apartment_release(apt); diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 48a6c2de4be..d12ea7f759c 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -112,25 +112,25 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) #define IMPL_WIREM_HANDLE(type) \ ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \ { \ - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, handle); \ + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, handle); \ return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \ } \ \ unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ { \ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \ } \ \ unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ { \ - TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, handle); \ + TRACE("%s, %p, %p.\n", debugstr_user_flags(pFlags), pBuffer, handle); \ return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \ } \ \ void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ { \ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \ + TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *handle); \ handle_UserFree(pFlags, (HANDLE *)handle); \ } @@ -163,7 +163,7 @@ IMPL_WIREM_HANDLE(HWND) */ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) { - TRACE("%s, %u, %p\n", debugstr_user_flags(pFlags), size, pCF); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), size, pCF); ALIGN_LENGTH(size, 3); @@ -363,7 +363,7 @@ void __RPC_USER CLIPFORMAT_UserFree(ULONG *pFlags, CLIPFORMAT *pCF) */ ULONG __RPC_USER HBITMAP_UserSize(ULONG *flags, ULONG size, HBITMAP *bmp) { - TRACE("(%s, %d, %p)\n", debugstr_user_flags(flags), size, *bmp); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(flags), size, *bmp); ALIGN_LENGTH(size, 3); @@ -642,7 +642,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *ph { ULONG size = StartingSize; - TRACE("%s, %u, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); ALIGN_LENGTH(size, 3); @@ -886,7 +886,7 @@ ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, U DWORD marshal_size = 0; HRESULT hr; - TRACE("%s, %#x, %u, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); + TRACE("%s, %#lx, %lu, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); hr = CoGetMarshalSizeMax(&marshal_size, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL); if (FAILED(hr)) return StartingSize; @@ -923,7 +923,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea DWORD size; void *ptr; - TRACE("%s, %#x, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); + TRACE("%s, %#lx, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); if (!h) return NULL; if (CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) -- 2.34.1

1 0

[PATCH] ntdll: Map ETXTBSY to STATUS_SHARING_VIOLATION.
by Jinoh Kang 08 Feb '22

08 Feb '22

This complements commit c75edd04c2c (server: Map ETXTBSY to STATUS_SHARING_VIOLATION., 2007-09-11). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..dbd9063e025 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -318,6 +318,7 @@ NTSTATUS errno_to_status( int err ) TRACE( "errno = %d\n", err ); switch (err) { + case ETXTBSY: case EAGAIN: return STATUS_SHARING_VIOLATION; case EBADF: return STATUS_INVALID_HANDLE; case EBUSY: return STATUS_DEVICE_BUSY; -- 2.34.1

1 0

[PATCH 1/5] user32/tests: Add more tests for windows destroyed by thread exit.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

3 6

[PATCH 8/8] server: Don't allow creating children of orphaned windows.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 33 +++++++++++++++++++++++++++++++-- server/window.c | 10 +++++++++- 2 files changed, 40 insertions(+), 3 deletions(-)

1 0

[PATCH 7/8] server: Orphan child windows when unlinking them from parent.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ server/window.c | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-)

1 0

[PATCH 6/8] server: Don't allow orphaned windows in set_parent request.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- server/window.c | 10 +++++++++- 3 files changed, 10 insertions(+), 5 deletions(-)

1 0

[PATCH 5/8] user32/tests: Add a test for child window destruction on thread exit.
by Jacek Caban 08 Feb '22

08 Feb '22

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 235 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+)

1 0

[PATCH 4/8] server: Don't immediately destroy child windows belonging to different thread in free_window_handle.
by Jacek Caban 08 Feb '22

08 Feb '22

Notify their thread instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_private.h | 18 ------------------ dlls/user32/win.c | 12 +----------- include/ntuser.h | 19 +++++++++++++++++++ server/window.c | 14 +++++++++----- 4 files changed, 29 insertions(+), 34 deletions(-)

1 0

[PATCH 3/8] server: Keep a reference to parent in window objects.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/window.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)

1 0

[PATCH 2/8] server: Make window struct a server object.
by Jacek Caban 08 Feb '22

08 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Tests show that orphaned windows' parents handles are no longer valid, but a number of operations of children still need to work, even things like MoveWindow(). For that to work, we still need to have parent object around. Following patches will use that for ref-counting, while having full server object is nice for things like leak detection. We could avoid making window object ref-counted by detecting if we're the last child alive when freeing its handle (and then destroying parent), but that doesn't seem cleaner. server/user.h | 2 +- server/window.c | 106 +++++++++++++++++++++++++++++++++----------- server/winstation.c | 4 +- 3 files changed, 83 insertions(+), 29 deletions(-)

1 0

[PATCH 1/3] winhttp/tests: Remove unused include.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 053f8315fec..21af2761323 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -32,7 +32,6 @@ #include <httprequestid.h> #include "wine/test.h" -#include "wine/heap.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -- 2.30.2

2 1

[PATCH 3/3] winhttp: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 1 - dlls/winhttp/handle.c | 10 ++-- dlls/winhttp/net.c | 39 +++++++------- dlls/winhttp/request.c | 106 +++++++++++++++++++-------------------- dlls/winhttp/session.c | 76 ++++++++++++++-------------- dlls/winhttp/url.c | 8 +-- 6 files changed, 119 insertions(+), 121 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 44ccf738d99..97266fbc92a 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 4fc94f10d01..38959fd6456 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -48,7 +48,7 @@ static ULONG_PTR max_handles; struct object_header *addref_object( struct object_header *hdr ) { ULONG refs = InterlockedIncrement( &hdr->refs ); - TRACE("%p -> refcount = %d\n", hdr, refs); + TRACE( "%p -> refcount = %lu\n", hdr, refs ); return hdr; } @@ -64,21 +64,21 @@ struct object_header *grab_object( HINTERNET hinternet ) LeaveCriticalSection( &handle_cs ); - TRACE("handle 0x%lx -> %p\n", handle, hdr); + TRACE( "handle %Ix -> %p\n", handle, hdr ); return hdr; } void release_object( struct object_header *hdr ) { ULONG refs = InterlockedDecrement( &hdr->refs ); - TRACE("object %p refcount = %d\n", hdr, refs); + TRACE( "object %p refcount = %lu\n", hdr, refs ); if (!refs) { if (hdr->type == WINHTTP_HANDLE_TYPE_REQUEST) close_connection( (struct request *)hdr ); send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); - TRACE("destroying object %p\n", hdr); + TRACE( "destroying object %p\n", hdr ); hdr->vtbl->destroy( hdr ); } } @@ -134,7 +134,7 @@ BOOL free_handle( HINTERNET hinternet ) if (handles[handle]) { hdr = handles[handle]; - TRACE("destroying handle 0x%lx for object %p\n", handle + 1, hdr); + TRACE( "destroying handle %Ix for object %p\n", handle + 1, hdr ); handles[handle] = NULL; ret = TRUE; } diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 446dbc996e7..19fafb25804 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -36,7 +36,7 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) { WSABUF wsabuf; DWORD size; - DWORD err; + int err; wsabuf.len = len; wsabuf.buf = (void *)msg; @@ -47,7 +47,7 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) return size; } err = WSAGetLastError(); - if (!(ovr && err == WSA_IO_PENDING)) WARN( "send error %u\n", err ); + if (!(ovr && err == WSA_IO_PENDING)) WARN( "send error %d\n", err ); return -1; } @@ -56,7 +56,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %u\n", WSAGetLastError()); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN( "recv error %d\n", WSAGetLastError() ); } while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; @@ -154,7 +154,7 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu } else err = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; - TRACE("returning %08x\n", err); + TRACE( "returning %#lx\n", err ); return err; } @@ -201,7 +201,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if ((conn->socket = WSASocketW( sockaddr->ss_family, SOCK_STREAM, 0, NULL, 0, WSA_FLAG_OVERLAPPED )) == -1) { ret = WSAGetLastError(); - WARN("unable to create socket (%u)\n", ret); + WARN( "unable to create socket (%lu)\n", ret ); free( conn ); return ret; } @@ -243,7 +243,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if (ret) { - WARN("unable to connect to host (%u)\n", ret); + WARN( "unable to connect to host (%lu)\n", ret ); closesocket( conn->socket ); free( conn ); return ret; @@ -296,7 +296,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if(out_buf.cbBuffer) { assert(status == SEC_I_CONTINUE_NEEDED); - TRACE("sending %u bytes\n", out_buf.cbBuffer); + TRACE( "sending %lu bytes\n", out_buf.cbBuffer ); size = sock_send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, NULL); if(size != out_buf.cbBuffer) { @@ -343,13 +343,13 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur break; } - TRACE("recv %lu bytes\n", size); + TRACE( "recv %Iu bytes\n", size ); in_bufs[0].cbBuffer += size; in_bufs[0].pvBuffer = read_buf; status = InitializeSecurityContextW(cred_handle, &ctx, hostname, isc_req_flags, 0, 0, &in_desc, 0, NULL, &out_desc, &attrs, NULL); - TRACE("InitializeSecurityContext ret %08x\n", status); + TRACE( "InitializeSecurityContext ret %#lx\n", status ); if(status == SEC_E_OK) { if(in_bufs[1].BufferType == SECBUFFER_EXTRA) @@ -366,7 +366,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur res = netconn_verify_cert(cert, hostname, security_flags, check_revocation); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { - WARN("cert verify failed: %u\n", res); + WARN( "cert verify failed: %lu\n", res ); break; } }else { @@ -390,7 +390,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { - WARN("Failed to initialize security context: %08x\n", status); + WARN( "Failed to initialize security context: %#lx\n", status ); free(conn->ssl_read_buf); conn->ssl_read_buf = NULL; free(conn->ssl_write_buf); @@ -420,12 +420,11 @@ static DWORD send_ssl_chunk( struct netconn *conn, const void *msg, size_t size, memcpy( bufs[1].pvBuffer, msg, size ); if ((res = EncryptMessage(&conn->ssl_ctx, 0, &buf_desc, 0)) != SEC_E_OK) { - WARN("EncryptMessage failed: %08x\n", res); + WARN( "EncryptMessage failed: %#lx\n", res ); return res; } - if (sock_send( conn->socket, conn->ssl_write_buf, - bufs[0].cbBuffer + bufs[1].cbBuffer + bufs[2].cbBuffer, ovr ) < 1) + if (sock_send( conn->socket, conn->ssl_write_buf, bufs[0].cbBuffer + bufs[1].cbBuffer + bufs[2].cbBuffer, ovr ) < 1) { WARN("send failed\n"); return WSAGetLastError(); @@ -531,7 +530,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S continue; default: - WARN("failed: %08x\n", res); + WARN( "failed: %#lx\n", res ); return res; } } while (res != SEC_E_OK); @@ -601,7 +600,7 @@ DWORD netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int SIZE_T cread = 0; if ((res = read_ssl_chunk( conn, (BYTE *)buf + size, len - size, &cread, &eof ))) { - WARN("read_ssl_chunk failed: %u\n", res); + WARN( "read_ssl_chunk failed: %lu\n", res ); if (!size) return res; break; } @@ -614,7 +613,7 @@ DWORD netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int } while (!size || ((flags & MSG_WAITALL) && size < len)); - TRACE("received %ld bytes\n", size); + TRACE( "received %Iu bytes\n", size ); *recvd = size; return ERROR_SUCCESS; } @@ -634,7 +633,7 @@ DWORD netconn_set_timeout( struct netconn *netconn, BOOL send, int value ) if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) { DWORD err = WSAGetLastError(); - WARN("setsockopt failed (%u)\n", err ); + WARN( "setsockopt failed (%lu)\n", err ); return err; } return ERROR_SUCCESS; @@ -654,7 +653,7 @@ BOOL netconn_is_alive( struct netconn *netconn ) while (!netconn->peek_msg && !(err = read_ssl_chunk( netconn, NULL, 0, &size, &eof )) && !eof) ; - TRACE("Checking secure connection, err %d.\n", err); + TRACE( "checking secure connection, err %lu\n", err ); if (netconn->peek_msg || err == WSAEWOULDBLOCK) { @@ -772,6 +771,6 @@ int netconn_get_cipher_strength( struct netconn *conn ) if (!conn->secure) return 0; res = QueryContextAttributesW(&conn->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); if(res != SEC_E_OK) - WARN("QueryContextAttributesW failed: %08x\n", res); + WARN( "QueryContextAttributesW failed: %#lx\n", res ); return res == SEC_E_OK ? conn_info.dwCipherStrength : 0; } diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c32a33cbaf2..d0732952e11 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -299,7 +299,7 @@ DWORD process_header( struct request *request, const WCHAR *field, const WCHAR * int index; struct header hdr; - TRACE("%s: %s 0x%08x\n", debugstr_w(field), debugstr_w(value), flags); + TRACE( "%s: %s %#lx\n", debugstr_w(field), debugstr_w(value), flags ); if ((index = get_header_index( request, field, 0, request_only )) >= 0) { @@ -405,12 +405,12 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD /*********************************************************************** * WinHttpAddRequestHeaders (winhttp.@) */ -BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD len, DWORD flags ) +BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, const WCHAR *headers, DWORD len, DWORD flags ) { DWORD ret; struct request *request; - TRACE("%p, %s, %u, 0x%08x\n", hrequest, debugstr_wn(headers, len), len, flags); + TRACE( "%p, %s, %lu, %#lx\n", hrequest, debugstr_wn(headers, len), len, flags ); if (!headers || !len) { @@ -637,7 +637,7 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n if (attr >= ARRAY_SIZE(attribute_table)) return ERROR_INVALID_PARAMETER; if (!attribute_table[attr]) { - FIXME("attribute %u not implemented\n", attr); + FIXME( "attribute %lu not implemented\n", attr ); return ERROR_WINHTTP_HEADER_NOT_FOUND; } TRACE("attribute %s\n", debugstr_w(attribute_table[attr])); @@ -698,12 +698,13 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n /*********************************************************************** * WinHttpQueryHeaders (winhttp.@) */ -BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, LPVOID buffer, LPDWORD buflen, LPDWORD index ) +BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, const WCHAR *name, void *buffer, DWORD *buflen, + DWORD *index ) { DWORD ret; struct request *request; - TRACE("%p, 0x%08x, %s, %p, %p, %p\n", hrequest, level, debugstr_w(name), buffer, buflen, index); + TRACE( "%p, %#lx, %s, %p, %p, %p\n", hrequest, level, debugstr_w(name), buffer, buflen, index ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -1047,7 +1048,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem break; default: - WARN("unknown target %x\n", target); + WARN( "unknown target %#lx\n", target ); return FALSE; } authinfo = *auth_ptr; @@ -1126,8 +1127,8 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem } if (status != SEC_E_OK) { - WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n", - debugstr_w(auth_schemes[scheme].str), status); + WARN( "AcquireCredentialsHandleW for scheme %s failed with error %#lx\n", + debugstr_w(auth_schemes[scheme].str), status ); free( authinfo ); return FALSE; } @@ -1199,7 +1200,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem } else { - ERR("InitializeSecurityContextW failed with error 0x%08x\n", status); + ERR( "InitializeSecurityContextW failed with error %#lx\n", status ); free( out.pvBuffer ); destroy_authinfo( authinfo ); *auth_ptr = NULL; @@ -1437,7 +1438,7 @@ static DWORD ensure_cred_handle( struct request *request ) if (status != SEC_E_OK) { - WARN( "AcquireCredentialsHandleW failed: 0x%08x\n", status ); + WARN( "AcquireCredentialsHandleW failed: %#lx\n", status ); return status; } return ERROR_SUCCESS; @@ -1735,7 +1736,7 @@ static DWORD start_next_chunk( struct request *request, BOOL notify ) else if (ch >= 'A' && ch <= 'F') chunk_size = chunk_size * 16 + ch - 'A' + 10; else if (ch == ';' || ch == '\r' || ch == '\n') { - TRACE("reading %u byte chunk\n", chunk_size); + TRACE( "reading %lu byte chunk\n", chunk_size ); if (request->content_length == ~0u) request->content_length = chunk_size; else request->content_length += chunk_size; @@ -1847,7 +1848,7 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD if (request->read_chunked && !request->read_chunked_size) ret = refill_buffer( request, async ); done: - TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + TRACE( "retrieved %u bytes (%lu/%lu)\n", bytes_read, request->content_read, request->content_length ); if (end_of_read_data( request )) finished_reading( request ); if (async) { @@ -2117,12 +2118,12 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD if (headers && (ret = add_request_headers( request, headers, headers_len, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))) { - TRACE("failed to add request headers: %u\n", ret); + TRACE( "failed to add request headers: %lu\n", ret ); return ret; } if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES) && (ret = add_cookie_headers( request ))) { - WARN("failed to add cookie headers: %u\n", ret); + WARN( "failed to add cookie headers: %lu\n", ret ); return ret; } @@ -2181,14 +2182,14 @@ static void CALLBACK task_send_request( TP_CALLBACK_INSTANCE *instance, void *ct /*********************************************************************** * WinHttpSendRequest (winhttp.@) */ -BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD headers_len, - LPVOID optional, DWORD optional_len, DWORD total_len, DWORD_PTR context ) +BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD headers_len, + void *optional, DWORD optional_len, DWORD total_len, DWORD_PTR context ) { DWORD ret; struct request *request; - TRACE("%p, %s, %u, %p, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional, - optional_len, total_len, context); + TRACE( "%p, %s, %lu, %p, %lu, %lu, %Ix\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional, + optional_len, total_len, context ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -2266,7 +2267,7 @@ static DWORD set_credentials( struct request *request, DWORD target, DWORD schem break; } default: - WARN("unknown target %u\n", target); + WARN( "unknown target %lu\n", target ); return ERROR_INVALID_PARAMETER; } return ERROR_SUCCESS; @@ -2275,13 +2276,13 @@ static DWORD set_credentials( struct request *request, DWORD target, DWORD schem /*********************************************************************** * WinHttpSetCredentials (winhttp.@) */ -BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD scheme, LPCWSTR username, - LPCWSTR password, LPVOID params ) +BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD scheme, const WCHAR *username, + const WCHAR *password, void *params ) { DWORD ret; struct request *request; - TRACE("%p, %x, 0x%08x, %s, %p, %p\n", hrequest, target, scheme, debugstr_w(username), password, params); + TRACE( "%p, %lu, %#lx, %s, %p, %p\n", hrequest, target, scheme, debugstr_w(username), password, params ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -2319,7 +2320,7 @@ static DWORD handle_authorization( struct request *request, DWORD status ) break; default: - ERR("unhandled status %u\n", status); + ERR( "unhandled status %lu\n", status ); return ERROR_WINHTTP_INTERNAL_ERROR; } @@ -2834,7 +2835,7 @@ static DWORD query_data_available( struct request *request, DWORD *available, BO } done: - TRACE("%u bytes available\n", count); + TRACE( "%lu bytes available\n", count ); if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); @@ -2922,13 +2923,13 @@ static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, /*********************************************************************** * WinHttpReadData (winhttp.@) */ -BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, LPDWORD read ) +BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DWORD *read ) { DWORD ret; struct request *request; BOOL async; - TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); + TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -3003,12 +3004,12 @@ static void CALLBACK task_write_data( TP_CALLBACK_INSTANCE *instance, void *ctx, /*********************************************************************** * WinHttpWriteData (winhttp.@) */ -BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write, LPDWORD written ) +BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_write, DWORD *written ) { DWORD ret; struct request *request; - TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_write, written); + TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_write, written ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -3048,7 +3049,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write static BOOL socket_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -3069,7 +3070,7 @@ static void socket_destroy( struct object_header *hdr ) static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -3087,7 +3088,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR struct request *request; HINTERNET hsocket = NULL; - TRACE("%p, %08lx\n", hrequest, context); + TRACE( "%p, %Ix\n", hrequest, context ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -3146,13 +3147,12 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len, int *sent, static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final, WSAOVERLAPPED *ovr ) { - DWORD i, offset = 2, len = buflen; - DWORD buffer_size, ret = 0; + DWORD i, offset = 2, len = buflen, buffer_size, ret = 0; int sent_size; char hdr[14]; char *ptr; - TRACE( "sending %02x frame, len %u.\n", opcode, len ); + TRACE( "sending %02x frame, len %lu\n", opcode, len ); if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); @@ -3188,7 +3188,7 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR new_size = min( buffer_size, MAX_FRAME_BUFFER_SIZE ); if (!(new = realloc( socket->send_frame_buffer, new_size ))) { - ERR("Out of memory, buffer_size %u.\n", buffer_size); + ERR( "out of memory, buffer_size %lu\n", buffer_size); return ERROR_OUTOFMEMORY; } socket->send_frame_buffer = new; @@ -3360,7 +3360,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ struct socket *socket; DWORD ret = 0; - TRACE("%p, %u, %p, %u\n", hsocket, type, buf, len); + TRACE( "%p, %u, %p, %lu\n", hsocket, type, buf, len ); if (len && !buf) return ERROR_INVALID_PARAMETER; if (type != WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE && type != WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE) @@ -3729,7 +3729,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D struct socket *socket; DWORD ret; - TRACE("%p, %p, %u, %p, %p\n", hsocket, buf, len, ret_len, ret_type); + TRACE( "%p, %p, %lu, %p, %p\n", hsocket, buf, len, ret_len, ret_type ); if (!buf || !len) return ERROR_INVALID_PARAMETER; @@ -3874,7 +3874,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r struct socket *socket; DWORD ret; - TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + TRACE( "%p, %u, %p, %lu\n", hsocket, status, reason, len ); if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; @@ -3949,7 +3949,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas struct socket *socket; DWORD ret; - TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + TRACE( "%p, %u, %p, %lu\n", hsocket, status, reason, len ); if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; @@ -4022,7 +4022,7 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status struct socket *socket; DWORD ret; - TRACE("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, ret_len); + TRACE( "%p, %p, %p, %lu, %p\n", hsocket, status, reason, len, ret_len ); if (!status || (len && !reason) || !ret_len) return ERROR_INVALID_PARAMETER; @@ -4218,7 +4218,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = LoadRegTypeLib( &LIBID_WinHttp, 5, 1, LOCALE_SYSTEM_DEFAULT, &typelib ); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR( "LoadRegTypeLib failed: %#lx\n", hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)&winhttp_typelib, typelib, NULL )) @@ -4231,7 +4231,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = ITypeLib_GetTypeInfoOfGuid( winhttp_typelib, winhttp_tid_id[tid], &typeinfo ); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(winhttp_tid_id[tid]), hr); + ERR( "GetTypeInfoOfGuid(%s) failed: %#lx\n", debugstr_guid(winhttp_tid_id[tid]), hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)(winhttp_typeinfo + tid), typeinfo, NULL )) @@ -4261,7 +4261,7 @@ static HRESULT WINAPI winhttp_request_GetTypeInfo( ITypeInfo **info ) { struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - TRACE("%p, %u, %u, %p\n", request, index, lcid, info); + TRACE( "%p, %u, %lu, %p\n", request, index, lcid, info ); return get_typeinfo( IWinHttpRequest_tid, info ); } @@ -4278,7 +4278,7 @@ static HRESULT WINAPI winhttp_request_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p, %s, %p, %u, %u, %p\n", request, debugstr_guid(riid), names, count, lcid, dispid); + TRACE( "%p, %s, %p, %u, %lu, %p\n", request, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -4306,8 +4306,8 @@ static HRESULT WINAPI winhttp_request_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p, %d, %s, %d, %d, %p, %p, %p, %p\n", request, member, debugstr_guid(riid), - lcid, flags, params, result, excep_info, arg_err); + TRACE( "%p, %ld, %s, %lu, %d, %p, %p, %p, %p\n", request, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); if (!IsEqualIID( riid, &IID_NULL )) return DISP_E_UNKNOWNINTERFACE; @@ -4331,7 +4331,7 @@ static HRESULT WINAPI winhttp_request_Invoke( hr = IWinHttpRequest_put_Option( &request->IWinHttpRequest_iface, V_I4( &option ), params->rgvarg[0] ); if (FAILED(hr)) - WARN("put_Option(%d) failed: %x\n", V_I4( &option ), hr); + WARN( "put_Option(%ld) failed: %#lx\n", V_I4( &option ), hr ); return hr; } else if (flags & (DISPATCH_PROPERTYGET | DISPATCH_METHOD)) @@ -4341,7 +4341,7 @@ static HRESULT WINAPI winhttp_request_Invoke( hr = IWinHttpRequest_get_Option( &request->IWinHttpRequest_iface, V_I4( &option ), result ); if (FAILED(hr)) - WARN("get_Option(%d) failed: %x\n", V_I4( &option ), hr); + WARN( "get_Option(%ld) failed: %#lx\n", V_I4( &option ), hr ); return hr; } @@ -4370,8 +4370,8 @@ static HRESULT WINAPI winhttp_request_SetProxy( struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); DWORD err = ERROR_SUCCESS; - TRACE("%p, %u, %s, %s\n", request, proxy_setting, debugstr_variant(&proxy_server), - debugstr_variant(&bypass_list)); + TRACE( "%p, %lu, %s, %s\n", request, proxy_setting, debugstr_variant(&proxy_server), + debugstr_variant(&bypass_list) ); EnterCriticalSection( &request->cs ); switch (proxy_setting) @@ -4424,7 +4424,7 @@ static HRESULT WINAPI winhttp_request_SetCredentials( DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */ DWORD err = ERROR_SUCCESS; - TRACE("%p, %s, %p, 0x%08x\n", request, debugstr_w(username), password, flags); + TRACE( "%p, %s, %p, %#lx\n", request, debugstr_w(username), password, flags ); EnterCriticalSection( &request->cs ); if (request->state < REQUEST_STATE_OPEN) @@ -5508,7 +5508,7 @@ static HRESULT WINAPI winhttp_request_SetTimeouts( { struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - TRACE("%p, %d, %d, %d, %d\n", request, resolve_timeout, connect_timeout, send_timeout, receive_timeout); + TRACE( "%p, %ld, %ld, %ld, %ld\n", request, resolve_timeout, connect_timeout, send_timeout, receive_timeout ); EnterCriticalSection( &request->cs ); request->resolve_timeout = resolve_timeout; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2620bf30ac0..971c51ada4f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -48,11 +48,11 @@ void send_callback( struct object_header *hdr, DWORD status, void *info, DWORD b { if (hdr->callback && (hdr->notify_mask & status)) { - TRACE("%p, 0x%08x, %p, %u, %u\n", hdr, status, info, buflen, hdr->recursion_count); + TRACE( "%p, %#lx, %p, %lu, %lu\n", hdr, status, info, buflen, hdr->recursion_count ); InterlockedIncrement( &hdr->recursion_count ); hdr->callback( hdr->handle, hdr->context, status, info, buflen ); InterlockedDecrement( &hdr->recursion_count ); - TRACE("returning from 0x%08x callback\n", status); + TRACE("returning from %#lx callback\n", status); } } @@ -145,7 +145,7 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -161,7 +161,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b { WINHTTP_PROXY_INFO *pi = buffer; - FIXME("%u %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass)); + FIXME( "%lu %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass) ); return TRUE; } case WINHTTP_OPTION_REDIRECT_POLICY: @@ -175,7 +175,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b } policy = *(DWORD *)buffer; - TRACE("0x%x\n", policy); + TRACE( "%#lx\n", policy ); hdr->redirect_policy = policy; return TRUE; } @@ -189,7 +189,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b EnterCriticalSection( &session->cs ); session->secure_protocols = *(DWORD *)buffer; LeaveCriticalSection( &session->cs ); - TRACE("0x%x\n", session->secure_protocols); + TRACE( "%#lx\n", session->secure_protocols ); return TRUE; } case WINHTTP_OPTION_DISABLE_FEATURE: @@ -226,15 +226,15 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b return TRUE; case WINHTTP_OPTION_MAX_CONNS_PER_SERVER: - FIXME("WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %d\n", *(DWORD *)buffer); + FIXME( "WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %lu\n", *(DWORD *)buffer ); return TRUE; case WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: - FIXME("WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", *(DWORD *)buffer); + FIXME( "WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %lu\n", *(DWORD *)buffer ); return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -255,7 +255,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST struct session *session; HINTERNET handle = NULL; - TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags); + TRACE( "%s, %lu, %s, %s, %#lx\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags ); if (!(session = calloc( 1, sizeof(*session) ))) return NULL; @@ -374,7 +374,7 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -533,13 +533,13 @@ end: /*********************************************************************** * WinHttpConnect (winhttp.@) */ -HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) +HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, const WCHAR *server, INTERNET_PORT port, DWORD reserved ) { struct connect *connect; struct session *session; HINTERNET hconnect = NULL; - TRACE("%p, %s, %u, %x\n", hsession, debugstr_w(server), port, reserved); + TRACE( "%p, %s, %u, %#lx\n", hsession, debugstr_w(server), port, reserved ); if (!server) { @@ -841,7 +841,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -870,7 +870,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b { WINHTTP_PROXY_INFO *pi = buffer; - FIXME("%u %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass)); + FIXME( "%lu %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass) ); return TRUE; } case WINHTTP_OPTION_DISABLE_FEATURE: @@ -884,7 +884,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } disable = *(DWORD *)buffer; - TRACE("0x%x\n", disable); + TRACE( "%#lx\n", disable ); hdr->disable_flags |= disable; return TRUE; } @@ -899,7 +899,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } policy = *(DWORD *)buffer; - TRACE("0x%x\n", policy); + TRACE( "%#lx\n", policy ); hdr->logon_policy = policy; return TRUE; } @@ -914,7 +914,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } policy = *(DWORD *)buffer; - TRACE("0x%x\n", policy); + TRACE( "%#lx\n", policy ); hdr->redirect_policy = policy; return TRUE; } @@ -932,7 +932,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b return FALSE; } flags = *(DWORD *)buffer; - TRACE("0x%x\n", flags); + TRACE( "%#lx\n", flags ); if (flags && (flags & ~accepted)) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -1070,14 +1070,14 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b case WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL: if (buflen == sizeof(DWORD)) { - FIXME("WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL %08x\n", *(DWORD *)buffer); + FIXME( "WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL %#lx\n", *(DWORD *)buffer ); return TRUE; } SetLastError(ERROR_INVALID_PARAMETER); return FALSE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -1119,15 +1119,15 @@ static WCHAR *get_request_path( const WCHAR *object ) /*********************************************************************** * WinHttpOpenRequest (winhttp.@) */ -HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR object, LPCWSTR version, - LPCWSTR referrer, LPCWSTR *types, DWORD flags ) +HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, const WCHAR *verb, const WCHAR *object, const WCHAR *version, + const WCHAR *referrer, const WCHAR **types, DWORD flags ) { struct request *request; struct connect *connect; HINTERNET hrequest = NULL; - TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), - debugstr_w(version), debugstr_w(referrer), types, flags); + TRACE( "%p, %s, %s, %s, %s, %p, %#lx\n", hconnect, debugstr_w(verb), debugstr_w(object), + debugstr_w(version), debugstr_w(referrer), types, flags ); if (types && TRACE_ON(winhttp)) { @@ -1236,7 +1236,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, if (hdr->vtbl->query_option) ret = hdr->vtbl->query_option( hdr, option, buffer, buflen ); else { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -1248,12 +1248,12 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, /*********************************************************************** * WinHttpQueryOption (winhttp.@) */ -BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, LPVOID buffer, LPDWORD buflen ) +BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, void *buffer, DWORD *buflen ) { BOOL ret = FALSE; struct object_header *hdr; - TRACE("%p, %u, %p, %p\n", handle, option, buffer, buflen); + TRACE( "%p, %lu, %p, %p\n", handle, option, buffer, buflen ); if (!(hdr = grab_object( handle ))) { @@ -1295,7 +1295,7 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D if (hdr->vtbl->set_option) ret = hdr->vtbl->set_option( hdr, option, buffer, buflen ); else { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -1307,12 +1307,12 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D /*********************************************************************** * WinHttpSetOption (winhttp.@) */ -BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWORD buflen ) +BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, void *buffer, DWORD buflen ) { BOOL ret = FALSE; struct object_header *hdr; - TRACE("%p, %u, %p, %u\n", handle, option, buffer, buflen); + TRACE( "%p, %lu, %p, %lu\n", handle, option, buffer, buflen ); if (!(hdr = grab_object( handle ))) { @@ -1366,7 +1366,7 @@ static WCHAR *detect_autoproxyconfig_url_dhcp(void) for (ptr = adapters; ptr; ptr = ptr->Next) { MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); - TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); + TRACE( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; /* FIXME: also skip adapters where DHCP is disabled */ @@ -1503,9 +1503,9 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, WCHAR **url ) { - TRACE("0x%08x, %p\n", flags, url); + TRACE( "%#lx, %p\n", flags, url ); if (!flags || !url) { @@ -2104,7 +2104,7 @@ void WINAPI WinHttpFreeProxySettings( WINHTTP_PROXY_SETTINGS *settings ) DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, DWORD_PTR ctx ) { - FIXME("%p, %s, %p, %lx\n", hresolver, debugstr_w(url), options, ctx); + FIXME( "%p, %s, %p, %Ix\n", hresolver, debugstr_w(url), options, ctx ); return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; } @@ -2114,7 +2114,7 @@ DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WIN DWORD WINAPI WinHttpGetProxyForUrlEx2( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, DWORD selection_len, BYTE *selection, DWORD_PTR ctx ) { - FIXME("%p, %s, %p, %u, %p, %lx\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx); + FIXME( "%p, %s, %p, %lu, %p, %Ix\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx ); return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; } @@ -2162,7 +2162,7 @@ DWORD WINAPI WinHttpReadProxySettings( HINTERNET hsession, const WCHAR *connecti */ DWORD WINAPI WinHttpResetAutoProxy( HINTERNET hsession, DWORD flags ) { - FIXME("%p, %08x\n", hsession, flags); + FIXME( "%p, %#lx\n", hsession, flags ); return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; } @@ -2181,7 +2181,7 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT struct object_header *hdr; WINHTTP_STATUS_CALLBACK ret; - TRACE("%p, %p, 0x%08x, 0x%lx\n", handle, callback, flags, reserved); + TRACE( "%p, %p, %#lx, %Ix\n", handle, callback, flags, reserved ); if (!(hdr = grab_object( handle ))) { diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 8efd5ed0c49..9e7f5478dfe 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -170,7 +170,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) /*********************************************************************** * WinHttpCrackUrl (winhttp.@) */ -BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) +BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPONENTSW *uc ) { WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; @@ -178,7 +178,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN BOOL overflow = FALSE; DWORD err; - TRACE("%s, %d, %x, %p\n", debugstr_wn(url, len), len, flags, uc); + TRACE( "%s, %lu, %#lx, %p\n", debugstr_wn(url, len), len, flags, uc ); if (!url || !uc || uc->dwStructSize != sizeof(*uc)) { @@ -427,12 +427,12 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) /*********************************************************************** * WinHttpCreateUrl (winhttp.@) */ -BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) +BOOL WINAPI WinHttpCreateUrl( URL_COMPONENTS *uc, DWORD flags, WCHAR *url, DWORD *required ) { DWORD len, len_escaped; INTERNET_SCHEME scheme; - TRACE("%p, 0x%08x, %p, %p\n", uc, flags, url, required); + TRACE( "%p, %#lx, %p, %p\n", uc, flags, url, required ); if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required) { -- 2.30.2

1 0

[PATCH 2/3] winhttp/tests: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/Makefile.in | 1 - dlls/winhttp/tests/notification.c | 422 +++---- dlls/winhttp/tests/url.c | 190 +-- dlls/winhttp/tests/winhttp.c | 1902 ++++++++++++++--------------- 4 files changed, 1246 insertions(+), 1269 deletions(-) diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 73dce0b7dc9..77ebefae170 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = winhttp.dll IMPORTS = winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 121190ba9d2..ffde61b3bf5 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -104,16 +104,16 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW info->index++; while (info->index < info->count && (info->test[info->index].flags & NF_WINE_ALLOW)) { - todo_wine ok(info->test[info->index].status != status, "unexpected %x notification\n", status); + todo_wine ok( info->test[info->index].status != status, "unexpected %#lx notification\n", status ); if (info->test[info->index].status == status) break; info->index++; } - ok(info->index < info->count, "%u: unexpected notification 0x%08x\n", info->line, status); + ok( info->index < info->count, "%u: unexpected notification %#lx\n", info->line, status ); if (info->index >= info->count) return; status_ok = (info->test[info->index].status == status); function_ok = (info->test[info->index].function == info->function); - ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[info->index].status, status); + ok( status_ok, "%u: expected status %#x got %#lx\n", info->line, info->test[info->index].status, status ); ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[info->index].function, info->function); if (info->test[info->index].flags & NF_MAIN_THREAD) @@ -222,7 +222,7 @@ static void test_connection_cache( void ) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); @@ -235,15 +235,15 @@ static void test_connection_cache( void ) WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -253,16 +253,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -271,10 +271,10 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -284,16 +284,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -305,7 +305,7 @@ static void test_connection_cache( void ) if (unload) { status = WaitForSingleObject( event, 0 ); - ok(status == WAIT_TIMEOUT, "got %08x\n", status); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -315,12 +315,11 @@ static void test_connection_cache( void ) if (unload) { status = WaitForSingleObject( event, 100 ); - ok(status == WAIT_OBJECT_0, "got %08x\n", status); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } - ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); if (unload) { @@ -331,18 +330,18 @@ static void test_connection_cache( void ) WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -352,16 +351,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -370,10 +369,10 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -383,16 +382,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); setup_test( &info, winhttp_close_handle, __LINE__ ); done: @@ -403,7 +402,7 @@ done: if (unload) { status = WaitForSingleObject( event, 0 ); - ok(status == WAIT_TIMEOUT, "got %08x\n", status); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -415,7 +414,7 @@ done: if (unload) { status = WaitForSingleObject( event, 100 ); - ok(status == WAIT_OBJECT_0, "got %08x\n", status); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } CloseHandle( event ); @@ -462,20 +461,20 @@ static void test_redirect( void ) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/redirect", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -485,16 +484,16 @@ static void test_redirect( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); setup_test( &info, winhttp_close_handle, __LINE__ ); done: @@ -543,7 +542,7 @@ static void test_async( void ) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); @@ -556,27 +555,27 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); err = GetLastError(); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); SetLastError( 0xdeadbeef ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); err = GetLastError(); - ok(ret, "failed to set context value %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "failed to set context value %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_connect, __LINE__ ); SetLastError( 0xdeadbeef ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); err = GetLastError(); - ok(con != NULL, "failed to open a connection %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err); + ok( con != NULL, "failed to open a connection %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); err = GetLastError(); - ok(req != NULL, "failed to open a request %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok( req != NULL, "failed to open a request %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); setup_test( &info, winhttp_send_request, __LINE__ ); SetLastError( 0xdeadbeef ); @@ -591,8 +590,8 @@ static void test_async( void ) CloseHandle( info.wait ); return; } - ok(ret, "failed to send request %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok( ret, "failed to send request %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); @@ -600,8 +599,8 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( req, NULL ); err = GetLastError(); - ok(ret, "failed to receive response %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok( ret, "failed to receive response %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); @@ -609,33 +608,33 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); err = GetLastError(); - ok(ret, "failed unexpectedly %u\n", err); - ok(status == 200, "request failed unexpectedly %u\n", status); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_query_data, __LINE__ ); SetLastError( 0xdeadbeef ); ret = WinHttpQueryDataAvailable( req, NULL ); err = GetLastError(); - ok(ret, "failed to query data available %u\n", err); - ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "failed to query data available %lu\n", err ); + ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok(info.last_status == WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, "got status %#x.\n", status); - ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) - || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), - "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); + ok( info.last_status == WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, "got status %#lx\n", status ); + ok(( err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "got unexpected thread %#lx, err %#lx\n", info.last_thread_id, err ); setup_test( &info, winhttp_read_data, __LINE__ ); ret = WinHttpReadData( req, buffer, sizeof(buffer), NULL ); - ok(ret, "failed to read data %u\n", err); + ok( ret, "failed to read data %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok(info.last_status == WINHTTP_CALLBACK_STATUS_READ_COMPLETE, "got status %#x.\n", status); - ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) - || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), - "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); + ok( info.last_status == WINHTTP_CALLBACK_STATUS_READ_COMPLETE, "got status %#lx\n", status ); + ok( (err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "got unexpected thread %#lx, err %#lx\n", info.last_thread_id, err ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); @@ -644,7 +643,7 @@ static void test_async( void ) if (unload) { status = WaitForSingleObject( event, 0 ); - ok(status == WAIT_TIMEOUT, "got %08x\n", status); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } WinHttpCloseHandle( ses ); WaitForSingleObject( info.wait, INFINITE ); @@ -653,7 +652,7 @@ static void test_async( void ) if (unload) { status = WaitForSingleObject( event, 2000 ); - ok(status == WAIT_OBJECT_0, "got %08x\n", status); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } CloseHandle( event ); CloseHandle( info.wait ); @@ -767,7 +766,7 @@ static void test_websocket(BOOL secure) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok( session != NULL, "got %u\n", GetLastError() ); + ok( session != NULL, "got %lu\n", GetLastError() ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ret = WinHttpSetOption( session, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); @@ -781,44 +780,44 @@ static void test_websocket(BOOL secure) { protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(session, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); - ok(ret, "failed to set protocols %u\n", GetLastError()); + ok( ret, "failed to set protocols %lu\n", GetLastError() ); } SetLastError( 0xdeadbeef ); WinHttpSetStatusCallback( session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); err = GetLastError(); - ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); SetLastError( 0xdeadbeef ); ret = WinHttpSetOption( session, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context) ); err = GetLastError(); - ok( ret, "got %u\n", err ); - ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "got %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_connect, __LINE__ ); SetLastError( 0xdeadbeef ); connection = WinHttpConnect( session, L"ws.ifelse.io", 0, 0 ); err = GetLastError(); - ok( connection != NULL, "got %u\n", err); - ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err ); + ok( connection != NULL, "got %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); err = GetLastError(); - ok( request != NULL, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( request != NULL, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); if (secure) { flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok( ret, "failed to set security flags %lu\n", GetLastError() ); } ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); SetLastError( 0xdeadbeef ); @@ -833,81 +832,76 @@ static void test_websocket(BOOL secure) CloseHandle( info.wait ); return; } - ok( ret, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( ret, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_receive_response, __LINE__ ); SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( request, NULL ); err = GetLastError(); - ok( ret, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( ret, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); size = sizeof(status); SetLastError( 0xdeadbeef ); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); err = GetLastError(); - ok( ret, "failed unexpectedly %u\n", err ); - ok( status == 101, "got %u\n", status ); - ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err ); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 101, "got %lu\n", status ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); SetLastError( 0xdeadbeef ); socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); err = GetLastError(); - ok( socket != NULL, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( socket != NULL, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); /* The send is executed synchronously (even if sending a reasonably big buffer exceeding SSL buffer size). * It is possible to trigger queueing the send into another thread but that involves sending a considerable * amount of big enough buffers. */ big_buffer = malloc( BIG_BUFFER_SIZE ); - for (i = 0; i < BIG_BUFFER_SIZE; ++i) - big_buffer[i] = (i & 0xff) ^ 0xcc; + for (i = 0; i < BIG_BUFFER_SIZE; ++i) big_buffer[i] = (i & 0xff) ^ 0xcc; setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - big_buffer, BIG_BUFFER_SIZE ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, big_buffer, BIG_BUFFER_SIZE ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - (void*)"hello", sizeof("hello") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - (void*)"hello", sizeof("hello") ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - (void*)"hello", sizeof("hello") ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; size = 0xdeadbeef; type = 0xdeadbeef; err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok( info.buflen == sizeof(*ws_status), "got unexpected buflen %u.\n", info.buflen ); + ok( info.buflen == sizeof(*ws_status), "got %u\n", info.buflen ); ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer; ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, - "Got unexpected eBufferType %u.\n", ws_status->eBufferType ); - ok( size == 0xdeadbeef, "got %u\n", size ); + "got unexpected eBufferType %u\n", ws_status->eBufferType ); + ok( size == 0xdeadbeef, "got %lu\n", size ); ok( type == 0xdeadbeef, "got %u\n", type ); ok( buffer[0] == 'R', "unexpected data\n" ); @@ -923,21 +917,19 @@ static void test_websocket(BOOL secure) ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer; ws_status->eBufferType = ~0u; err = pWinHttpWebSocketReceive( socket, big_buffer + offset, BIG_BUFFER_SIZE - offset, &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok( info.buflen == sizeof(*ws_status), "got unexpected buflen %u.\n", info.buflen ); + ok( info.buflen == sizeof(*ws_status), "got %u\n", info.buflen ); ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE - || ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, - "Got unexpected eBufferType %u.\n", ws_status->eBufferType ); + || ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, "got %u\n", ws_status->eBufferType ); offset += ws_status->dwBytesTransferred; - ok( offset <= BIG_BUFFER_SIZE, "Got unexpected dwBytesTransferred %u.\n", - ws_status->dwBytesTransferred ); - ok( size == 0xdeadbeef, "got %u\n", size ); + ok( offset <= BIG_BUFFER_SIZE, "got %lu\n", ws_status->dwBytesTransferred ); + ok( size == 0xdeadbeef, "got %lu\n", size ); ok( type == 0xdeadbeef, "got %u\n", type ); } while (ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE); - ok( offset == BIG_BUFFER_SIZE, "Got unexpected offset %u.\n", offset ); + ok( offset == BIG_BUFFER_SIZE, "got %u\n", offset ); for (i = 0; i < BIG_BUFFER_SIZE; ++i) if (big_buffer[i] != ((i & 0xff) ^ 0xcc)) break; @@ -948,21 +940,21 @@ static void test_websocket(BOOL secure) close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( size == sizeof(buffer) + 1, "got %lu\n", size ); setup_test( &info, winhttp_websocket_close, __LINE__ ); err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); ok( close_status == 1000, "got %u\n", close_status ); - ok( size <= sizeof(buffer), "got %u\n", size ); + ok( size <= sizeof(buffer), "got %lu\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket ); @@ -978,75 +970,73 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_open_request, __LINE__ ); request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); - ok( request != NULL, "got %u\n", err ); + ok( request != NULL, "got %lu\n", err ); if (secure) { flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok( ret, "failed to set security flags %lu\n", GetLastError() ); } ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( request, NULL ); - ok( ret, "got %u\n", err ); + ok( ret, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed unexpectedly %u\n", err ); - ok( status == 101, "got %u\n", status ); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 101, "got %lu\n", status ); setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); - ok( socket != NULL, "got %u\n", err ); + ok( socket != NULL, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); ok( buffer[0] == 'R', "unexpected data\n" ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); setup_test( &info, winhttp_websocket_close, __LINE__ ); err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); - ok( info.buflen == sizeof(*result), "got unexpected buflen %u.\n", info.buflen ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); + ok( info.buflen == sizeof(*result), "got %u\n", info.buflen ); result = (WINHTTP_WEB_SOCKET_ASYNC_RESULT *)info.buffer; - ok( result->Operation == WINHTTP_WEB_SOCKET_RECEIVE_OPERATION, "got unexpected operation %u.\n", - result->Operation ); - ok( !result->AsyncResult.dwResult, "got unexpected result %lu.\n", result->AsyncResult.dwResult ); - ok( result->AsyncResult.dwError == ERROR_WINHTTP_OPERATION_CANCELLED, "got unexpected error %u.\n", - result->AsyncResult.dwError ); + ok( result->Operation == WINHTTP_WEB_SOCKET_RECEIVE_OPERATION, "got %u\n", result->Operation ); + ok( !result->AsyncResult.dwResult, "got %Iu\n", result->AsyncResult.dwResult ); + ok( result->AsyncResult.dwError == ERROR_WINHTTP_OPERATION_CANCELLED, "got %lu\n", result->AsyncResult.dwError ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( size == sizeof(buffer) + 1, "got %lu\n", size ); WaitForSingleObject( info.wait, INFINITE ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); ok( close_status == 1000, "got %u\n", close_status ); - ok( size <= sizeof(buffer), "got %u\n", size ); + ok( size <= sizeof(buffer), "got %lu\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket ); @@ -1062,88 +1052,87 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_open_request, __LINE__ ); request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); - ok( request != NULL, "got %u\n", err ); + ok( request != NULL, "got %lu\n", err ); if (secure) { flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok( ret, "failed to set security flags %lu\n", GetLastError() ); } ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( request, NULL ); - ok( ret, "got %u\n", err ); + ok( ret, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed unexpectedly %u\n", err ); - ok( status == 101, "got %u\n", status ); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 101, "got %lu\n", status ); setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); - ok( socket != NULL, "got %u\n", err ); + ok( socket != NULL, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); ok( buffer[0] == 'R', "unexpected data\n" ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer; ws_status->eBufferType = ~0u; err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( size == sizeof(buffer) + 1, "got %lu\n", size ); WaitForSingleObject( info.wait, INFINITE ); - ok( info.buflen == sizeof(*ws_status), "got unexpected buflen %u.\n", info.buflen ); - ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, "Got unexpected eBufferType %u.\n", - ws_status->eBufferType ); - ok( !ws_status->dwBytesTransferred, "got unexpected dwBytesTransferred %u.\n", ws_status->dwBytesTransferred ); + ok( info.buflen == sizeof(*ws_status), "got %u\n", info.buflen ); + ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, "got %u\n", ws_status->eBufferType ); + ok( !ws_status->dwBytesTransferred, "got %lu\n", ws_status->dwBytesTransferred ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); ok( close_status == 1000, "got %u\n", close_status ); - ok( size <= sizeof(buffer), "got %u\n", size ); + ok( size <= sizeof(buffer), "got %lu\n", size ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); info.buflen = 0xdeadbeef; setup_test( &info, winhttp_websocket_close, __LINE__ ); err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok( !info.buflen, "Got unexpected buflen %u.\n", info.buflen ); + ok( !info.buflen, "got %u\n", info.buflen ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -1154,7 +1143,7 @@ static void test_websocket(BOOL secure) if (unload) { status = WaitForSingleObject( event, 0 ); - ok( status == WAIT_TIMEOUT, "got %08x\n", status ); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } WinHttpCloseHandle( session ); WaitForSingleObject( info.wait, INFINITE ); @@ -1163,7 +1152,7 @@ static void test_websocket(BOOL secure) if (unload) { status = WaitForSingleObject( event, 2000 ); - ok( status == WAIT_OBJECT_0, "got %08x\n", status ); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } CloseHandle( event ); CloseHandle( info.wait ); @@ -1265,30 +1254,30 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) BOOL ret; ses = WinHttpOpen(NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok( ret, "failed to query status code %lu\n", GetLastError()); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); count = 0; memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count); - ok(ret, "failed to read data %u\n", GetLastError()); + ok( ret, "failed to read data %lu\n", GetLastError() ); ok(count == sizeof page1 - 1, "count was wrong\n"); ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); @@ -1337,22 +1326,22 @@ static void open_async_request(int port, struct test_request *req, struct info * } req->session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok(req->session != NULL, "failed to open session %u\n", GetLastError()); + ok( req->session != NULL, "failed to open session %lu\n", GetLastError() ); WinHttpSetOption( req->session, WINHTTP_OPTION_CONTEXT_VALUE, &info, sizeof(struct info *) ); WinHttpSetStatusCallback( req->session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); setup_test( info, winhttp_connect, __LINE__ ); req->connection = WinHttpConnect( req->session, L"localhost", port, 0 ); - ok(req->connection != NULL, "failed to open a connection %u\n", GetLastError()); + ok( req->connection != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( info, winhttp_open_request, __LINE__ ); req->request = WinHttpOpenRequest( req->connection, NULL, path, NULL, NULL, NULL, 0 ); - ok(req->request != NULL, "failed to open a request %u\n", GetLastError()); + ok( req->request != NULL, "failed to open a request %lu\n", GetLastError() ); setup_test( info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req->request, NULL, 0, NULL, 0, 0, 0 ); - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); } static void open_socket_request(int port, struct test_request *req, struct info *info) @@ -1381,7 +1370,7 @@ static void server_send_reply(struct test_request *req, struct info *info, const info->index = 0; setup_test( info, winhttp_send_request, __LINE__ ); ret = WinHttpReceiveResponse( req->request, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); WaitForSingleObject( info->wait, INFINITE ); end_test( info, __LINE__ ); @@ -1437,11 +1426,11 @@ static void close_request(struct test_request *req, struct info *info, BOOL allo setup_test( info, winhttp_close_handle, __LINE__ ); ret = WinHttpCloseHandle( req->request ); - ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ok( ret, "WinHttpCloseHandle failed: %lu\n", GetLastError() ); ret = WinHttpCloseHandle( req->connection ); - ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ok( ret, "WinHttpCloseHandle failed: %lu\n", GetLastError() ); ret = WinHttpCloseHandle( req->session ); - ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ok( ret, "WinHttpCloseHandle failed: %lu\n", GetLastError() ); WaitForSingleObject( info->wait, INFINITE ); end_test( info, __LINE__ ); @@ -1468,7 +1457,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons setup_test( info, winhttp_read_data, line ); memset(buffer, '?', sizeof(buffer)); ret = WinHttpReadData( req->request, buffer, sizeof(buffer), NULL ); - ok(ret, "failed to read data %u\n", GetLastError()); + ok( ret, "failed to read data %lu\n", GetLastError() ); WaitForSingleObject( info->wait, INFINITE ); @@ -1578,17 +1567,15 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex break; } - ok(context->recursion_count < TEST_RECURSION_LIMIT, - "Got unexpected context->recursion_count %u, thread %#x.\n", - context->recursion_count, GetCurrentThreadId()); + ok( context->recursion_count < TEST_RECURSION_LIMIT, + "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() ); context->max_recursion_query = max( context->max_recursion_query, context->recursion_count ); InterlockedIncrement( &context->recursion_count ); ret = WinHttpReadData( context->request, &b, 1, NULL ); err = GetLastError(); - ok(ret, "Failed to read data, GetLastError() %u.\n", err); - ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); - if (err == ERROR_SUCCESS) - context->have_sync_callback = TRUE; + ok( ret, "failed to read data, GetLastError() %lu\n", err ); + ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err ); + if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; @@ -1598,18 +1585,16 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex SetEvent( context->wait ); break; } - ok(context->recursion_count < TEST_RECURSION_LIMIT, - "Got unexpected context->recursion_count %u, thread %#x.\n", - context->recursion_count, GetCurrentThreadId()); + ok( context->recursion_count < TEST_RECURSION_LIMIT, + "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() ); context->max_recursion_read = max( context->max_recursion_read, context->recursion_count ); context->read_from_callback = TRUE; InterlockedIncrement( &context->recursion_count ); ret = WinHttpQueryDataAvailable( context->request, NULL ); err = GetLastError(); - ok(ret, "Failed to query data available, GetLastError() %u.\n", err); - ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); - if (err == ERROR_SUCCESS) - context->have_sync_callback = TRUE; + ok( ret, "failed to query data available, GetLastError() %lu\n", err ); + ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err ); + if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; } @@ -1628,15 +1613,15 @@ static void test_recursion(void) context.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok(!!session, "Failed to open session, GetLastError() %u.\n", GetLastError()); + ok( !!session, "failed to open session, GetLastError() %lu\n", GetLastError() ); WinHttpSetStatusCallback( session, test_recursion_callback, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); connection = WinHttpConnect( session, L"test.winehq.org", 0, 0 ); - ok(!!connection, "Failed to open a connection, GetLastError() %u.\n", GetLastError()); + ok( !!connection, "failed to open a connection, GetLastError() %lu\n", GetLastError() ); request = WinHttpOpenRequest( connection, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(!!request, "Failed to open a request, GetLastError() %u.\n", GetLastError()); + ok( !!request, "failed to open a request, GetLastError() %lu\n", GetLastError() ); context.request = request; ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); @@ -1651,39 +1636,36 @@ static void test_recursion(void) CloseHandle( context.wait ); return; } - ok(ret, "Failed to send request, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to send request, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); ret = WinHttpReceiveResponse( request, NULL ); - ok(ret, "Failed to receive response, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "Request failed, GetLastError() %u.\n", GetLastError()); - ok(status == 200, "Request failed unexpectedly, status %u.\n", status); + ok( ret, "request failed, GetLastError() %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly, status %lu\n", status ); ret = WinHttpQueryDataAvailable( request, NULL ); - ok(ret, "Failed to query data available, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to query data available, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); ret = WinHttpReadData( request, &b, 1, NULL ); - ok(ret, "Failed to read data, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to read data, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); if (context.have_sync_callback) { - ok(context.max_recursion_query >= 2, "Got unexpected max_recursion_query %u.\n", context.max_recursion_query); - ok(context.max_recursion_read >= 2, "Got unexpected max_recursion_read %u.\n", context.max_recursion_read); - } - else - { - skip("No sync callbacks.\n"); + ok( context.max_recursion_query >= 2, "got %lu\n", context.max_recursion_query ); + ok( context.max_recursion_read >= 2, "got %lu\n", context.max_recursion_read ); } + else skip( "no sync callbacks\n"); WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); @@ -1720,13 +1702,13 @@ START_TEST (notification) si.port = 7533; thread = CreateThread( NULL, 0, server_thread, &si, 0, NULL ); - ok(thread != NULL, "failed to create thread %u\n", GetLastError()); + ok( thread != NULL, "failed to create thread %lu\n", GetLastError() ); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); server_socket_done = CreateEventW( NULL, 0, 0, NULL ); ret = WaitForSingleObject( si.event, 10000 ); - ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); + ok( ret == WAIT_OBJECT_0, "failed to start winhttp test server %lu\n", GetLastError() ); if (ret != WAIT_OBJECT_0) { CloseHandle(thread); diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 35d23c5b083..5f137dc6365 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -104,31 +104,31 @@ static void WinHttpCreateUrl_test( void ) SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( NULL, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == ~0u, "expected len ~0u got %lu\n", len ); /* zero'ed components */ memset( &uc, 0, sizeof(URL_COMPONENTS) ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == ~0u, "expected len ~0u got %lu\n", len ); /* valid components, NULL url, NULL length */ fill_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); /* valid components, NULL url, insufficient length */ len = 0; SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); - ok( len == 57, "expected len 57 got %u\n", len ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError() ); + ok( len == 57, "expected len 57 got %lu\n", len ); /* valid components, NULL url, sufficient length */ SetLastError( 0xdeadbeef ); @@ -137,8 +137,8 @@ static void WinHttpCreateUrl_test( void ) err = GetLastError(); ok( !ret, "expected failure\n" ); ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, - "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); + "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %lu\n", len ); /* correct size, NULL url */ fill_url_components( &uc ); @@ -147,8 +147,8 @@ static void WinHttpCreateUrl_test( void ) err = GetLastError(); ok( !ret, "expected failure\n" ); ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, - "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); + "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %lu\n", len ); /* valid components, allocated url, short length */ SetLastError( 0xdeadbeef ); @@ -157,8 +157,8 @@ static void WinHttpCreateUrl_test( void ) len = 2; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); - ok( len == 57, "expected len 57 got %u\n", len ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError() ); + ok( len == 57, "expected len 57 got %lu\n", len ); /* allocated url, NULL scheme */ SetLastError( 0xdeadbeef ); @@ -168,8 +168,8 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); ok( GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "expected ERROR_SUCCESS got %u\n", GetLastError() ); - ok( len == 56, "expected len 56 got %u\n", len ); + "expected ERROR_SUCCESS got %lu\n", GetLastError() ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url1 ), "url doesn't match\n" ); /* allocated url, 0 scheme */ @@ -179,7 +179,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %u\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); /* valid components, allocated url */ fill_url_components( &uc ); @@ -187,7 +187,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %d\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url1 ), "url doesn't match\n" ); /* valid username, NULL password */ @@ -205,7 +205,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %u\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url2 ), "url doesn't match\n" ); /* valid password, NULL username */ @@ -216,7 +216,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); /* valid password, empty username */ fill_url_components( &uc ); @@ -234,7 +234,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 38, "expected len 38 got %u\n", len ); + ok( len == 38, "expected len 38 got %lu\n", len ); ok( !lstrcmpW( url, url3 ), "url doesn't match\n" ); /* empty username, empty password */ @@ -245,7 +245,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %u\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url4 ), "url doesn't match\n" ); /* nScheme has lower precedence than lpszScheme */ @@ -256,7 +256,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == lstrlenW( url5 ), "expected len %d got %u\n", lstrlenW( url5 ) + 1, len ); + ok( len == lstrlenW( url5 ), "expected len %d got %lu\n", lstrlenW( url5 ) + 1, len ); ok( !lstrcmpW( url, url5 ), "url doesn't match\n" ); /* non-standard port */ @@ -267,7 +267,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 59, "expected len 59 got %u\n", len ); + ok( len == 59, "expected len 59 got %lu\n", len ); ok( !lstrcmpW( url, url6 ), "url doesn't match\n" ); /* escape extra info */ @@ -278,7 +278,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); - ok( len == 113, "expected len 113 got %u\n", len ); + ok( len == 113, "expected len 113 got %lu\n", len ); ok( !lstrcmpW( url, url7 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); /* escape extra info */ @@ -290,7 +290,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); - ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); + ok( len == lstrlenW(url18), "expected len %u got %lu\n", lstrlenW(url18), len ); ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); /* extra info with Unicode characters */ @@ -304,7 +304,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); err = GetLastError(); ok( !ret, "expected failure\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); /* extra info with Unicode characters, no ICU_ESCAPE */ memset( &uc, 0, sizeof(uc) ); @@ -317,7 +317,7 @@ static void WinHttpCreateUrl_test( void ) ok( ret || broken(!ret) /* < win7 */, "expected success\n" ); if (ret) { - ok( len == lstrlenW(url19), "expected len %u got %u\n", lstrlenW(url19), len ); + ok( len == lstrlenW(url19), "expected len %u got %lu\n", lstrlenW(url19), len ); ok( !lstrcmpW( url, url19 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); } @@ -330,7 +330,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); - ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); + ok( len == lstrlenW(url18), "expected len %u got %lu\n", lstrlenW(url18), len ); ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); /* path with Unicode characters */ @@ -344,7 +344,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); err = GetLastError(); ok( !ret, "expected failure\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); /* path with Unicode characters, no ICU_ESCAPE */ memset( &uc, 0, sizeof(uc) ); @@ -357,7 +357,7 @@ static void WinHttpCreateUrl_test( void ) ok( ret || broken(!ret) /* < win7 */, "expected success\n" ); if (ret) { - ok( len == lstrlenW(url20), "expected len %u got %u\n", lstrlenW(url20), len ); + ok( len == lstrlenW(url20), "expected len %u got %lu\n", lstrlenW(url20), len ); ok( !lstrcmpW( url, url20 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); } @@ -371,7 +371,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 58, "expected len 58 got %u\n", len ); + ok( len == 58, "expected len 58 got %lu\n", len ); ok( !lstrcmpW( url, url8 ), "url doesn't match\n" ); HeapFree( GetProcessHeap(), 0, url ); @@ -417,21 +417,21 @@ static void WinHttpCrackUrl_test( void ) uc.dwExtraInfoLength = 20; ret = WinHttpCrackUrl( url1, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme: %u\n", uc.nScheme ); ok( !memcmp( uc.lpszScheme, http, sizeof(http) ), "unexpected scheme: %s\n", wine_dbgstr_w(uc.lpszScheme) ); - ok( uc.dwSchemeLength == 4, "unexpected scheme length: %u\n", uc.dwSchemeLength ); + ok( uc.dwSchemeLength == 4, "unexpected scheme length: %lu\n", uc.dwSchemeLength ); ok( !memcmp( uc.lpszUserName, username, sizeof(username) ), "unexpected username: %s\n", wine_dbgstr_w(uc.lpszUserName) ); - ok( uc.dwUserNameLength == 8, "unexpected username length: %u\n", uc.dwUserNameLength ); + ok( uc.dwUserNameLength == 8, "unexpected username length: %lu\n", uc.dwUserNameLength ); ok( !memcmp( uc.lpszPassword, password, sizeof(password) ), "unexpected password: %s\n", wine_dbgstr_w(uc.lpszPassword) ); - ok( uc.dwPasswordLength == 8, "unexpected password length: %u\n", uc.dwPasswordLength ); + ok( uc.dwPasswordLength == 8, "unexpected password length: %lu\n", uc.dwPasswordLength ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected hostname: %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 14, "unexpected hostname length: %u\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 14, "unexpected hostname length: %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( !memcmp( uc.lpszUrlPath, about, sizeof(about) ), "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 11, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 11, "unexpected path length: %lu\n", uc.dwUrlPathLength ); ok( !memcmp( uc.lpszExtraInfo, query, sizeof(query) ), "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 6, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 6, "unexpected extra info length: %lu\n", uc.dwExtraInfoLength ); /* buffers of insufficient length */ uc.dwSchemeLength = 1; @@ -441,19 +441,19 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url1, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u, expected ERROR_INSUFFICIENT_BUFFER\n", error ); - ok( uc.dwSchemeLength == 5, "unexpected scheme length: %u\n", uc.dwSchemeLength ); - ok( uc.dwHostNameLength == 15, "unexpected hostname length: %u\n", uc.dwHostNameLength ); - ok( uc.dwUrlPathLength == 11, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %lu, expected ERROR_INSUFFICIENT_BUFFER\n", error ); + ok( uc.dwSchemeLength == 5, "unexpected scheme length: %lu\n", uc.dwSchemeLength ); + ok( uc.dwHostNameLength == 15, "unexpected hostname length: %lu\n", uc.dwHostNameLength ); + ok( uc.dwUrlPathLength == 11, "unexpected path length: %lu\n", uc.dwUrlPathLength ); /* no buffers */ reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k1, 0, 0, &uc); error = GetLastError(); - ok( ret, "WinHttpCrackUrl failed le=%u\n", error ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", error ); ok( error == ERROR_SUCCESS || broken(error == ERROR_INVALID_PARAMETER) /* < win7 */, - "got %u, expected ERROR_SUCCESS\n", error ); + "got %lu, expected ERROR_SUCCESS\n", error ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k1,"unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -473,7 +473,7 @@ static void WinHttpCrackUrl_test( void ) uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUserNameLength = 1; uc.dwPasswordLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = 1; ret = WinHttpCrackUrl( url_k2, 0, 0,&uc); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k2, "unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -491,7 +491,7 @@ static void WinHttpCrackUrl_test( void ) reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k3, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTPS, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k3, "unexpected scheme\n" ); ok( uc.dwSchemeLength == 5, "unexpected scheme length\n" ); @@ -513,80 +513,80 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url_k4, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k5, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k6, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k7, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k8, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k9, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.lpszUrlPath == url_k9 + 14 || broken(uc.lpszUrlPath == url_k9 + 13) /* win8 */, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 0, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 0, "unexpected path length: %lu\n", uc.dwUrlPathLength ); ok( uc.lpszExtraInfo == url_k9 + 14 || broken(uc.lpszExtraInfo == url_k9 + 13) /* win8 */, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); ok( uc.dwExtraInfoLength == 0 || broken(uc.dwExtraInfoLength == 1) /* win8 */, - "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + "unexpected extra info length: %lu\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k10, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.lpszUrlPath == url_k10 + 13, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 7, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 7, "unexpected path length: %lu\n", uc.dwUrlPathLength ); ok( uc.lpszExtraInfo == url_k10 + 20, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %lu\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url4, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( empty, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url1, 0, 0, NULL ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( NULL, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); /* decoding without buffers */ reset_url_components( &uc ); @@ -594,7 +594,7 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url7, 0, ICU_DECODE, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu, expected ERROR_INVALID_PARAMETER\n", error ); /* decoding with buffers */ uc.lpszScheme = scheme; @@ -613,11 +613,11 @@ static void WinHttpCrackUrl_test( void ) path[0] = 0; ret = WinHttpCrackUrl( url7, 0, ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed %u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed %lu\n", GetLastError() ); ok( !memcmp( uc.lpszUrlPath + 11, escape, 21 * sizeof(WCHAR) ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == 32, "unexpected path length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 32, "unexpected path length %lu\n", uc.dwUrlPathLength ); ok( !memcmp( uc.lpszExtraInfo, escape + 21, 12 * sizeof(WCHAR) ), "unexpected extra info\n" ); - ok( uc.dwExtraInfoLength == 12, "unexpected extra info length %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 12, "unexpected extra info length %lu\n", uc.dwExtraInfoLength ); /* Urls with specified port numbers */ /* decoding with buffers */ @@ -637,25 +637,25 @@ static void WinHttpCrackUrl_test( void ) path[0] = 0; ret = WinHttpCrackUrl( url6, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 14, "unexpected host name length: %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort ); /* decoding without buffers */ reset_url_components( &uc ); ret = WinHttpCrackUrl( url8, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nPort == 0, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url9, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url10, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); @@ -663,18 +663,18 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( empty, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( http, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url11, 0, 0, &uc); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url11,"unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -702,7 +702,7 @@ static void WinHttpCrackUrl_test( void ) uc.dwExtraInfoLength = 0; uc.nPort = 0; ret = WinHttpCrackUrl( url12, 0, ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); uc.lpszScheme = scheme; uc.dwSchemeLength = 20; @@ -718,10 +718,10 @@ static void WinHttpCrackUrl_test( void ) uc.dwExtraInfoLength = 0; uc.nPort = 0; ret = WinHttpCrackUrl( url13, 0, ICU_ESCAPE|ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, L"winehq.o g" ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, L"/path%20with%20spaces" ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == lstrlenW(L"/path%20with%20spaces"), "got %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == lstrlenW(L"/path%20with%20spaces"), "got %lu\n", uc.dwUrlPathLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = NULL; @@ -739,21 +739,21 @@ static void WinHttpCrackUrl_test( void ) uc.lpszExtraInfo = NULL; uc.dwExtraInfoLength = ~0u; ret = WinHttpCrackUrl( url14, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( !uc.lpszScheme, "unexpected scheme %s\n", wine_dbgstr_w(uc.lpszScheme) ); - ok( !uc.dwSchemeLength, "unexpected length %u\n", uc.dwSchemeLength ); + ok( !uc.dwSchemeLength, "unexpected length %lu\n", uc.dwSchemeLength ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme %u\n", uc.nScheme ); ok( !lstrcmpW( uc.lpszHostName, url14 + 7 ), "unexpected hostname %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 14, "unexpected length %u\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 14, "unexpected length %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 80, "unexpected port %u\n", uc.nPort ); ok( !uc.lpszUserName, "unexpected username\n" ); - ok( !uc.dwUserNameLength, "unexpected length %u\n", uc.dwUserNameLength ); + ok( !uc.dwUserNameLength, "unexpected length %lu\n", uc.dwUserNameLength ); ok( !uc.lpszPassword, "unexpected password\n" ); - ok( !uc.dwPasswordLength, "unexpected length %u\n", uc.dwPasswordLength ); + ok( !uc.dwPasswordLength, "unexpected length %lu\n", uc.dwPasswordLength ); ok( !lstrcmpW( uc.lpszUrlPath, url14 + 21 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 5, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 5, "unexpected length %lu\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo[0], "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 0, "unexpected length %lu\n", uc.dwExtraInfoLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = scheme; @@ -774,39 +774,39 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url14, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); ok( !lstrcmpW( uc.lpszScheme, http ), "unexpected scheme %s\n", wine_dbgstr_w(uc.lpszScheme) ); - ok( !uc.dwSchemeLength, "unexpected length %u\n", uc.dwSchemeLength ); + ok( !uc.dwSchemeLength, "unexpected length %lu\n", uc.dwSchemeLength ); ok( uc.nScheme == 0, "unexpected scheme %u\n", uc.nScheme ); ok( !uc.lpszHostName, "unexpected hostname %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 0, "unexpected length %u\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 0, "unexpected length %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 0, "unexpected port %u\n", uc.nPort ); ok( !uc.lpszUserName, "unexpected username\n" ); - ok( uc.dwUserNameLength == ~0u, "unexpected length %u\n", uc.dwUserNameLength ); + ok( uc.dwUserNameLength == ~0u, "unexpected length %lu\n", uc.dwUserNameLength ); ok( !uc.lpszPassword, "unexpected password\n" ); - ok( uc.dwPasswordLength == ~0u, "unexpected length %u\n", uc.dwPasswordLength ); + ok( uc.dwPasswordLength == ~0u, "unexpected length %lu\n", uc.dwPasswordLength ); ok( !uc.lpszUrlPath, "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 0, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 0, "unexpected length %lu\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo, "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 0, "unexpected length %lu\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url15, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); uc.nPort = 1; ret = WinHttpCrackUrl( url16, 0, 0, &uc ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !uc.nPort, "got %u\n", uc.nPort ); reset_url_components( &uc ); uc.nPort = 1; ret = WinHttpCrackUrl( url17, 0, 0, &uc ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); memset( &uc, 0, sizeof(uc) ); @@ -818,9 +818,9 @@ static void WinHttpCrackUrl_test( void ) uc.lpszUrlPath = path; uc.dwUrlPathLength = ARRAY_SIZE(path); ret = WinHttpCrackUrl( url21, 0, 0, &uc ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !lstrcmpW( uc.lpszUrlPath, url21 + 37 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 50, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 50, "unexpected length %lu\n", uc.dwUrlPathLength ); } START_TEST(url) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 21af2761323..354c85c6d28 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -50,8 +50,8 @@ static BOOL proxy_active(void) SetLastError(0xdeadbeef); if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) { - ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "got %u\n", GetLastError()); + ok( GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, + "got %lu\n", GetLastError() ); active = (proxy_info.lpszProxy != NULL); if (active) GlobalFree(proxy_info.lpszProxy); @@ -72,92 +72,89 @@ static void test_WinHttpQueryOption(void) SetLastError(0xdeadbeef); session = WinHttpOpen(L"winetest", 0, 0, 0, 0); - ok(session != NULL, "WinHttpOpen failed to open session, error %u\n", GetLastError()); + ok( session != NULL, "WinHttpOpen failed to open session, error %lu\n", GetLastError() ); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, NULL, NULL); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok( !ret, "should fail to set redirect policy %lu\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError() ); size = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, NULL, &size); ok(!ret, "should fail to query option\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(size == 4, "expected 4, got %u\n", size); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError() ); + ok( size == 4, "expected 4, got %lu\n", size ); feature = 0xdeadbeef; size = sizeof(feature) - 1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, &size); ok(!ret, "should fail to query option\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(size == 4, "expected 4, got %u\n", size); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError() ); + ok( size == 4, "expected 4, got %lu\n", size ); feature = 0xdeadbeef; size = sizeof(feature) + 1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, &size); - ok(ret, "failed to query option %u\n", GetLastError()); + ok(ret, "failed to query option %lu\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "got %u\n", GetLastError()); - ok(size == sizeof(feature), "WinHttpQueryOption should set the size: %u\n", size); + "got %lu\n", GetLastError()); + ok(size == sizeof(feature), "WinHttpQueryOption should set the size: %lu\n", size); ok(feature == WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP, - "expected WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP, got %#x\n", feature); + "expected WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP, got %#lx\n", feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, NULL, sizeof(feature)); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); + ok(!ret, "should fail to set redirect policy %lu\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, sizeof(feature) - 1); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); + ok(!ret, "should fail to set redirect policy %lu\n", GetLastError()); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); feature = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, sizeof(feature) + 1); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); + ok(!ret, "should fail to set redirect policy %lu\n", GetLastError()); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); feature = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, sizeof(feature)); - ok(ret, "failed to set redirect policy %u\n", GetLastError()); + ok(ret, "failed to set redirect policy %lu\n", GetLastError()); feature = 0xdeadbeef; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, &size); - ok(ret, "failed to query option %u\n", GetLastError()); + ok(ret, "failed to query option %lu\n", GetLastError()); ok(feature == WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS, - "expected WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS, got %#x\n", feature); + "expected WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS, got %#lx\n", feature); feature = WINHTTP_DISABLE_COOKIES; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); ok(!ret, "should fail to set disable feature for a session\n"); ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); connection = WinHttpConnect(session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); feature = WINHTTP_DISABLE_COOKIES; SetLastError(0xdeadbeef); ret = WinHttpSetOption(connection, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); ok(!ret, "should fail to set disable feature for a connection\n"); ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, @@ -174,80 +171,80 @@ static void test_WinHttpQueryOption(void) ret = WinHttpQueryOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, &size); ok(!ret, "should fail to query disable feature for a request\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = 0; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); - ok(ret, "failed to set feature %u\n", GetLastError()); + ok(ret, "failed to set feature %lu\n", GetLastError()); feature = 0xffffffff; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); - ok(ret, "failed to set feature %u\n", GetLastError()); + ok(ret, "failed to set feature %lu\n", GetLastError()); feature = WINHTTP_DISABLE_COOKIES; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); - ok(ret, "failed to set feature %u\n", GetLastError()); + ok(ret, "failed to set feature %lu\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(request, WINHTTP_OPTION_DISABLE_FEATURE, NULL, &size); ok(!ret, "should fail to query disable feature for a request\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = 0xdeadbeef; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, &size); ok(!ret, "should fail to query enabled features for a request\n"); - ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %u\n", feature); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %#lx\n", feature); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = WINHTTP_ENABLE_SSL_REVOCATION; SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, 0, sizeof(feature)); ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, 0); ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); ok(ret, "failed to set feature\n"); ok(GetLastError() == NO_ERROR || broken(GetLastError() == 0xdeadbeef), /* Doesn't set error code on Vista or older */ - "expected NO_ERROR, got %u\n", GetLastError()); + "expected NO_ERROR, got %lu\n", GetLastError()); feature = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = 6; size = sizeof(feature); ret = WinHttpSetOption(request, WINHTTP_OPTION_CONNECT_RETRIES, &feature, sizeof(feature)); - ok(ret, "failed to set WINHTTP_OPTION_CONNECT_RETRIES %u\n", GetLastError()); + ok(ret, "failed to set WINHTTP_OPTION_CONNECT_RETRIES %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); - ok(ret, "WinHttpCloseHandle failed on closing request: %u\n", GetLastError()); + ok(ret, "WinHttpCloseHandle failed on closing request: %lu\n", GetLastError()); done: SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(connection); - ok(ret, "WinHttpCloseHandle failed on closing connection: %u\n", GetLastError()); + ok(ret, "WinHttpCloseHandle failed on closing connection: %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(session); - ok(ret, "WinHttpCloseHandle failed on closing session: %u\n", GetLastError()); + ok(ret, "WinHttpCloseHandle failed on closing session: %lu\n", GetLastError()); } static void test_WinHttpOpenRequest (void) @@ -261,21 +258,21 @@ static void test_WinHttpOpenRequest (void) WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); err = GetLastError(); ok(session != NULL, "WinHttpOpen failed to open session.\n"); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); /* Test with a bad server name */ SetLastError(0xdeadbeef); connection = WinHttpConnect(session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); err = GetLastError(); ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); - ok(err == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", err); + ok(err == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %lu.\n", err); /* Test with a valid server name */ SetLastError(0xdeadbeef); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); err = GetLastError(); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", err); - ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu.\n", err); + ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %lu\n", err); SetLastError(0xdeadbeef); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, @@ -286,8 +283,8 @@ static void test_WinHttpOpenRequest (void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %lu.\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); @@ -297,14 +294,14 @@ static void test_WinHttpOpenRequest (void) skip("Connection failed, skipping.\n"); goto done; } - ok(ret, "WinHttpSendRequest failed: %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(ret, "WinHttpSendRequest failed: %lu\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); err = GetLastError(); - ok(ret, "WinHttpCloseHandle failed on closing request, got %u.\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(ret, "WinHttpCloseHandle failed on closing request, got %lu.\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); done: ret = WinHttpCloseHandle(connection); @@ -321,13 +318,13 @@ static void test_empty_headers_param(void) BOOL ret; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"test.winehq.org", 80, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, L"", 0, NULL, 0, 0, 0); err = GetLastError(); @@ -336,7 +333,7 @@ static void test_empty_headers_param(void) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); done: WinHttpCloseHandle(req); @@ -366,7 +363,7 @@ static void test_WinHttpSendRequest (void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"POST", L"tests/post.php", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); @@ -375,25 +372,25 @@ static void test_WinHttpSendRequest (void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %lu\n", GetLastError()); if (!request) goto done; method[0] = 0; len = sizeof(method); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_REQUEST_METHOD, NULL, method, &len, NULL); - ok(ret, "got %u\n", GetLastError()); - ok(len == lstrlenW(L"POST") * sizeof(WCHAR), "got %u\n", len); + ok(ret, "got %lu\n", GetLastError()); + ok(len == lstrlenW(L"POST") * sizeof(WCHAR), "got %lu\n", len); ok(!lstrcmpW(method, L"POST"), "got %s\n", wine_dbgstr_w(method)); context = 0xdeadbeef; ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); - ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %lu\n", GetLastError()); /* writing more data than promised by the content-length header causes an error when the connection is reused, so disable keep-alive */ disable = WINHTTP_DISABLE_KEEP_ALIVE; ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); - ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %lu\n", GetLastError()); context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); @@ -403,13 +400,13 @@ static void test_WinHttpSendRequest (void) skip("connection failed, skipping\n"); goto done; } - ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpSendRequest failed: %lu\n", GetLastError()); context = 0; size = sizeof(context); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, &size); - ok(ret, "WinHttpQueryOption failed: %u\n", GetLastError()); - ok(context == 0xdeadbef0, "expected 0xdeadbef0, got %lx\n", context); + ok(ret, "WinHttpQueryOption failed: %lu\n", GetLastError()); + ok(context == 0xdeadbef0, "expected 0xdeadbef0, got %#Ix\n", context); for (i = 3; post_data[i]; i++) { @@ -418,12 +415,12 @@ static void test_WinHttpSendRequest (void) ret = WinHttpWriteData(request, &post_data[i], 1, &bytes_rw); if (ret) { - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %u.\n", GetLastError()); - ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %u bytes instead of 1 byte.\n", bytes_rw); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %lu\n", GetLastError()); + ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %lu bytes instead of 1 byte\n", bytes_rw); } else /* Since we already passed all optional data in WinHttpSendRequest Win7 fails our WinHttpWriteData call */ { - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER got %u.\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError()); ok(bytes_rw == -1, "Expected bytes_rw to remain unchanged.\n"); } } @@ -431,22 +428,22 @@ static void test_WinHttpSendRequest (void) SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(request, NULL); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_NO_TOKEN) /* < win7 */, - "Expected ERROR_SUCCESS got %u.\n", GetLastError()); - ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); + "Expected ERROR_SUCCESS got %lu\n", GetLastError()); + ok(ret == TRUE, "WinHttpReceiveResponse failed: %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_ORIG_URI, NULL, NULL, &len, NULL); - ok(!ret && GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_MAX + 1, NULL, NULL, &len, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); bytes_rw = -1; ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); - ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret == TRUE, "WinHttpReadData failed: %lu\n", GetLastError()); - ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); + ok(bytes_rw == sizeof(test_post) - 1, "Read %lu bytes\n", bytes_rw); ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); done: @@ -469,19 +466,19 @@ static void test_WinHttpTimeFromSystemTime(void) ret = WinHttpTimeFromSystemTime(&time, NULL); err = GetLastError(); ok(!ret, "WinHttpTimeFromSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeFromSystemTime(NULL, time_string); err = GetLastError(); ok(!ret, "WinHttpTimeFromSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeFromSystemTime(&time, time_string); err = GetLastError(); - ok(ret, "WinHttpTimeFromSystemTime failed: %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpTimeFromSystemTime failed: %lu\n", err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); ok(!memcmp(time_string, L"Mon, 28 Jul 2008 10:05:52 GMT", sizeof(L"Mon, 28 Jul 2008 10:05:52 GMT")), "Time string returned did not match expected time string.\n"); } @@ -497,27 +494,27 @@ static void test_WinHttpTimeToSystemTime(void) ret = WinHttpTimeToSystemTime(L"Mon, 28 Jul 2008 10:05:52 GMT\n", NULL); err = GetLastError(); ok(!ret, "WinHttpTimeToSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeToSystemTime(NULL, &time); err = GetLastError(); ok(!ret, "WinHttpTimeToSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeToSystemTime(L"Mon, 28 Jul 2008 10:05:52 GMT\n", &time); err = GetLastError(); - ok(ret, "WinHttpTimeToSystemTime failed: %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpTimeToSystemTime failed: %lu\n", err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); SetLastError(0xdeadbeef); ret = WinHttpTimeToSystemTime(L" mon 28 jul 2008 10 05 52\n", &time); err = GetLastError(); - ok(ret, "WinHttpTimeToSystemTime failed: %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpTimeToSystemTime failed: %lu\n", err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); } @@ -564,7 +561,7 @@ static void test_WinHttpAddHeaders(void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"POST", L"/posttest.php", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); @@ -573,7 +570,7 @@ static void test_WinHttpAddHeaders(void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %lu\n", GetLastError()); index = 0; len = sizeof(buffer); @@ -583,18 +580,18 @@ static void test_WinHttpAddHeaders(void) SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); err = GetLastError(); - ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %u.\n", ret, err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %lu\n", ret, err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed: header index not incremented\n"); ok(!memcmp(buffer, test_indices[0], sizeof(test_indices[0])), "WinHttpQueryHeaders failed: incorrect string returned\n"); - ok(len == 5*sizeof(WCHAR), "WinHttpQueryHeaders failed: invalid length returned, expected 5, got %d\n", len); + ok(len == 5 * sizeof(WCHAR), "WinHttpQueryHeaders failed: invalid length returned, expected 5, got %lu\n", len); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); @@ -612,7 +609,7 @@ static void test_WinHttpAddHeaders(void) ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer that's too small.\n"); ok(memcmp(buffer, check_buffer, sizeof(buffer)) == 0, "WinHttpQueryHeaders failed, modified the buffer when it should not have.\n"); - ok(len == 6*sizeof(WCHAR), "WinHttpQueryHeaders returned invalid length, expected 12, got %d\n", len); + ok(len == 6 * sizeof(WCHAR), "WinHttpQueryHeaders returned invalid length, expected 12, got %lu\n", len); /* Try with a NULL buffer */ index = 0; @@ -621,8 +618,8 @@ static void test_WinHttpAddHeaders(void) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); /* Try with a NULL buffer and a length that's too small */ @@ -633,8 +630,8 @@ static void test_WinHttpAddHeaders(void) L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); index = 0; @@ -644,8 +641,8 @@ static void test_WinHttpAddHeaders(void) L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders failed: index was incremented.\n"); /* valid query */ @@ -672,8 +669,8 @@ static void test_WinHttpAddHeaders(void) L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders failed: index was incremented.\n"); oldlen = len; @@ -682,7 +679,7 @@ static void test_WinHttpAddHeaders(void) memset(buffer, 0xff, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed %lu\n", GetLastError()); ok(len + sizeof(WCHAR) <= oldlen, "resulting length longer than advertized\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)] && !buffer[len / sizeof(WCHAR) - 1], "no double NULL terminator\n"); @@ -697,14 +694,14 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(memcmp(buffer, test_indices[0], sizeof(test_indices[0])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(memcmp(buffer, test_indices[1], sizeof(test_indices[1])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); @@ -715,7 +712,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); reverse = (memcmp(buffer, test_indices[1], sizeof(test_indices[1])) != 0); /* Win7 returns values in reverse order of adding */ ok(!memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])), @@ -724,7 +721,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -737,7 +734,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -745,7 +742,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -763,7 +760,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, reverse ? L"test3, test4" : L"test2, test4", reverse ? sizeof(L"test3, test4") : sizeof(L"test2, test4")), @@ -772,7 +769,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -790,7 +787,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, reverse ? L"test3, test4, test5" : L"test2, test4, test5", @@ -800,7 +797,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -819,7 +816,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, reverse ? L"test3, test4, test5; test6" : L"test2, test4, test5; test6", @@ -829,7 +826,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -847,7 +844,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 3 : 2], sizeof(test_indices[reverse ? 3 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -855,7 +852,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 3], sizeof(test_indices[reverse ? 1 : 3])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -876,7 +873,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"a", buffer, &len, &index); - ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(!memcmp(buffer, L"", sizeof(L"")), "unexpected result\n"); ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0u, WINHTTP_ADDREQ_FLAG_ADD); @@ -896,7 +893,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"field", buffer, &len, &index); - ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(!memcmp(buffer, L"value ", sizeof(L"value ")) || !memcmp(buffer, L"value", sizeof(L"value")), "unexpected result\n"); @@ -905,20 +902,20 @@ static void test_WinHttpAddHeaders(void) WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); ret = WinHttpAddRequestHeaders(request, L"Range: bytes=0-773\r\n", ~0u, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); - ok(ret, "failed to add header: %u\n", GetLastError()); + ok(ret, "failed to add header: %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Range", buffer, &len, &index); - ok(ret, "failed to get range header %u\n", GetLastError()); + ok(ret, "failed to get range header %lu\n", GetLastError()); ok(!memcmp(buffer, L"bytes=0-773", sizeof(L"bytes=0-773")), "incorrect string returned\n"); - ok(len == lstrlenW(L"bytes=0-773") * sizeof(WCHAR), "wrong length %u\n", len); - ok(index == 1, "wrong index %u\n", index); + ok(len == lstrlenW(L"bytes=0-773") * sizeof(WCHAR), "wrong length %lu\n", len); + ok(index == 1, "wrong index %lu\n", index); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, @@ -929,21 +926,21 @@ static void test_WinHttpAddHeaders(void) ret = WinHttpAddRequestHeaders(request, test_headers[14], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); + ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", err); ret = WinHttpAddRequestHeaders(request, test_headers[14], ~0u, WINHTTP_ADDREQ_FLAG_ADD); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"name", buffer, &len, &index); - ok(ret, "got %u\n", GetLastError()); - ok(index == 1, "wrong index %u\n", index); + ok(ret, "got %lu\n", GetLastError()); + ok(index == 1, "wrong index %lu\n", index); ok(!memcmp(buffer, L"value", sizeof(L"value")), "incorrect string\n"); ret = WinHttpAddRequestHeaders(request, test_headers[15], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; len = sizeof(buffer); @@ -952,17 +949,17 @@ static void test_WinHttpAddHeaders(void) L"name", buffer, &len, &index); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); + ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", err); ret = WinHttpAddRequestHeaders(request, test_headers[14], -1L, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"name", buffer, &len, &index); - ok(ret, "got %u\n", GetLastError()); - ok(index == 1, "wrong index %u\n", index); + ok(ret, "got %lu\n", GetLastError()); + ok(index == 1, "wrong index %lu\n", index); ok(!memcmp(buffer, L"value", sizeof(L"value")), "incorrect string\n"); ret = WinHttpCloseHandle(request); @@ -1006,36 +1003,36 @@ static void test_secure_connection(void) char buffer[32]; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); policy = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; ret = WinHttpSetOption(ses, WINHTTP_OPTION_REDIRECT_POLICY, &policy, sizeof(policy)); - ok(ret, "failed to set redirect policy %u\n", GetLastError()); + ok(ret, "failed to set redirect policy %lu\n", GetLastError()); protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); - ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %u\n", err); + ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %lu\n", err); con = WinHttpConnect(ses, L"test.winehq.org", 443, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); SetLastError( 0xdeadbeef ); protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(con, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", err); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %lu\n", err); /* try without setting WINHTTP_FLAG_SECURE */ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); err = GetLastError(); ok(!ret, "unexpected success\n"); ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || broken(err == ERROR_INVALID_PARAMETER) /* winxp */, - "setting client cert context returned %u\n", err); + "setting client cert context returned %lu\n", err); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); @@ -1044,31 +1041,31 @@ static void test_secure_connection(void) skip("Connection failed, skipping.\n"); goto cleanup; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "header query failed %u\n", GetLastError()); - ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); + ok(ret, "header query failed %lu\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %lu\n", status); WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); flags = 0xdeadbeef; size = sizeof(flags); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, &size); - ok(ret, "failed to query security flags %u\n", GetLastError()); - ok(!flags, "got %08x\n", flags); + ok(ret, "failed to query security flags %lu\n", GetLastError()); + ok(!flags, "got %#lx\n", flags); flags = SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok(ret, "failed to set security flags %lu\n", GetLastError()); flags = SECURITY_FLAG_SECURE; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); @@ -1081,15 +1078,15 @@ static void test_secure_connection(void) flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok(ret, "failed to set security flags %lu\n", GetLastError()); flags = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok(ret, "failed to set security flags %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); err = GetLastError(); - ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err); + ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %lu\n", err); WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); @@ -1101,20 +1098,20 @@ static void test_secure_connection(void) skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); - ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + ok(ret, "failed to retrieve certificate context %lu\n", GetLastError()); if (ret) CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); - ok(ret, "failed to retrieve key bitness %u\n", GetLastError()); + ok(ret, "failed to retrieve key bitness %lu\n", GetLastError()); size = sizeof(info); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); - ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); + ok(ret, "failed to retrieve certificate info %lu\n", GetLastError()); if (ret) { @@ -1123,7 +1120,7 @@ static void test_secure_connection(void) trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); - trace("dwKeySize %u\n", info.dwKeySize); + trace("dwKeySize %lu\n", info.dwKeySize); LocalFree( info.lpszSubjectInfo ); LocalFree( info.lpszIssuerInfo ); } @@ -1134,18 +1131,18 @@ static void test_secure_connection(void) skip("connection error, skipping remaining secure tests\n"); goto cleanup; } - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); available_size = 0; ret = WinHttpQueryDataAvailable(req, &available_size); - ok(ret, "failed to query available data %u\n", GetLastError()); - ok(available_size > 2014, "available_size = %u\n", available_size); + ok(ret, "failed to query available data %lu\n", GetLastError()); + ok(available_size > 2014, "available_size = %lu\n", available_size); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -1156,18 +1153,18 @@ static void test_secure_connection(void) { size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); - ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret == TRUE, "WinHttpReadData failed: %lu\n", GetLastError()); if (!size) break; read_size += size; if (read_size <= 32) ok(!memcmp(buffer, data_start, sizeof(data_start)-1), "not expected: %.32s\n", buffer); } - ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); + ok(read_size >= available_size, "read_size = %lu, available_size = %lu\n", read_size, available_size); size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size); - ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + ok(ret, "failed to retrieve certificate context %lu\n", GetLastError()); if (ret) CertFreeCertificateContext(cert); cleanup: @@ -1184,13 +1181,13 @@ static void test_request_parameter_defaults(void) BOOL ret; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); error = GetLastError(); @@ -1199,21 +1196,21 @@ static void test_request_parameter_defaults(void) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, L"", L"", L"", NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); error = GetLastError(); @@ -1222,29 +1219,29 @@ static void test_request_parameter_defaults(void) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, NULL, &size, NULL); error = GetLastError(); ok(!ret, "succeeded unexpectedly\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", error); version = HeapAlloc(GetProcessHeap(), 0, size); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, version, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %lu\n", size); HeapFree(GetProcessHeap(), 0, version); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); done: WinHttpCloseHandle(req); @@ -1350,7 +1347,7 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); } /* test with invalid access type */ @@ -1359,7 +1356,7 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); /* at a minimum, the proxy server must be set */ info.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; @@ -1367,12 +1364,12 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); info.lpszProxyBypass = normalString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); /* the proxy server can't have wide characters */ info.lpszProxy = wideString; @@ -1383,7 +1380,7 @@ static void test_set_default_proxy_config(void) else ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || broken(ret), /* Earlier winhttp versions on W2K/XP */ - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); info.lpszProxy = normalString; SetLastError(0xdeadbeef); @@ -1392,9 +1389,9 @@ static void test_set_default_proxy_config(void) skip("couldn't set default proxy configuration: access denied\n"); else { - ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %u\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "got %u\n", GetLastError()); + ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %lu\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, + "got %lu\n", GetLastError()); } set_default_proxy_reg_value( saved_proxy_settings, len, type ); } @@ -1406,488 +1403,488 @@ static void test_timeouts(void) HINTERNET ses, req, con; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, -2, 0, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, -2, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, -2, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, 0, -2); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, -1, -1, -1, -1); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "expected ERROR_SUCCESS, got %u\n", GetLastError()); + "expected ERROR_SUCCESS, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, 0, 0); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0x0123, 0x4567, 0x89ab, 0xcdef); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x0123, "Expected 0x0123, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x0123, "Expected 0x0123, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x4567, "Expected 0x4567, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x4567, "Expected 0x4567, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x89ab, "Expected 0x89ab, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x89ab, "Expected 0x89ab, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xcdef, "Expected 0xcdef, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xcdef, "Expected 0xcdef, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); /* Timeout values should match the last one set for session */ SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, -2, 0, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, -2, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, 0, -2, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, 0, 0, -2); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, -1, -1, -1, -1); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, 0, 0, 0); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); /* Changing timeout values for session should affect the values for connection */ SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); /* Timeout values should match the last one set for session */ SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, -2, 0, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, -2, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, 0, -2, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, 0, 0, -2); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, -1, -1, -1, -1); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, 0, 0, 0); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0xcdef, 0x89ab, 0x4567, 0x0123); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xcdef, "Expected 0xcdef, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xcdef, "Expected 0xcdef, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x89ab, "Expected 0x89ab, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x89ab, "Expected 0x89ab, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x4567, "Expected 0x4567, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x4567, "Expected 0x4567, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x0123, "Expected 0x0123, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x0123, "Expected 0x0123, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); /* Changing timeout values for session should not affect the values for a request, * neither should the other way around. @@ -1895,162 +1892,162 @@ static void test_timeouts(void) SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); /* response timeout */ SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == ~0u, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == ~0u, "got %lu\n", value); SetLastError(0xdeadbeef); value = 30000; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - todo_wine ok(value == 0xbeefdead, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + todo_wine ok(value == 0xbeefdead, "got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == ~0u, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == ~0u, "got %lu\n", value); SetLastError(0xdeadbeef); value = 30000; ret = WinHttpSetOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == ~0u, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == ~0u, "got %lu\n", value); SetLastError(0xdeadbeef); value = 48878; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - todo_wine ok(value == 48879, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + todo_wine ok(value == 48879, "got %lu\n", value); SetLastError(0xdeadbeef); value = 48880; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 48880, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 48880, "got %lu\n", value); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2066,17 +2063,17 @@ static void test_resolve_timeout(void) if (! proxy_active()) { ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); timeout = 10000; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + ok(ret, "failed to set resolve timeout %lu\n", GetLastError()); con = WinHttpConnect(ses, L"nxdomain.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2086,12 +2083,12 @@ static void test_resolve_timeout(void) goto done; } ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, - "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %lu\n", GetLastError()); ret = WinHttpReceiveResponse( req, NULL ); ok( !ret && (GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || GetLastError() == ERROR_WINHTTP_OPERATION_CANCELLED /* < win7 */), - "got %u\n", GetLastError() ); + "got %lu\n", GetLastError() ); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2101,17 +2098,17 @@ static void test_resolve_timeout(void) skip("Skipping host resolution tests, host resolution performed by proxy\n"); ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); timeout = 10000; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + ok(ret, "failed to set resolve timeout %lu\n", GetLastError()); con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) @@ -2489,71 +2486,71 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(ses, 0, buffer, sizeof(buffer)); - ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(ses, 0, buffer, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(con, 0, buffer, sizeof(buffer)); - todo_wine ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + todo_wine ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(con, 0, buffer, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(req, 0, buffer, sizeof(buffer)); - ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, 0, buffer, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "unexpected success\n"); - ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); - ok(target == 0xdeadbeef, "got %x\n", target); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); + ok(target == 0xdeadbeef, "got %lu\n", target); size = sizeof(buffer2); memset(buffer2, 0, sizeof(buffer2)); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buffer2, &size, NULL); - ok(ret, "failed to query for raw headers: %u\n", GetLastError()); + ok(ret, "failed to query for raw headers: %lu\n", GetLastError()); ok(!memcmp(buffer2 + lstrlenW(buffer2) - 4, L"\r\n\r\n", sizeof(L"\r\n\r\n")), "WinHttpQueryHeaders returned invalid end of header string\n"); size = sizeof(buffer2); memset(buffer2, 0, sizeof(buffer2)); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS, NULL, buffer2, &size, NULL); - ok(ret, "failed to query for raw headers: %u\n", GetLastError()); + ok(ret, "failed to query for raw headers: %lu\n", GetLastError()); ok(!memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, L"", sizeof(L"")), "WinHttpQueryHeaders returned invalid end of header string\n"); ok(buffer2[(size / sizeof(WCHAR)) - 2] != 0, "returned string has too many NULL characters\n"); @@ -2561,7 +2558,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) count = 0; memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count); - ok(ret, "failed to read data %u\n", GetLastError()); + ok(ret, "failed to read data %lu\n", GetLastError()); ok(count == sizeof page1 - 1, "count was wrong\n"); ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); @@ -2578,82 +2575,82 @@ static void test_basic_authentication(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(NULL, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %lu\n", error); supported = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); supported = first = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); - ok(target == 0xdeadbeef, "got %x\n", target); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); + ok(target == 0xdeadbeef, "got %lu\n", target); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(NULL, &supported, &first, &target); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); - ok(target == 0xdeadbeef, "got %x\n", target); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); + ok(target == 0xdeadbeef, "got %lu\n", target); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); error = GetLastError(); - ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %lu\n", GetLastError()); if (ret) { - ok(size == 12, "expected 12, got %u\n", size); + ok(size == 12, "expected 12, got %lu\n", size); ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); } @@ -2661,70 +2658,70 @@ static void test_basic_authentication(int port) SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); - ok(ret, "failed to query authentication schemes %u\n", error); - ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %u\n", error); - ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", supported); - ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); - ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); + ok(ret, "failed to query authentication schemes %lu\n", error); + ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %lu\n", error); + ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %lu\n", supported); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %lu\n", first); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %lu\n", target); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); error = GetLastError(); - ok(ret, "failed to set credentials %u\n", error); - ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %u\n", error); + ok(ret, "failed to set credentials %lu\n", error); + ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %lu\n", error); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_PASSPORT, NULL, NULL, NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NEGOTIATE, NULL, NULL, NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_DIGEST, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, L"pwd", NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); error = GetLastError(); - ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %lu\n", GetLastError()); if (ret) { - ok(size == 11, "expected 11, got %u\n", size); + ok(size == 11, "expected 11, got %lu\n", size); ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); } @@ -2734,36 +2731,36 @@ static void test_basic_authentication(int port) /* now set the credentials first to show that they get sent with the first request */ ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth_with_creds", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); error = GetLastError(); - ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %lu\n", GetLastError()); if (ret) { - ok(size == 11, "expected 11, got %u\n", size); + ok(size == 11, "expected 11, got %lu\n", size); ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); } @@ -2774,68 +2771,68 @@ static void test_basic_authentication(int port) /* credentials set with WinHttpSetCredentials take precedence over those set through options */ ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, (void *)L"user", lstrlenW(L"user")); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, (void *)L"pwd2", lstrlenW(L"pwd2")); - ok(ret, "failed to set password %u\n", GetLastError()); + ok(ret, "failed to set password %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, (void *)L"user", lstrlenW(L"user")); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, (void *)L"pwd", lstrlenW(L"pwd")); - ok(ret, "failed to set password %u\n", GetLastError()); + ok(ret, "failed to set password %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd2", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %lu\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2850,13 +2847,13 @@ static void test_multi_authentication(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"GET", L"/multiauth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA,0, 0, 0 ); @@ -2868,25 +2865,25 @@ static void test_multi_authentication(int port) supported = first = target = 0xdeadbeef; ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); ok(ret, "expected success\n"); - ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %x\n", supported); - ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); - ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %#lx\n", supported); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %#lx\n", target); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %#lx\n", first); index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, L"WWW-Authenticate", buf, &size, &index); ok(ret, "expected success\n"); ok(!lstrcmpW(buf, L"Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); - ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); - ok(index == 1, "index = %u\n", index); + ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %lu\n", size); + ok(index == 1, "index = %lu\n", index); index = 0; size = 0xdeadbeef; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, L"WWW-Authenticate", NULL, &size, &index); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders returned %x(%u)\n", ret, GetLastError()); - ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %u\n", size); - ok(index == 0, "index = %u\n", index); + "WinHttpQueryHeaders returned %d(%lu)\n", ret, GetLastError()); + ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %lu\n", size); + ok(index == 0, "index = %lu\n", index); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2900,13 +2897,13 @@ static void test_large_data_authentication(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"GET", L"/largeauth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); ok(ret, "expected success\n"); @@ -2918,13 +2915,13 @@ static void test_large_data_authentication(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == HTTP_STATUS_DENIED, "got %d\n", status); + ok(status == HTTP_STATUS_DENIED, "got %lu\n", status); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, L"user", L"pwd", NULL); ok(ret, "expected success\n"); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); - ok(ret, "expected success %d\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); ok(ret, "expected success\n"); @@ -2933,7 +2930,7 @@ static void test_large_data_authentication(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == HTTP_STATUS_OK, "got %d\n", status); + ok(status == HTTP_STATUS_OK, "got %lu\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2947,19 +2944,19 @@ static void test_no_headers(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/no_headers", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); if (!ret) { error = GetLastError(); - ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %lu\n", error); } else { @@ -2967,7 +2964,7 @@ static void test_no_headers(int port) ret = WinHttpReceiveResponse(req, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %lu\n", error); } WinHttpCloseHandle(req); @@ -2983,13 +2980,13 @@ static void test_no_content(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/no_content", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); size = 12345; SetLastError(0xdeadbeef); @@ -2997,9 +2994,9 @@ static void test_no_content(int port) todo_wine { ok(!ret, "expected error\n"); ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, - "expected ERROR_WINHTTP_INCORRECT_HANDLE_STATE, got 0x%08x\n", GetLastError()); + "expected ERROR_WINHTTP_INCORRECT_HANDLE_STATE, got %lu\n", GetLastError()); ok(size == 12345 || broken(size == 0) /* Win <= 2003 */, - "expected 12345, got %u\n", size); + "expected 12345, got %lu\n", size); } ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -3013,7 +3010,7 @@ static void test_no_content(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == HTTP_STATUS_NO_CONTENT, "expected status 204, got %d\n", status); + ok(status == HTTP_STATUS_NO_CONTENT, "expected status 204, got %lu\n", status); SetLastError(0xdeadbeef); size = sizeof(status); @@ -3021,28 +3018,28 @@ static void test_no_content(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, 0); ok(!ret, "expected no content-length header\n"); - ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %u\n", GetLastError()); - ok(status == 12345, "expected 0, got %d\n", status); + ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %lu\n", GetLastError()); + ok(status == 12345, "expected 0, got %lu\n", status); SetLastError(0xdeadbeef); size = 12345; ret = WinHttpQueryDataAvailable(req, &size); ok(ret, "expected success\n"); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "wrong error %u\n", GetLastError()); - ok(!size, "expected 0, got %u\n", size); + "wrong error %lu\n", GetLastError()); + ok(!size, "expected 0, got %lu\n", size); SetLastError(0xdeadbeef); ret = WinHttpReadData(req, buf, len, &bytes_read); ok(ret, "expected success\n"); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "wrong error %u\n", GetLastError()); - ok(!bytes_read, "expected 0, got %u\n", bytes_read); + "wrong error %lu\n", GetLastError()); + ok(!bytes_read, "expected 0, got %lu\n", bytes_read); size = 12345; ret = WinHttpQueryDataAvailable(req, &size); ok(ret, "expected success\n"); - ok(size == 0, "expected 0, got %d\n", size); + ok(size == 0, "expected 0, got %lu\n", size); WinHttpCloseHandle(req); @@ -3050,9 +3047,8 @@ static void test_no_content(int port) SetLastError(0xdeadbeef); ret = WinHttpQueryDataAvailable(req, &size); ok(!ret, "expected error\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "expected ERROR_INVALID_HANDLE, got 0x%08x\n", GetLastError()); - ok(size == 12345, "expected 12345, got %u\n", size); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %#lx\n", GetLastError()); + ok(size == 12345, "expected 12345, got %lu\n", size); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -3066,49 +3062,49 @@ static void test_head_request(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"HEAD", L"/head", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to get status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "got %u\n", status); + ok(ret, "failed to get status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "got %lu\n", status); len = 0xdeadbeef; size = sizeof(len); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, &size, 0); - ok(ret, "failed to get content-length header %u\n", GetLastError()); - ok(len == HTTP_STATUS_CONTINUE, "got %u\n", len); + ok(ret, "failed to get content-length header %lu\n", GetLastError()); + ok(len == HTTP_STATUS_CONTINUE, "got %lu\n", len); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(req, &count); - ok(ret, "failed to query data available %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "failed to query data available %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); len = sizeof(buf); count = 0xdeadbeef; ret = WinHttpReadData(req, buf, len, &count); - ok(ret, "failed to read data %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(req, &count); - ok(ret, "failed to query data available %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "failed to query data available %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3123,37 +3119,37 @@ static void test_redirect(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"POST", L"/redirect", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, (void *)"data", sizeof("data"), sizeof("data"), 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to get status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "got %u\n", status); + ok(ret, "failed to get status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "got %lu\n", status); count = 0; ret = WinHttpQueryDataAvailable(req, &count); - ok(ret, "failed to query data available %u\n", GetLastError()); - ok(count == 128, "got %u\n", count); + ok(ret, "failed to query data available %lu\n", GetLastError()); + ok(count == 128, "got %lu\n", count); len = sizeof(buf); count = 0; ret = WinHttpReadData(req, buf, len, &count); - ok(ret, "failed to read data %u\n", GetLastError()); - ok(count == 128, "got %u\n", count); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(count == 128, "got %lu\n", count); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3178,30 +3174,30 @@ static void test_websocket(int port) } session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(session != NULL, "got %u\n", GetLastError()); + ok(session != NULL, "got %lu\n", GetLastError()); connection = WinHttpConnect(session, L"localhost", port, 0); - ok(connection != NULL, "got %u\n", GetLastError()); + ok(connection != NULL, "got %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"GET", L"/websocket", NULL, NULL, NULL, 0); - ok(request != NULL, "got %u\n", GetLastError()); + ok(request != NULL, "got %lu\n", GetLastError()); ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; size = sizeof(buf); @@ -3210,7 +3206,7 @@ static void test_websocket(int port) L"Sec-WebSocket-Key", buf, &size, &index); error = GetLastError(); ok(!ret, "success\n"); - ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", error); index = 0; size = sizeof(buf); @@ -3219,65 +3215,65 @@ static void test_websocket(int port) L"Sec-WebSocket-Version", buf, &size, &index); error = GetLastError(); ok(!ret, "success\n"); - ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", error); ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Sec-WebSocket-Key", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Sec-WebSocket-Version", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(request, &count); - ok(ret, "got %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "got %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "got %u\n", GetLastError()); - ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + ok(ret, "got %lu\n", GetLastError()); + ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %lu\n", status); len = 0xdeadbeef; size = sizeof(len); @@ -3288,191 +3284,191 @@ static void test_websocket(int port) index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); socket = pWinHttpWebSocketCompleteUpgrade(request, 0); - ok(socket != NULL, "got %u\n", GetLastError()); + ok(socket != NULL, "got %lu\n", GetLastError()); size = sizeof(header); ret = WinHttpQueryHeaders(socket, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %lu\n", error); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); /* sending request again generates new key */ ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); /* and creates a new websocket */ socket2 = pWinHttpWebSocketCompleteUpgrade(request, 0); - ok(socket2 != NULL, "got %u\n", GetLastError()); + ok(socket2 != NULL, "got %lu\n", GetLastError()); ok(socket2 != socket, "got same socket\n"); WinHttpCloseHandle(connection); /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(socket2); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(socket); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(session); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(request); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(session != NULL, "got %u\n", GetLastError()); + ok(session != NULL, "got %lu\n", GetLastError()); connection = WinHttpConnect(session, L"ws.ifelse.io", 0, 0); - ok(connection != NULL, "got %u\n", GetLastError()); + ok(connection != NULL, "got %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"GET", L"/", NULL, NULL, NULL, 0); - ok(request != NULL, "got %u\n", GetLastError()); + ok(request != NULL, "got %lu\n", GetLastError()); ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "got %u\n", GetLastError()); - ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + ok(ret, "got %lu\n", GetLastError()); + ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %lu\n", status); socket = pWinHttpWebSocketCompleteUpgrade(request, 0); - ok(socket != NULL, "got %u\n", GetLastError()); + ok(socket != NULL, "got %lu\n", GetLastError()); buf[0] = 0; count = 0; type = 0xdeadbeef; error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); ok(buf[0] == 'R', "got %c\n", buf[0]); - ok(count == 26, "got %u\n", count); + ok(count == 26, "got %lu\n", count); ok(type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, "got %u\n", type); error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 1); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); large_buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(buf) * 2); memcpy(large_buf, "hello", sizeof("hello")); memcpy(large_buf + sizeof(buf), "world", sizeof("world")); error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, large_buf, sizeof(buf) * 2); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); HeapFree(GetProcessHeap(), 0, large_buf); error = pWinHttpWebSocketReceive(socket, NULL, 0, NULL, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketReceive(socket, buf, 0, NULL, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketReceive(socket, NULL, 1, NULL, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); buf[0] = 0; count = 0; type = 0xdeadbeef; error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); ok(buf[0] == 'h', "got %c\n", buf[0]); - ok(count == sizeof(buf), "got %u\n", count); + ok(count == sizeof(buf), "got %lu\n", count); ok(type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, "got %u\n", type); buf[0] = 0; count = 0; type = 0xdeadbeef; error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); ok(buf[0] == 'w', "got %c\n", buf[0]); - ok(count == sizeof(buf), "got %u\n", count); + ok(count == sizeof(buf), "got %lu\n", count); ok(type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, "got %u\n", type); error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", sizeof("success")); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", sizeof("success2")); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, 0, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, &len); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); len = 0xdeadbeef; error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, &len); - ok(!error, "got %u\n", error); - ok(!len, "got %u\n", len); + ok(!error, "got %lu\n", error); + ok(!len, "got %lu\n", len); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 1, &len); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); close_status = 0xdead; len = 0xdeadbeef; memset(buf, 0, sizeof(buf)); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), &len); - ok(!error, "got %u\n", error); - ok(close_status == 1000, "got %08x\n", close_status); - ok(!len, "got %u\n", len); + ok(!error, "got %lu\n", error); + ok(close_status == 1000, "got %d\n", close_status); + ok(!len, "got %lu\n", len); WinHttpCloseHandle(socket); WinHttpCloseHandle(request); @@ -3494,44 +3490,44 @@ static void test_not_modified(int port) session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); - ok(session != NULL, "WinHttpOpen failed: %u\n", GetLastError()); + ok(session != NULL, "WinHttpOpen failed: %lu\n", GetLastError()); connection = WinHttpConnect(session, L"localhost", port, 0); - ok(connection != NULL, "WinHttpConnect failed: %u\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed: %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, NULL, L"/not_modified", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); - ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); + ok(request != NULL, "WinHttpOpenrequest failed: %lu\n", GetLastError()); ret = WinHttpSendRequest(request, today, 0, NULL, 0, 0, 0); - ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); + ok(ret, "WinHttpSendRequest failed: %lu\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + ok(ret, "WinHttpReceiveResponse failed: %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"If-Modified-Since", buffer, &len, &index); - ok(ret, "failed to get header %u\n", GetLastError()); + ok(ret, "failed to get header %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); - ok(status == HTTP_STATUS_NOT_MODIFIED, "got %u\n", status); + ok(ret, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); + ok(status == HTTP_STATUS_NOT_MODIFIED, "got %lu\n", status); size = 0xdeadbeef; ret = WinHttpQueryDataAvailable(request, &size); - ok(ret, "WinHttpQueryDataAvailable failed: %u\n", GetLastError()); - ok(!size, "got %u\n", size); + ok(ret, "WinHttpQueryDataAvailable failed: %lu\n", GetLastError()); + ok(!size, "got %lu\n", size); WinHttpCloseHandle(request); WinHttpCloseHandle(connection); WinHttpCloseHandle(session); start = GetTickCount() - start; - ok(start <= 2000, "Expected less than 2 seconds for the test, got %u ms\n", start); + ok(start <= 2000, "Expected less than 2 seconds for the test, got %lu ms\n", start); } static void test_bad_header( int port ) @@ -3542,34 +3538,34 @@ static void test_bad_header( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\rContent-Length:6\rCookie:111", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); - ok( ret, "failed to add header %u\n", GetLastError() ); + ok( ret, "failed to add header %lu\n", GetLastError() ); index = 0; buffer[0] = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Content-Type", buffer, &len, &index ); - ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( ret, "failed to query headers %lu\n", GetLastError() ); ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %u\n", index ); + ok( index == 1, "index = %lu\n", index ); index = 0; buffer[0] = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Cookie", buffer, &len, &index ); - ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( ret, "failed to query headers %lu\n", GetLastError() ); ok( !lstrcmpW( buffer, L"111" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %u\n", index ); + ok( index == 1, "index = %lu\n", index ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -3583,16 +3579,16 @@ static void test_multiple_reads(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"big", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); ok(ret == TRUE, "expected success\n"); @@ -3601,7 +3597,7 @@ static void test_multiple_reads(int port) { DWORD len = 0xdeadbeef; ret = WinHttpQueryDataAvailable( req, &len ); - ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpQueryDataAvailable failed with error %lu\n", GetLastError() ); if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); if (len) { @@ -3609,8 +3605,8 @@ static void test_multiple_reads(int port) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); - ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); - ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + ok(ret, "WinHttpReadData failed: %lu\n", GetLastError()); + ok( len == bytes_read, "only got %lu of %lu available\n", bytes_read, len ); HeapFree( GetProcessHeap(), 0, buf ); if (!bytes_read) break; @@ -3618,7 +3614,7 @@ static void test_multiple_reads(int port) } if (!len) break; } - ok(total_len == BIG_BUFFER_LEN, "got wrong length: 0x%x\n", total_len); + ok(total_len == BIG_BUFFER_LEN, "got wrong length: %lu\n", total_len); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3632,146 +3628,146 @@ static void test_cookies( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); req = WinHttpOpenRequest( con, NULL, L"/cookie3", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, L"Cookie: name=value2\r\n", ~0u, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST), "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST), "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_BAD_REQUEST, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_BAD_REQUEST, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie4", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); req = WinHttpOpenRequest( con, NULL, L"/cookie5", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST) /* < win7 */, - "request failed unexpectedly %u\n", status ); + "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -3785,20 +3781,20 @@ static void do_request( HINTERNET con, const WCHAR *obj, DWORD flags ) BOOL ret; req = WinHttpOpenRequest( con, NULL, obj, NULL, NULL, NULL, flags ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST) /* < win7 */, - "request %s with flags %08x failed %u\n", wine_dbgstr_w(obj), flags, status ); + "request %s with flags %#lx failed %lu\n", wine_dbgstr_w(obj), flags, status ); WinHttpCloseHandle( req ); } @@ -3829,10 +3825,10 @@ static void test_request_path_escapes( int port ) HINTERNET ses, con; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); do_request( con, objW, 0 ); do_request( con, obj2W, WINHTTP_FLAG_ESCAPE_PERCENT ); @@ -3854,13 +3850,13 @@ static void test_connection_info( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/basic", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); size = sizeof(info); SetLastError( 0xdeadbeef ); @@ -3872,32 +3868,32 @@ static void test_connection_info( int port ) return; } ok( !ret, "unexpected success\n" ); - ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); size = 0; SetLastError( 0xdeadbeef ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); error = GetLastError(); ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", error ); size = sizeof(info); memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); - ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); + ok( ret, "failed to retrieve connection info %lu\n", GetLastError() ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %lu\n", info.cbSize ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(info); memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); - ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); + ok( ret, "failed to retrieve connection info %lu\n", GetLastError() ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %lu\n", info.cbSize ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -3914,25 +3910,25 @@ static void test_passport_auth( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok( ses != NULL, "got %u\n", GetLastError() ); + ok( ses != NULL, "got %lu\n", GetLastError() ); option = WINHTTP_ENABLE_PASSPORT_AUTH; ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH, &option, sizeof(option) ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "got %u\n", GetLastError() ); + ok( con != NULL, "got %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/passport", NULL, NULL, NULL, 0 ); - ok( req != NULL, "got %u\n", GetLastError() ); + ok( req != NULL, "got %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); err = GetLastError(); ok( ret || broken(!ret && err == ERROR_WINHTTP_LOGIN_FAILURE) /* winxp */ - || broken(!ret && err == ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %u\n", err ); + || broken(!ret && err == ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %lu\n", err ); if (!ret) { win_skip("no support for Passport redirects\n"); @@ -3942,23 +3938,23 @@ static void test_passport_auth( int port ) status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "got %u\n", GetLastError() ); - ok( status == HTTP_STATUS_DENIED, "got %u\n", status ); + ok( ret, "got %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_DENIED, "got %lu\n", status ); buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_TEXT, NULL, buf, &size, NULL ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !lstrcmpW(L"Found", buf) || broken(!lstrcmpW(L"Unauthorized", buf)) /* < win7 */, "got %s\n", wine_dbgstr_w(buf) ); buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buf, &size, NULL ); - ok( ret || broken(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, "got %u\n", GetLastError() ); + ok( ret || broken(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, "got %lu\n", GetLastError() ); if (ret) { - ok( size == lstrlenW(headersW) * sizeof(WCHAR), "got %u\n", size ); + ok( size == lstrlenW(headersW) * sizeof(WCHAR), "got %lu\n", size ); ok( !lstrcmpW(headersW, buf), "got %s\n", wine_dbgstr_w(buf) ); } @@ -3980,108 +3976,108 @@ static void test_credentials(void) BOOL ret; ses = WinHttpOpen(L"winetest", 0, proxy_userW, proxy_passW, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - ok(ret, "failed to query proxy username %u\n", GetLastError()); + ok(ret, "failed to query proxy username %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - ok(ret, "failed to query proxy password %u\n", GetLastError()); + ok(ret, "failed to query proxy password %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_USERNAME, proxy_userW, lstrlenW(proxy_userW)); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - ok(ret, "failed to query proxy username %u\n", GetLastError()); + ok(ret, "failed to query proxy username %lu\n", GetLastError()); ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - ok(ret, "failed to query username %u\n", GetLastError()); + ok(ret, "failed to query username %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - ok(ret, "failed to query password %u\n", GetLastError()); + ok(ret, "failed to query password %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_PASSWORD, proxy_passW, lstrlenW(proxy_passW)); - ok(ret, "failed to set proxy password %u\n", GetLastError()); + ok(ret, "failed to set proxy password %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - ok(ret, "failed to query proxy password %u\n", GetLastError()); + ok(ret, "failed to query proxy password %lu\n", GetLastError()); ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - ok(ret, "failed to query username %u\n", GetLastError()); + ok(ret, "failed to query username %lu\n", GetLastError()); ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); - ok(ret, "failed to set password %u\n", GetLastError()); + ok(ret, "failed to set password %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - ok(ret, "failed to query password %u\n", GetLastError()); + ok(ret, "failed to query password %lu\n", GetLastError()); ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, passW, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - ok(ret, "failed to query username %u\n", GetLastError()); + ok(ret, "failed to query username %lu\n", GetLastError()); todo_wine { ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); } size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - ok(ret, "failed to query password %u\n", GetLastError()); + ok(ret, "failed to query password %lu\n", GetLastError()); todo_wine { ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); } WinHttpCloseHandle(req); @@ -4112,7 +4108,7 @@ static void test_IWinHttpRequest(int port) CoInitialize( NULL ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &empty ) = VT_ERROR; V_ERROR( &empty ) = 0xdeadbeef; @@ -4123,54 +4119,54 @@ static void test_IWinHttpRequest(int port) method = SysAllocString( L"POST" ); url = SysAllocString( L"http://test.winehq.org/tests/post.php" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); SysFreeString( url ); V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( L"testdata\x80" ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %#lx\n", hr ); SysFreeString( V_BSTR( &data ) ); if (hr != S_OK) goto done; hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); method = SysAllocString( L"GET" ); hr = IWinHttpRequest_Open( req, method, NULL, empty ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_Open( req, method, NULL, async ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); url = SysAllocString( L"http://test.winehq.org" ); hr = IWinHttpRequest_Open( req, NULL, url, empty ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Open( req, method, url, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( url ); url = SysAllocString( L"test.winehq.org" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %#lx\n", hr ); SysFreeString( method ); method = SysAllocString( L"INVALID" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %#lx\n", hr ); SysFreeString( method ); method = SysAllocString( L"GET" ); @@ -4179,401 +4175,401 @@ static void test_IWinHttpRequest(int port) V_VT( &async ) = VT_ERROR; V_ERROR( &async ) = DISP_E_PARAMNOTFOUND; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &cp ) = VT_ERROR; V_ERROR( &cp ) = 0xdeadbeef; hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); - ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %#x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %ld\n", V_I4( &cp ) ); V_VT( &cp ) = VT_UI4; V_UI4( &cp ) = CP_ACP; hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &cp ) = VT_ERROR; V_ERROR( &cp ) = 0xdeadbeef; hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); - ok( V_I4( &cp ) == CP_ACP, "got %u\n", V_I4( &cp ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %#x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_ACP, "got %ld\n", V_I4( &cp ) ); value = SysAllocString( L"utf-8" ); V_VT( &cp ) = VT_BSTR; V_BSTR( &cp ) = value; hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( value ); V_VT( &cp ) = VT_ERROR; V_ERROR( &cp ) = 0xdeadbeef; hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); - ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %#x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %ld\n", V_I4( &cp ) ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); VariantInit( &proxy_server ); V_VT( &proxy_server ) = VT_ERROR; VariantInit( &bypass_list ); V_VT( &bypass_list ) = VT_ERROR; hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); connection = SysAllocString( L"Connection" ); hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetRequestHeader( req, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); date = SysAllocString( L"Date" ); hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); today = SysAllocString( todayW ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); method = SysAllocString( L"GET" ); SysFreeString( url ); url = SysAllocString( L"http://test.winehq.org" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); username = SysAllocString( L"username" ); hr = IWinHttpRequest_SetCredentials( req, username, NULL, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); password = SysAllocString( L"password" ); hr = IWinHttpRequest_SetCredentials( req, NULL, password, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, username, password, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, NULL, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &proxy_server ) = VT_BSTR; V_BSTR( &proxy_server ) = SysAllocString( L"proxyserver" ); V_VT( &bypass_list ) = VT_BSTR; V_BSTR( &bypass_list ) = SysAllocString( L"bypasslist" ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, 0xdeadbeef, proxy_server, bypass_list ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); SysFreeString( response ); hr = IWinHttpRequest_get_Status( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); status = 0; hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == S_OK, "got %08x\n", hr ); - trace("Status=%d\n", status); + ok( hr == S_OK, "got %#lx\n", hr ); + trace("Status = %lu\n", status); hr = IWinHttpRequest_get_StatusText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); trace("StatusText=%s\n", wine_dbgstr_w(status_text)); SysFreeString( status_text ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( headers ); hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( value ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( status_text ); hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( response ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); VariantInit( &body ); V_VT( &body ) = VT_ERROR; hr = IWinHttpRequest_get_ResponseBody( req, &body ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &body ) == (VT_ARRAY|VT_UI1), "got %08x\n", V_VT( &body ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &body ) == (VT_ARRAY|VT_UI1), "got %#x\n", V_VT( &body ) ); hr = VariantClear( &body ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantInit( &body ); V_VT( &body ) = VT_ERROR; hr = IWinHttpRequest_get_ResponseStream( req, &body ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &body ) == VT_UNKNOWN, "got %08x\n", V_VT( &body ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &body ) == VT_UNKNOWN, "got %#x\n", V_VT( &body ) ); hr = IUnknown_QueryInterface( V_UNKNOWN( &body ), &IID_IStream, (void **)&stream ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_UNKNOWN( &body ) == (IUnknown *)stream, "got different interface pointer\n" ); buf[0] = 0; count = 0xdeadbeef; hr = IStream_Read( stream, buf, 128, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( count != 0xdeadbeef, "count not set\n" ); ok( buf[0], "no data\n" ); VariantInit( &body2 ); V_VT( &body2 ) = VT_ERROR; hr = IWinHttpRequest_get_ResponseStream( req, &body2 ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &body2 ) == VT_UNKNOWN, "got %08x\n", V_VT( &body2 ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &body2 ) == VT_UNKNOWN, "got %#x\n", V_VT( &body2 ) ); ok( V_UNKNOWN( &body ) != V_UNKNOWN( &body2 ), "got same interface pointer\n" ); hr = IUnknown_QueryInterface( V_UNKNOWN( &body2 ), &IID_IStream, (void **)&stream2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_UNKNOWN( &body2 ) == (IUnknown *)stream2, "got different interface pointer\n" ); IStream_Release( stream2 ); hr = VariantClear( &body ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = VariantClear( &body2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( headers ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( value ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); pos.QuadPart = 0; hr = IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; count = 0xdeadbeef; hr = IStream_Read( stream, buf, 128, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( count != 0xdeadbeef, "count not set\n" ); ok( buf[0], "no data\n" ); IStream_Release( stream ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &async ) = VT_I4; V_I4( &async ) = 1; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); @@ -4588,31 +4584,31 @@ static void test_IWinHttpRequest(int port) VariantClear( &bypass_list ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); url = SysAllocString( L"https://test.winehq.org:443" ); method = SysAllocString( L"POST" ); V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); SysFreeString( url ); hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ) || - hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %08x\n", hr ); + hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); SysFreeString( response ); IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); sprintf( buf, "http://localhost:%d/auth", port ); MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, ARRAY_SIZE( bufW )); @@ -4621,28 +4617,28 @@ static void test_IWinHttpRequest(int port) V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); SysFreeString( url ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( L"testdata\x80" ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( V_BSTR( &data ) ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !memcmp( response, L"Unauthorized", sizeof(L"Unauthorized") ), "got %s\n", wine_dbgstr_w(response) ); SysFreeString( response ); status = 0xdeadbeef; hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( status == HTTP_STATUS_DENIED, "got %lu\n", status ); done: IWinHttpRequest_Release( req ); @@ -4666,7 +4662,7 @@ static void request_get_property(IWinHttpRequest *request, int property, VARIANT VariantInit(ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); } static void test_IWinHttpRequest_Invoke(void) @@ -4688,28 +4684,28 @@ static void test_IWinHttpRequest_Invoke(void) CoInitialize(NULL); hr = CLSIDFromProgID(L"WinHttp.WinHttpRequest.5.1", &clsid); - ok(hr == S_OK, "CLSIDFromProgID error %#x\n", hr); + ok(hr == S_OK, "CLSIDFromProgID error %#lx\n", hr); bret = IsEqualIID(&clsid, &CLSID_WinHttpRequest); ok(bret || broken(!bret) /* win2003 */, "not expected %s\n", wine_dbgstr_guid(&clsid)); hr = CoCreateInstance(&CLSID_WinHttpRequest, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&request); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); hr = IWinHttpRequest_QueryInterface(request, &IID_IDispatch, (void **)&dispatch); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); IDispatch_Release(dispatch); hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &open, 1, 0x0409, &id); - ok(hr == S_OK, "error %#x\n", hr); - ok(id == DISPID_HTTPREQUEST_OPEN, "expected DISPID_HTTPREQUEST_OPEN, got %u\n", id); + ok(hr == S_OK, "error %#lx\n", hr); + ok(id == DISPID_HTTPREQUEST_OPEN, "expected DISPID_HTTPREQUEST_OPEN, got %lu\n", id); hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &option, 1, 0x0409, &id); - ok(hr == S_OK, "error %#x\n", hr); - ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %u\n", id); + ok(hr == S_OK, "error %#lx\n", hr); + ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %lu\n", id); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4722,11 +4718,11 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4739,11 +4735,11 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD | DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4756,11 +4752,11 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 1252, "expected 1252, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4772,37 +4768,37 @@ static void test_IWinHttpRequest_Invoke(void) V_VT(&arg[1]) = VT_R8; V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 1252, "expected 1252, got %ld\n", V_I4(&ret)); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 1252, "expected 1252, got %ld\n", V_I4(&ret)); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); hr = IWinHttpRequest_Invoke(request, 255, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "error %#x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "error %#lx\n", hr); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); - ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); + ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#lx\n", hr); VariantInit(&ret); if (0) /* crashes */ @@ -4810,13 +4806,13 @@ static void test_IWinHttpRequest_Invoke(void) params.cArgs = 1; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); - ok(hr == DISP_E_TYPEMISMATCH, "error %#x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "error %#lx\n", hr); VariantInit(&arg[2]); params.cArgs = 3; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); todo_wine - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); VariantInit(&arg[0]); VariantInit(&arg[1]); @@ -4826,46 +4822,46 @@ static void test_IWinHttpRequest_Invoke(void) V_VT(&arg[0]) = VT_I4; V_I4(&arg[0]) = WinHttpRequestOption_URLCodePage; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(hr == S_OK, "error %#lx\n", hr); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(hr == S_OK, "error %#lx\n", hr); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); - ok(V_VT(&ret) == VT_EMPTY, "expected VT_EMPTY, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 0xbeef || V_I4(&ret) == 0 /* Win8 */, "expected 0xdead, got %d\n", V_I4(&ret)); + ok(hr == S_OK, "error %#lx\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "expected VT_EMPTY, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 0xbeef || V_I4(&ret) == 0 /* Win8 */, "expected 0xdead, got %ld\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); + ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#lx\n", hr); params.cArgs = 2; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); todo_wine - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); params.cArgs = 0; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == DISP_E_PARAMNOTFOUND, "error %#x\n", hr); + ok(hr == DISP_E_PARAMNOTFOUND, "error %#lx\n", hr); SysFreeString(utf8); @@ -4875,7 +4871,7 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); IWinHttpRequest_Release(request); @@ -4892,20 +4888,20 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); url = NULL; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); @@ -4913,7 +4909,7 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) error = GetLastError(); if (!ret) { - ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %lu\n", error ); ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else @@ -4928,12 +4924,12 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) error = GetLastError(); if (!ret) { - ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %lu\n", error ); ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else { - ok( error == ERROR_SUCCESS, "got %u\n", error ); + ok( error == ERROR_SUCCESS, "got %lu\n", error ); trace("%s\n", wine_dbgstr_w(url)); GlobalFree( url ); } @@ -4951,13 +4947,13 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) ret = WinHttpGetIEProxyConfigForCurrentUser( NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); error = GetLastError(); ok( ret, "expected success\n" ); - ok( error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* < win7 */, "got %u\n", error ); + ok( error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* < win7 */, "got %lu\n", error ); trace("IEProxy.AutoDetect=%d\n", cfg.fAutoDetect); trace("IEProxy.AutoConfigUrl=%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); @@ -4982,34 +4978,34 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( NULL, NULL, NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_HANDLE, "got %u\n", error ); + ok( error == ERROR_INVALID_HANDLE, "got %lu\n", error ); session = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok( session != NULL, "failed to open session %u\n", GetLastError() ); + ok( session != NULL, "failed to open session %lu\n", GetLastError() ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, NULL, NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, L"", NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; @@ -5018,7 +5014,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = 0; @@ -5027,7 +5023,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT | WINHTTP_AUTOPROXY_CONFIG_URL; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; @@ -5036,7 +5032,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; @@ -5047,8 +5043,8 @@ static void test_WinHttpGetProxyForUrl(void) error = GetLastError(); if (ret) { - ok( error == ERROR_SUCCESS, "got %u\n", error ); - trace("Proxy.AccessType=%u\n", info.dwAccessType); + ok( error == ERROR_SUCCESS, "got %lu\n", error ); + trace("Proxy.AccessType=%lu\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); @@ -5066,7 +5062,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); if (ret) { - trace("Proxy.AccessType=%u\n", info.dwAccessType); + trace("Proxy.AccessType=%lu\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); @@ -5092,15 +5088,15 @@ static void test_chunked_read(void) trace( "starting chunked read test\n" ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok( ses != NULL, "WinHttpOpen failed with error %u\n", GetLastError() ); + ok( ses != NULL, "WinHttpOpen failed with error %lu\n", GetLastError() ); if (!ses) goto done; con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok( con != NULL, "WinHttpConnect failed with error %u\n", GetLastError() ); + ok( con != NULL, "WinHttpConnect failed with error %lu\n", GetLastError() ); if (!con) goto done; req = WinHttpOpenRequest( con, NULL, L"/tests/chunked", NULL, NULL, NULL, 0 ); - ok( req != NULL, "WinHttpOpenRequest failed with error %u\n", GetLastError() ); + ok( req != NULL, "WinHttpOpenRequest failed with error %lu\n", GetLastError() ); if (!req) goto done; ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -5110,17 +5106,17 @@ static void test_chunked_read(void) skip("connection failed, skipping\n"); goto done; } - ok( ret, "WinHttpSendRequest failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpSendRequest failed with error %lu\n", GetLastError() ); if (!ret) goto done; ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "WinHttpReceiveResponse failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpReceiveResponse failed with error %lu\n", GetLastError() ); if (!ret) goto done; header[0] = 0; len = sizeof(header); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, header, &len, 0 ); - ok( ret, "failed to get TRANSFER_ENCODING header (error %u)\n", GetLastError() ); + ok( ret, "failed to get TRANSFER_ENCODING header (error %lu\n", GetLastError() ); ok( !lstrcmpW( header, L"chunked" ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); trace( "transfer encoding: %s\n", wine_dbgstr_w(header) ); @@ -5129,27 +5125,27 @@ static void test_chunked_read(void) SetLastError( 0xdeadbeef ); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CONTENT_LENGTH, NULL, &header, &len, 0 ); ok( !ret, "unexpected CONTENT_LENGTH header %s\n", wine_dbgstr_w(header) ); - ok( GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %lu\n", GetLastError() ); trace( "entering query loop\n" ); for (;;) { len = 0xdeadbeef; ret = WinHttpQueryDataAvailable( req, &len ); - ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpQueryDataAvailable failed with error %lu\n", GetLastError() ); if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); - trace( "got %u available\n", len ); + trace( "got %lu available\n", len ); if (len) { DWORD bytes_read; char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); - ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret, "WinHttpReadData failed: %lu\n", GetLastError()); buf[bytes_read] = 0; - trace( "WinHttpReadData -> %d %u\n", ret, bytes_read ); - ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + trace( "WinHttpReadData -> %d %lu\n", ret, bytes_read ); + ok( len == bytes_read, "only got %lu of %lu available\n", bytes_read, len ); ok( buf[bytes_read - 1] == '\n', "received partial line '%s'\n", buf ); HeapFree( GetProcessHeap(), 0, buf ); @@ -5176,7 +5172,7 @@ static void test_max_http_automatic_redirects (void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); /* Test with 2 redirects (page will try to redirect 3 times) */ request = WinHttpOpenRequest(connection, L"GET", L"tests/redirecttest.php?max=3", NULL, WINHTTP_NO_REFERER, @@ -5186,12 +5182,12 @@ static void test_max_http_automatic_redirects (void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %lu\n", GetLastError()); if (!request) goto done; max_redirects = 2; ret = WinHttpSetOption(request, WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS, &max_redirects, sizeof(max_redirects)); - ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %lu\n", GetLastError()); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); err = GetLastError(); @@ -5200,12 +5196,12 @@ static void test_max_http_automatic_redirects (void) skip("connection failed, skipping\n"); goto done; } - ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpSendRequest failed: %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(request, NULL); ok(!ret, "WinHttpReceiveResponse succeeded, expected failure\n"); - ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %u.\n", GetLastError()); + ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %lu\n", GetLastError()); done: ret = WinHttpCloseHandle(request); @@ -5468,7 +5464,7 @@ static void test_client_cert_authentication(void) const CERT_CONTEXT *cert; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1; ret = WinHttpSetOption( ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols) ); @@ -5478,38 +5474,38 @@ static void test_client_cert_authentication(void) WinHttpCloseHandle( ses ); return; } - ok( ret, "failed to set protocols %u\n", GetLastError() ); + ok( ret, "failed to set protocols %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"test.winehq.org", 443, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/tests/clientcert/", NULL, NULL, NULL, WINHTTP_FLAG_SECURE ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( req, NULL ); ok( !ret, "unexpected success\n" ); - ok( GetLastError() == ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED, "got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED, "got %lu\n", GetLastError() ); pfx.pbData = (BYTE *)pfxdata; pfx.cbData = sizeof(pfxdata); store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY ); - ok( store != NULL, "got %u\n", GetLastError() ); + ok( store != NULL, "got %lu\n", GetLastError() ); cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); - ok( cert != NULL, "got %u\n", GetLastError() ); + ok( cert != NULL, "got %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, (void *)cert, sizeof(*cert) ); - ok( ret, "failed to set client cert %u\n", GetLastError() ); + ok( ret, "failed to set client cert %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); CertFreeCertificateContext( cert ); CertCloseStore( store, 0 ); @@ -5557,10 +5553,10 @@ START_TEST (winhttp) si.port = 7532; thread = CreateThread(NULL, 0, server_thread, &si, 0, NULL); - ok(thread != NULL, "failed to create thread %u\n", GetLastError()); + ok(thread != NULL, "failed to create thread %lu\n", GetLastError()); ret = WaitForSingleObject(si.event, 10000); - ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); + ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %lu\n", GetLastError()); if (ret != WAIT_OBJECT_0) { CloseHandle(thread); -- 2.30.2

1 0

[PATCH] msi/tests: Correctly free usersid.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7de4fb7c52c..224637eb286 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3022,7 +3022,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_product(void) @@ -3259,7 +3259,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_features(void) @@ -3384,7 +3384,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name) -- 2.30.2

1 0

[PATCH 1/5] dinput: Rename IDirectInputImpl to struct dinput.
by Rémi Bernon 08 Feb '22

08 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/ansi.c | 54 ++++++++--------- dlls/dinput/device.c | 4 +- dlls/dinput/device_private.h | 4 +- dlls/dinput/dinput_main.c | 111 +++++++++++++++++------------------ dlls/dinput/dinput_private.h | 29 +++++---- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 8 files changed, 103 insertions(+), 105 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index b7ec426b2e0..99ec3c73327 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -54,22 +54,22 @@ static inline IDirectInputDeviceA *IDirectInputDeviceA_from_IDirectInputDeviceW( return (IDirectInputDeviceA *)IDirectInputDevice8A_from_IDirectInputDevice8W( (IDirectInputDevice8W *)iface ); } -static IDirectInputImpl *impl_from_IDirectInput7A( IDirectInput7A *iface ) +static struct dinput *impl_from_IDirectInput7A( IDirectInput7A *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7A_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput7A_iface ); } -static IDirectInput7W *IDirectInput7W_from_impl( IDirectInputImpl *impl ) +static IDirectInput7W *IDirectInput7W_from_impl( struct dinput *impl ) { return &impl->IDirectInput7W_iface; } -static IDirectInputImpl *impl_from_IDirectInput8A( IDirectInput8A *iface ) +static struct dinput *impl_from_IDirectInput8A( IDirectInput8A *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8A_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput8A_iface ); } -static IDirectInput8W *IDirectInput8W_from_impl( IDirectInputImpl *impl ) +static IDirectInput8W *IDirectInput8W_from_impl( struct dinput *impl ) { return &impl->IDirectInput8W_iface; } @@ -678,28 +678,28 @@ const IDirectInputDevice8AVtbl dinput_device_a_vtbl = static HRESULT WINAPI dinput8_a_QueryInterface( IDirectInput8A *iface_a, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_QueryInterface( iface_w, iid, out ); } static ULONG WINAPI dinput8_a_AddRef( IDirectInput8A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_AddRef( iface_w ); } static ULONG WINAPI dinput8_a_Release( IDirectInput8A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_Release( iface_w ); } static HRESULT WINAPI dinput8_a_CreateDevice( IDirectInput8A *iface_a, REFGUID guid, IDirectInputDevice8A **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); IDirectInputDevice8W *outw; HRESULT hr; @@ -730,7 +730,7 @@ static HRESULT WINAPI dinput8_a_EnumDevices( IDirectInput8A *iface_a, DWORD type void *ref, DWORD flags ) { struct enum_devices_wtoa_params params = {callback, ref}; - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); if (!callback) return DIERR_INVALIDPARAM; @@ -740,28 +740,28 @@ static HRESULT WINAPI dinput8_a_EnumDevices( IDirectInput8A *iface_a, DWORD type static HRESULT WINAPI dinput8_a_GetDeviceStatus( IDirectInput8A *iface_a, REFGUID instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_GetDeviceStatus( iface_w, instance_guid ); } static HRESULT WINAPI dinput8_a_RunControlPanel( IDirectInput8A *iface_a, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_RunControlPanel( iface_w, owner, flags ); } static HRESULT WINAPI dinput8_a_Initialize( IDirectInput8A *iface_a, HINSTANCE instance, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_Initialize( iface_w, instance, version ); } static HRESULT WINAPI dinput8_a_FindDevice( IDirectInput8A *iface_a, REFGUID guid, const char *name_a, GUID *instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); HRESULT hr; WCHAR *name_w; @@ -794,7 +794,7 @@ static HRESULT WINAPI dinput8_a_EnumDevicesBySemantics( IDirectInput8A *iface_a, LPDIENUMDEVICESBYSEMANTICSCBA callback, void *ref, DWORD flags ) { struct enum_devices_by_semantics_wtoa_params params = {callback, ref}; - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); DIACTIONFORMATW format_w = {sizeof(format_w), sizeof(DIACTIONW)}; IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); HRESULT hr; @@ -821,7 +821,7 @@ static HRESULT WINAPI dinput8_a_EnumDevicesBySemantics( IDirectInput8A *iface_a, static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDICONFIGUREDEVICESCALLBACK callback, DICONFIGUREDEVICESPARAMSA *params_a, DWORD flags, void *ref ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); DICONFIGUREDEVICESPARAMSW params_w = {sizeof(params_w)}; DIACTIONFORMATA *format_a = params_a->lprgFormats; @@ -873,28 +873,28 @@ const IDirectInput8AVtbl dinput8_a_vtbl = static HRESULT WINAPI dinput7_a_QueryInterface( IDirectInput7A *iface_a, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_QueryInterface( iface_w, iid, out ); } static ULONG WINAPI dinput7_a_AddRef( IDirectInput7A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_AddRef( iface_w ); } static ULONG WINAPI dinput7_a_Release( IDirectInput7A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_Release( iface_w ); } static HRESULT WINAPI dinput7_a_CreateDevice( IDirectInput7A *iface_a, REFGUID guid, IDirectInputDeviceA **out_a, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); IDirectInputDeviceW *out_w; HRESULT hr; @@ -910,7 +910,7 @@ static HRESULT WINAPI dinput7_a_EnumDevices( IDirectInput7A *iface_a, DWORD type void *ref, DWORD flags ) { struct enum_devices_wtoa_params params = {callback, ref}; - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); if (!callback) return DIERR_INVALIDPARAM; @@ -920,28 +920,28 @@ static HRESULT WINAPI dinput7_a_EnumDevices( IDirectInput7A *iface_a, DWORD type static HRESULT WINAPI dinput7_a_GetDeviceStatus( IDirectInput7A *iface_a, REFGUID instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_GetDeviceStatus( iface_w, instance_guid ); } static HRESULT WINAPI dinput7_a_RunControlPanel( IDirectInput7A *iface_a, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_RunControlPanel( iface_w, owner, flags ); } static HRESULT WINAPI dinput7_a_Initialize( IDirectInput7A *iface_a, HINSTANCE instance, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_Initialize( iface_w, instance, version ); } static HRESULT WINAPI dinput7_a_FindDevice( IDirectInput7A *iface_a, REFGUID guid, const char *name_a, GUID *instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); HRESULT hr; WCHAR *name_w; @@ -955,7 +955,7 @@ static HRESULT WINAPI dinput7_a_FindDevice( IDirectInput7A *iface_a, REFGUID gui static HRESULT WINAPI dinput7_a_CreateDeviceEx( IDirectInput7A *iface_a, REFGUID guid, REFIID iid, void **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_CreateDeviceEx( iface_w, guid, iid, out, outer ); } diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ff8e2252a40..8c48fa7b53b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2153,8 +2153,8 @@ static const IDirectInputDevice8WVtbl dinput_device_w_vtbl = dinput_device_GetImageInfo, }; -HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, - const GUID *guid, IDirectInputImpl *dinput, void **out ) +HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, const GUID *guid, + struct dinput *dinput, void **out ) { struct dinput_device *This; DIDATAFORMAT *format; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 15a8a6f83b5..4e76d1ba738 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -84,7 +84,7 @@ struct dinput_device LONG ref; GUID guid; CRITICAL_SECTION crit; - IDirectInputImpl *dinput; + struct dinput *dinput; struct list entry; /* entry into acquired device list */ HANDLE hEvent; DIDEVICEINSTANCEW instance; @@ -124,7 +124,7 @@ struct dinput_device }; extern HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, const GUID *guid, - IDirectInputImpl *dinput, void **out ) DECLSPEC_HIDDEN; + struct dinput *dinput, void **out ) DECLSPEC_HIDDEN; extern HRESULT dinput_device_init( IDirectInputDevice8W *iface ); extern void dinput_device_destroy( IDirectInputDevice8W *iface ); diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index d3d5206a1e4..b9d44f140c8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -59,14 +59,14 @@ static const IDirectInput7WVtbl dinput7_vtbl; static const IDirectInput8WVtbl dinput8_vtbl; static const IDirectInputJoyConfig8Vtbl joy_config_vtbl; -static inline IDirectInputImpl *impl_from_IDirectInput7W( IDirectInput7W *iface ) +static inline struct dinput *impl_from_IDirectInput7W( IDirectInput7W *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7W_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput7W_iface ); } -static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface ) +static inline struct dinput *impl_from_IDirectInput8W( IDirectInput8W *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput8W_iface ); } static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -95,8 +95,8 @@ static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); -static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwVersion); -static void uninitialize_directinput_instance(IDirectInputImpl *This); +static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ); +static void uninitialize_directinput_instance( struct dinput *impl ); void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) { @@ -137,28 +137,27 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); } -static HRESULT create_directinput_instance(REFIID riid, LPVOID *ppDI, IDirectInputImpl **out) +static HRESULT dinput_create( REFIID riid, LPVOID *ppDI, struct dinput **out ) { - IDirectInputImpl *This = calloc( 1, sizeof(IDirectInputImpl) ); + struct dinput *impl = calloc( 1, sizeof(struct dinput) ); HRESULT hr; - if (!This) - return E_OUTOFMEMORY; + if (!impl) return E_OUTOFMEMORY; - This->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; - This->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; - This->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; - This->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; - This->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; + impl->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; + impl->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; + impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; + impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; + impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; - hr = IDirectInput_QueryInterface( &This->IDirectInput7A_iface, riid, ppDI ); + hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, riid, ppDI ); if (FAILED(hr)) { - free( This ); + free( impl ); return hr; } - if (out) *out = This; + if (out) *out = impl; return DI_OK; } @@ -169,7 +168,7 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - IDirectInputImpl *This; + struct dinput *impl; HRESULT hr; TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter); @@ -181,17 +180,17 @@ HRESULT WINAPI DirectInputCreateEx( IsEqualGUID( &IID_IDirectInput2W, riid ) || IsEqualGUID( &IID_IDirectInput7W, riid )) { - hr = create_directinput_instance(riid, ppDI, &This); + hr = dinput_create( riid, ppDI, &impl ); if (FAILED(hr)) return hr; } else return DIERR_NOINTERFACE; - hr = IDirectInput_Initialize( &This->IDirectInput7A_iface, hinst, dwVersion ); + hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, dwVersion ); if (FAILED(hr)) { - IDirectInput_Release( &This->IDirectInput7A_iface ); + IDirectInput_Release( &impl->IDirectInput7A_iface ); *ppDI = NULL; return hr; } @@ -205,7 +204,7 @@ HRESULT WINAPI DirectInputCreateEx( HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer) { - IDirectInputImpl *This; + struct dinput *impl; HRESULT hr; TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", @@ -222,7 +221,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, return DIERR_NOINTERFACE; } - hr = create_directinput_instance(iid, out, &This); + hr = dinput_create( iid, out, &impl ); if (FAILED(hr)) { @@ -233,10 +232,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, /* When aggregation is used, the application needs to manually call Initialize(). */ if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) { - hr = IDirectInput8_Initialize(&This->IDirectInput8A_iface, hinst, version); + hr = IDirectInput8_Initialize( &impl->IDirectInput8A_iface, hinst, version ); if (FAILED(hr)) { - IDirectInput8_Release(&This->IDirectInput8A_iface); + IDirectInput8_Release( &impl->IDirectInput8A_iface ); *out = NULL; return hr; } @@ -244,10 +243,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) { - hr = IDirectInput8_Initialize(&This->IDirectInput8W_iface, hinst, version); + hr = IDirectInput8_Initialize( &impl->IDirectInput8W_iface, hinst, version ); if (FAILED(hr)) { - IDirectInput8_Release(&This->IDirectInput8W_iface); + IDirectInput8_Release( &impl->IDirectInput8W_iface ); *out = NULL; return hr; } @@ -324,7 +323,7 @@ __ASM_GLOBAL_FUNC( enum_callback_wrapper, static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, void *context, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); TRACE( "iface %p, type %#x, callback %p, context %p, flags %#x.\n", iface, type, callback, context, flags ); @@ -339,7 +338,7 @@ static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LP static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); ULONG ref = InterlockedIncrement( &impl->ref ); TRACE( "iface %p increasing refcount to %u.\n", iface, ref ); return ref; @@ -347,7 +346,7 @@ static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); ULONG ref = InterlockedDecrement( &impl->ref ); TRACE( "iface %p decreasing refcount to %u.\n", iface, ref ); @@ -363,7 +362,7 @@ static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) static HRESULT WINAPI dinput7_QueryInterface( IDirectInput7W *iface, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); @@ -450,7 +449,7 @@ static void unregister_di_em_win_class(void) WARN( "Unable to unregister message window class\n" ); } -static HRESULT initialize_directinput_instance( IDirectInputImpl *impl, DWORD version ) +static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ) { if (!impl->initialized) { @@ -465,7 +464,7 @@ static HRESULT initialize_directinput_instance( IDirectInputImpl *impl, DWORD ve return DI_OK; } -static void uninitialize_directinput_instance( IDirectInputImpl *impl ) +static void uninitialize_directinput_instance( struct dinput *impl ) { if (impl->initialized) { @@ -491,7 +490,7 @@ enum directinput_versions static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); TRACE( "iface %p, hinst %p, version %#x.\n", iface, hinst, version ); @@ -512,7 +511,7 @@ static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID *guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); HRESULT hr; IDirectInputDeviceW *device; @@ -531,7 +530,7 @@ static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID static HRESULT WINAPI dinput7_RunControlPanel( IDirectInput7W *iface, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); WCHAR control_exe[] = {L"control.exe"}; STARTUPINFOW si = {0}; PROCESS_INFORMATION pi; @@ -558,7 +557,7 @@ static HRESULT WINAPI dinput7_FindDevice( IDirectInput7W *iface, const GUID *gui static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID *guid, REFIID iid, void **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); IDirectInputDevice8W *device; HRESULT hr; @@ -593,26 +592,26 @@ static HRESULT WINAPI dinput7_CreateDevice( IDirectInput7W *iface, const GUID *g static ULONG WINAPI dinput8_AddRef( IDirectInput8W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); } static HRESULT WINAPI dinput8_QueryInterface( IDirectInput8W *iface, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); } static ULONG WINAPI dinput8_Release( IDirectInput8W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_Release( &impl->IDirectInput7W_iface ); } static HRESULT WINAPI dinput8_CreateDevice( IDirectInput8W *iface, const GUID *guid, IDirectInputDevice8W **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_CreateDeviceEx( &impl->IDirectInput7W_iface, guid, &IID_IDirectInputDevice8W, (void **)out, outer ); } @@ -630,7 +629,7 @@ static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LP DWORD flags ) { DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); DWORD device_class = 0, device_type = 0; unsigned int i = 0; HRESULT hr; @@ -679,19 +678,19 @@ static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LP static HRESULT WINAPI dinput8_GetDeviceStatus( IDirectInput8W *iface, const GUID *guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_GetDeviceStatus( &impl->IDirectInput7W_iface, guid ); } static HRESULT WINAPI dinput8_RunControlPanel( IDirectInput8W *iface, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_RunControlPanel( &impl->IDirectInput7W_iface, owner, flags ); } static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); TRACE( "iface %p, hinst %p, version %#x.\n", iface, hinst, version ); @@ -709,7 +708,7 @@ static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst static HRESULT WINAPI dinput8_FindDevice( IDirectInput8W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_FindDevice( &impl->IDirectInput7W_iface, guid, name, instance_guid ); } @@ -767,7 +766,7 @@ struct enum_device_by_semantics_params static BOOL CALLBACK enum_device_by_semantics( const DIDEVICEINSTANCEW *instance, void *context ) { struct enum_device_by_semantics_params *params = context; - IDirectInputImpl *impl = impl_from_IDirectInput8W( params->iface ); + struct dinput *impl = impl_from_IDirectInput8W( params->iface ); if (should_enumerate_device( params->username, params->flags, &impl->device_players, &instance->guidInstance )) { @@ -786,7 +785,7 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con DWORD callbackFlags, enum_flags = DIEDFL_ATTACHEDONLY | (flags & DIEDFL_FORCEFEEDBACK); static const GUID *guids[2] = {&GUID_SysKeyboard, &GUID_SysMouse}; static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); DIDEVICEINSTANCEW didevi; IDirectInputDevice8W *lpdid; unsigned int i = 0; @@ -870,26 +869,26 @@ static HRESULT WINAPI dinput8_ConfigureDevices( IDirectInput8W *iface, LPDICONFI * IDirectInputJoyConfig8 interface */ -static inline IDirectInputImpl *impl_from_IDirectInputJoyConfig8(IDirectInputJoyConfig8 *iface) +static inline struct dinput *impl_from_IDirectInputJoyConfig8( IDirectInputJoyConfig8 *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInputJoyConfig8_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInputJoyConfig8_iface ); } static HRESULT WINAPI joy_config_QueryInterface( IDirectInputJoyConfig8 *iface, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); } static ULONG WINAPI joy_config_AddRef( IDirectInputJoyConfig8 *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); } static ULONG WINAPI joy_config_Release( IDirectInputJoyConfig8 *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); return IDirectInput7_Release( &impl->IDirectInput7W_iface ); } @@ -960,7 +959,7 @@ static BOOL CALLBACK find_device_from_index( const DIDEVICEINSTANCEW *instance, static HRESULT WINAPI joy_config_GetConfig( IDirectInputJoyConfig8 *iface, UINT id, DIJOYCONFIG *info, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); struct find_device_from_index_params params = {.index = id}; HRESULT hr; @@ -1124,7 +1123,7 @@ static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnkno if (outer) return CLASS_E_NOAGGREGATION; - if (FAILED(hr = create_directinput_instance( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + if (FAILED(hr = dinput_create( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; hr = IUnknown_QueryInterface( unknown, iid, out ); IUnknown_Release( unknown ); diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 4b36a69c0e1..de48c4c5298 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -30,31 +30,30 @@ extern HINSTANCE DINPUT_instance; /* Implementation specification */ -typedef struct IDirectInputImpl IDirectInputImpl; -struct IDirectInputImpl +struct dinput { - IDirectInput7A IDirectInput7A_iface; - IDirectInput7W IDirectInput7W_iface; - IDirectInput8A IDirectInput8A_iface; - IDirectInput8W IDirectInput8W_iface; - IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; + IDirectInput7A IDirectInput7A_iface; + IDirectInput7W IDirectInput7W_iface; + IDirectInput8A IDirectInput8A_iface; + IDirectInput8W IDirectInput8W_iface; + IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; + LONG ref; - LONG ref; - BOOL initialized; - DWORD evsequence; /* unique sequence number for events */ - DWORD dwVersion; /* direct input version number */ - struct list device_players; /* device instance guid to player name */ + BOOL initialized; + DWORD dwVersion; /* direct input version number */ + DWORD evsequence; /* unique sequence number for events */ + struct list device_players; /* device instance guid to player name */ }; extern const IDirectInput7AVtbl dinput7_a_vtbl DECLSPEC_HIDDEN; extern const IDirectInput8AVtbl dinput8_a_vtbl DECLSPEC_HIDDEN; extern HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version ); -extern HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); +extern HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version ); -extern HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); +extern HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); -extern HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); +extern HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); struct DevicePlayer { GUID instance_guid; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 597a3da4ef8..067ffabaaa9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1964,7 +1964,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap return DIENUM_CONTINUE; } -HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { static const DIPROPHEADER filter = { diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 1421e56ac3a..c483fb6e66a 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -164,7 +164,7 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan return DI_OK; } -HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct keyboard *impl; HRESULT hr; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 64b2c30008d..43f3a6ad334 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -91,7 +91,7 @@ HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, return DI_OK; } -HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct mouse *impl; HKEY hkey, appkey; -- 2.34.1

1 4

[PATCH] kernelbase: Partially implement SetCurrentConsoleFontEx
by Hugh McMaster 08 Feb '22

08 Feb '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/console.c | 7 ------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 30 +++++++++++++------------- dlls/kernelbase/console.c | 37 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 6 ++++++ programs/conhost/conhost.c | 9 +++++++- programs/conhost/conhost.h | 14 ++++++++----- programs/conhost/window.c | 5 +++-- 9 files changed, 80 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 80f3419cd7a..58bd18d2a5f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -480,10 +480,3 @@ BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, C SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } - -BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) -{ - FIXME("(%p %d %p): stub!\n", hConsole, maxwindow, cfix); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 87fa0c39381..6e063bfaa7b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1390,7 +1390,7 @@ @ stdcall -import SetConsoleTitleW(wstr) @ stdcall -import SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) NTDLL.RtlSetCriticalSectionSpinCount -@ stdcall SetCurrentConsoleFontEx(long long ptr) +@ stdcall -import SetCurrentConsoleFontEx(long long ptr) @ stdcall -import SetCurrentDirectoryA(str) @ stdcall -import SetCurrentDirectoryW(wstr) @ stub SetDaylightFlag diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..0943a318f6a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3576,18 +3576,18 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CreatePipe(&pipe1, &pipe2, NULL, 0); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3595,36 +3595,36 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); cfix = orig_cfix; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); @@ -3635,7 +3635,7 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3650,7 +3650,7 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); @@ -3659,8 +3659,8 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); @@ -3670,8 +3670,8 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } static void test_GetConsoleFontSize(HANDLE std_output) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a7eeb439232..0501e140a03 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1303,6 +1303,43 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute } +/****************************************************************************** + * SetCurrentConsoleFontEx (kernelbase.@) + */ +BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) +{ + struct condrv_output_info_params_font data; + + TRACE( "(%p %d %p)\n", hConsole, maxwindow, cfix ); + + if (cfix->cbSize != sizeof(CONSOLE_FONT_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (maxwindow) + { + FIXME( "(%p %d %p): semi-stub\n", hConsole, maxwindow, cfix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + data.params.mask = SET_CONSOLE_OUTPUT_INFO_FONT; + + data.params.info.font_width = cfix->dwFontSize.X; + data.params.info.font_height = cfix->dwFontSize.Y; + data.params.info.font_pitch_family = cfix->FontFamily; + data.params.info.font_weight = cfix->FontWeight; + + memcpy( data.face_name, cfix->FaceName, sizeof(cfix->FaceName) ); + data.face_name[ LF_FACESIZE - 1 ] = 0; + + return console_ioctl( hConsole, IOCTL_CONDRV_SET_OUTPUT_INFO, + &data, sizeof(data), NULL, 0, NULL ); +} + + /*********************************************************************** * ReadConsoleInputA (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 01135d6250a..91c4909e006 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,6 +1422,7 @@ @ stdcall SetConsoleTitleW(wstr) @ stdcall SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount +@ stdcall SetCurrentConsoleFontEx(long long ptr) @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) @ stdcall SetDefaultDllDirectories(long) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 4d2332a1ee9..605e6f2c2fe 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -148,6 +148,11 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +struct condrv_output_info_params_font { + struct condrv_output_info_params params; + WCHAR face_name[LF_FACESIZE]; +}; + #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 #define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 @@ -155,6 +160,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 #define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0080 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..456f3a4889e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1913,6 +1913,13 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + WCHAR *face_name = (WCHAR *)(params + 1); + + update_console_font( screen_buffer->console, face_name, + info->font_height, info->font_weight ); + } if (is_active( screen_buffer )) { @@ -2425,7 +2432,7 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return get_output_info( screen_buffer, out_size ); case IOCTL_CONDRV_SET_OUTPUT_INFO: - if (in_size != sizeof(struct condrv_output_info_params) || *out_size) return STATUS_INVALID_PARAMETER; + if (in_size < sizeof(struct condrv_output_info) || *out_size) return STATUS_INVALID_PARAMETER; return set_output_info( screen_buffer, in_data ); case IOCTL_CONDRV_FILL_OUTPUT: diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 5e9b999380c..88a26f70fd0 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -130,17 +130,21 @@ struct screen_buffer struct wine_rb_entry entry; /* map entry */ }; -BOOL init_window( struct console *console ); -void init_message_window( struct console *console ); -void update_window_region( struct console *console, const RECT *update ); -void update_window_config( struct console *console, BOOL delay ); - +/* conhost.c */ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); +/* window.c */ +void update_console_font( struct console *console, const WCHAR *font, + unsigned int height, unsigned int weight ); +BOOL init_window( struct console *console ); +void init_message_window( struct console *console ); +void update_window_region( struct console *console, const RECT *update ); +void update_window_config( struct console *console, BOOL delay ); + static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) { SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 7ad0d48effd..0d450774d23 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -705,6 +705,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->width = tm.tmAveCharWidth; font_info->height = tm.tmHeight + tm.tmExternalLeading; + font_info->pitch_family = tm.tmPitchAndFamily; font_info->weight = tm.tmWeight; free( font_info->face_name ); @@ -851,8 +852,8 @@ static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm /* sets logfont as the new font for the console */ -static void update_console_font( struct console *console, const WCHAR *font, - unsigned int height, unsigned int weight ) +void update_console_font( struct console *console, const WCHAR *font, + unsigned int height, unsigned int weight ) { struct font_chooser fc; LOGFONTW lf; -- 2.34.1

2 2

[PATCH] comctl32: Send EVENT_OBJECT_STATECHANGE when checking a checkbox
by Alex Henrie 08 Feb '22

08 Feb '22

The NVDA screen reader needs this. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/button.c | 1 + dlls/user32/tests/msg.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 88b48a4a5c0..faf0212b256 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -656,6 +656,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; } SendMessageW( hWnd, BM_SETSTATE, FALSE, 0 ); + NotifyWinEvent( EVENT_OBJECT_STATECHANGE, hWnd, OBJID_CLIENT, 0 ); GetClientRect( hWnd, &rect ); if (uMsg == WM_KEYUP || PtInRect( &rect, pt )) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f0e0d0fba76..cb8d4f07fe7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1774,7 +1774,7 @@ static const struct message WmModalDialogSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|parent }, { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|parent|wparam, 0 }, { HCBT_CREATEWND, hook }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Not sent on Win10. */ @@ -1829,7 +1829,7 @@ static const struct message WmModalDialogSeq[] = { { WM_ENTERIDLE, sent|parent|optional }, { WM_ENTERIDLE, sent|parent|optional }, { WM_TIMER, sent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|parent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, @@ -1860,14 +1860,14 @@ static const struct message WmModalDialogSeq_2[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent }, { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|wparam, 0 }, { HCBT_CREATEWND, hook }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_CHANGEUISTATE, sent|optional }, { WM_UPDATEUISTATE, sent|optional }, { WM_ENABLE, sent|wparam, 1 }, @@ -7297,24 +7297,24 @@ static const struct message auto_radio_button_VK_DOWN_dialog[] = { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO3 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, -- 2.35.1

3 6

[PATCH] wusa: Use case insensitive comparison for expressions.
by Mohamad Al-Jaf 08 Feb '22

08 Feb '22

Some update packages use both lowercase and uppercase names for expressions. For example, Microsoft-Windows-MediaFeaturePack-OOB-Package_x64.msu uses both Runtime and runtime for expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- programs/wusa/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index bcb795a80fa..db745edbe5a 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -480,10 +480,10 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke { WCHAR path[MAX_PATH]; - if (!wcscmp(key, L"runtime.system32")) + if (!wcsicmp(key, L"runtime.system32")) { #ifdef __x86_64__ - if (!wcscmp(assembly->identity.architecture, L"x86")) + if (!wcsicmp(assembly->identity.architecture, L"x86")) { GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); @@ -492,7 +492,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke GetSystemDirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); } - if (!wcscmp(key, L"runtime.windows")) + if (!wcsicmp(key, L"runtime.windows")) { GetWindowsDirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); -- 2.34.1

1 1

[PATCH 1/4] dpinst: New stub program.
by Zebediah Figura 08 Feb '22

08 Feb '22

This program is not shipped by Windows. Rather, it is a redistributable component shipped with some drivers, which appears to be a thin wrapper over the undocumented DriverStore* APIs exported from setupapi. Since the behaviour of this program is much easier to determine and implement, it seems much more worthwhile to do so despite not being an OS component. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42424 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- There is a snag, though, which is that Wine's default load order is "native,builtin" for the main EXE when loaded with an absolute path, as will pretty much always be the case for dpinst.exe. As such anyone who intends to install a package that requires it will need to manually set the program to prefer builtin. Ideally this wouldn't be necessary, but it's not clear to me how to avoid it: * Set *dpinst.exe to have a default override of builtin,native in the DllOverrides key? There's no precedent for this, though. * Introduce an analog of the --prefer-native switch? Seems excessive for something that would so rarely useful. configure.ac | 2 ++ loader/wine.inf.in | 1 + programs/dpinst/Makefile.in | 4 ++++ programs/dpinst/dpinst.c | 35 +++++++++++++++++++++++++++++++++++ programs/dpinst64/Makefile.in | 5 +++++ 5 files changed, 47 insertions(+) create mode 100644 programs/dpinst/Makefile.in create mode 100644 programs/dpinst/dpinst.c create mode 100644 programs/dpinst64/Makefile.in diff --git a/configure.ac b/configure.ac index e51e114c45e..33d2ba15ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -3547,6 +3547,8 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dpinst,,[test "x$enable_win64" = xyes]) +WINE_CONFIG_MAKEFILE(programs/dpinst64,enable_dpinst,[test "x$enable_win64" = xno]) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0e488d87dcb..4ad9dc09efd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2646,6 +2646,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,services.exe,- 11,,spoolsv.exe,- 11,,winemenubuilder.exe,- +11,,dpinst.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll diff --git a/programs/dpinst/Makefile.in b/programs/dpinst/Makefile.in new file mode 100644 index 00000000000..bd97b860ce7 --- /dev/null +++ b/programs/dpinst/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dpinst.exe +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = dpinst.c diff --git a/programs/dpinst/dpinst.c b/programs/dpinst/dpinst.c new file mode 100644 index 00000000000..52b4119760b --- /dev/null +++ b/programs/dpinst/dpinst.c @@ -0,0 +1,35 @@ +/* + * Driver Store installer replacement + * + * Copyright 2022 Zebediah Figura + * + * 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 + */ + +#include "windef.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpinst); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + for (i = 0; i < argc; i++) + FIXME(" %s", debugstr_w(argv[i])); + FIXME("\n"); + + return 0; +} diff --git a/programs/dpinst64/Makefile.in b/programs/dpinst64/Makefile.in new file mode 100644 index 00000000000..f79ed3e0dba --- /dev/null +++ b/programs/dpinst64/Makefile.in @@ -0,0 +1,5 @@ +MODULE = dpinst64.exe +EXTRADLLFLAGS = -mconsole -municode +PARENTSRC = ../dpinst + +C_SRCS = dpinst.c -- 2.34.1

1 3

[PATCH 1/5] qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Zebediah Figura 08 Feb '22

08 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qcap/avimux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fe4add83b7c..45b995cc2ff 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1177,9 +1177,12 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); - hr = BaseOutputPinImpl_InitAllocator(base, pAlloc); - if(FAILED(hr)) + if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc))) + { + ERR("Failed to create allocator, hr %#x.\n", hr); return hr; + } hr = IMemInputPin_GetAllocatorRequirements(pPin, &req); if(FAILED(hr)) -- 2.34.1

1 4

[PATCH vkd3d] vkd3d-shader/hlsl: Fix floating point literals matching.
by Nikolay Sivov 08 Feb '22

08 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Immediate issue was that constants like 1e1 were not parsed without a suffix. libs/vkd3d-shader/hlsl.l | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e9281ec..60aca79 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -188,11 +188,7 @@ row_major {return KW_ROW_MAJOR; } yylval->floatval = atof(yytext); return C_FLOAT; } -[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { - yylval->floatval = atof(yytext); - return C_FLOAT; - } -[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+(\.)?([eE][+-]?[0-9]+)?[h|H|f|F]? { yylval->floatval = atof(yytext); return C_FLOAT; } -- 2.34.1

2 2

[PATCH v2] user32/tests: Expect DialogBoxParam to set ERROR_CANNOT_FIND_WND_CLASS
by Alex Henrie 08 Feb '22

08 Feb '22

Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Avoid "misleading indentation" warning --- 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..f2bc30ff921 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 4/4] dmsynth/tests: Add some synth Open/Close tests
by Michael Stefaniuc 07 Feb '22

07 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 69 ++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 5f2e9e95364..93212c0ae9f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -65,6 +65,9 @@ static void test_dmsynth(void) ULONG value; ULONG bytes; DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + const DWORD all_params = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS|DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %#lx\n", hr); @@ -121,6 +124,72 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_Activate(dmsynth, TRUE); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %#lx\n", hr); + /* Open / Close */ + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == DMUS_E_ALREADYOPEN, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == S_OK, "Close failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == DMUS_E_ALREADYCLOSED, "Close failed: %#lx\n", hr); + memset(&params, 0, sizeof(params)); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == E_INVALIDARG, "Open failed: %#lx\n", hr); + params.dwSize = sizeof(DMUS_PORTPARAMS7); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + IDirectMusicSynth_Close(dmsynth); + /* All params supported and set to 0 */ + params.dwSize = sizeof(params); + params.dwValidParams = all_params; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + ok(params.dwSize == sizeof(params), "dwSize: %ld\n", params.dwSize); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 32, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 2, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 2, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 22050, "dwSampleRate: %ld\n", params.dwSampleRate); + ok(params.dwEffectFlags == DMUS_EFFECT_REVERB, "params.dwEffectFlags: %#lx\n", params.dwEffectFlags); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == 0, "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Requesting more than supported */ + params.dwValidParams = DMUS_PORTPARAMS_SAMPLERATE; + params.dwSampleRate = 100003; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwSampleRate == 96000, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Minimums */ + params.dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE; + params.dwVoices = 1; + params.dwChannelGroups = 1; + params.dwAudioChannels = 1; + params.dwSampleRate = 1; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 1, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Test share and features */ + params.dwValidParams = DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; + params.fShare = TRUE; + params.dwFeatures = DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == (DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING), + "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %#lx\n", hr); -- 2.34.1

1 0

[PATCH 3/4] dmsynth: Implement the synth's Open and Close methods
by Michael Stefaniuc 07 Feb '22

07 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +- dlls/dmsynth/dmsynth_private.h | 5 +- dlls/dmsynth/synth.c | 91 ++++++++++++++++++++++++++++++++-- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index cec89ca80aa..d09d0120023 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -286,7 +286,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; @@ -312,7 +312,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aabf1f56904..0058ce04d3a 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -56,14 +56,13 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void ** * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ IDirectMusicSynth8 IDirectMusicSynth8_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; BOOL active; + BOOL open; IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c69d7a340b1..2db80726408 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -94,21 +94,102 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, - DMUS_PORTPARAMS *pPortParams) +static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + BOOL modified = FALSE; + const DMUS_PORTPARAMS def = { + .dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS| + DMUS_PORTPARAMS_AUDIOCHANNELS|DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS| + DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES, + .dwSize = sizeof(def), .dwVoices = 32, .dwChannelGroups = 2, .dwAudioChannels = 2, + .dwSampleRate = 22050, .dwEffectFlags = DMUS_EFFECT_REVERB + }; + + TRACE("(%p, %p)\n", This, params); + + if (This->open) + return DMUS_E_ALREADYOPEN; + if (params && params->dwSize < sizeof(DMUS_PORTPARAMS7)) + return E_INVALIDARG; - FIXME("(%p)->(%p): stub\n", This, pPortParams); + This->open = TRUE; - return S_OK; + if (!params) { + memcpy(&This->params, &def, sizeof(This->params)); + return S_OK; + } + + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES && params->dwVoices) { + if (params->dwVoices > This->caps.dwMaxVoices) { + modified = TRUE; + params->dwVoices = This->caps.dwMaxVoices; + } + } else + params->dwVoices = def.dwVoices; + + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS && params->dwChannelGroups) { + if (params->dwChannelGroups > This->caps.dwMaxChannelGroups) { + modified = TRUE; + params->dwChannelGroups = This->caps.dwMaxChannelGroups; + } + } else + params->dwChannelGroups = def.dwChannelGroups; + + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS && params->dwAudioChannels) { + if (params->dwAudioChannels > This->caps.dwMaxAudioChannels) { + modified = TRUE; + params->dwAudioChannels = This->caps.dwMaxAudioChannels; + } + } else + params->dwAudioChannels = def.dwAudioChannels; + + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE && params->dwSampleRate) { + if (params->dwSampleRate > 96000) { + modified = TRUE; + params->dwSampleRate = 96000; + } else if (params->dwSampleRate < 11025) { + modified = TRUE; + params->dwSampleRate = 11025; + } + } else + params->dwSampleRate = def.dwSampleRate; + + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS && params->dwEffectFlags != def.dwEffectFlags) + modified = TRUE; + params->dwEffectFlags = def.dwEffectFlags; + + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE && params->fShare) + modified = TRUE; + params->fShare = FALSE; + + if (params->dwSize >= sizeof(params)) { + if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { + if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { + modified = TRUE; + params->dwFeatures &= DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + } + } else + params->dwFeatures = def.dwFeatures; + params->dwValidParams = def.dwValidParams; + } else + params->dwValidParams = def.dwValidParams & ~DMUS_PORTPARAMS_FEATURES; + + memcpy(&This->params, params, min(params->dwSize, sizeof(This->params))); + + return modified ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_Close(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)\n", This); + + if (!This->open) + return DMUS_E_ALREADYCLOSED; + + This->open = FALSE; return S_OK; } -- 2.34.1

1 0

[PATCH 2/4] dmime: The soft synth doesn't supports sharing the channel groups
by Michael Stefaniuc 07 Feb '22

07 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 554518c5d5b..58d16de234d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -643,9 +643,6 @@ static HRESULT perf_dmport_create(IDirectMusicPerformance8Impl *perf, DMUS_PORTP if (FAILED(hr = IDirectMusic8_GetDefaultPort(perf->dmusic, &guid))) return hr; - params->dwValidParams |= DMUS_PORTPARAMS_SHARE; - params->fShare = TRUE; - if (FAILED(hr = IDirectMusic8_CreatePort(perf->dmusic, &guid, params, &port, NULL))) return hr; if (FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) { -- 2.34.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel