Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/prntvpt/ticket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 132a117a249..13aaf80423f 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -740,7 +740,7 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre if (hr != S_OK) return hr;
*dm = heap_alloc(sizeof(**dm)); - if (!dm) return E_OUTOFMEMORY; + if (!*dm) return E_OUTOFMEMORY;
ticket_to_devmode(&ticket, *dm); *size = sizeof(**dm);
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/ntoskrnl.exe/tests/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d3f62879a40..7a325753d48 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1614,7 +1614,7 @@ static void test_completion(void) IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); ret = IoCallDriver(upper_device, irp); ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); - ok(got_completion == 2, "got %u calls to completion routine\n"); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); }
static void test_IoAttachDeviceToDeviceStack(void)
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f055547a6b9..4edda854b58 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2116,9 +2116,9 @@ static WCHAR *get_diskdrive_serialnumber( WCHAR letter ) heap_free( desc ); break; } + size = desc->Size; heap_free( desc ); - if (GetLastError() == ERROR_MORE_DATA) size = desc->Size; - else break; + if (GetLastError() != ERROR_MORE_DATA) break; }
done:
Signed-off-by: Hans Leidekker hans@codeweavers.com
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/sechost/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 68d2b9e78e6..5beff41a164 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1031,7 +1031,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceA( SC_HANDLE service, DWORD argc, cons
for (i = 0; i < argc; i++) heap_free( argvW[i] ); - heap_free( argv ); + heap_free( argvW ); return r; }
Signed-off-by: Sven Baars sbaars@codeweavers.com --- dlls/msi/table.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 612a3695973..e9d6e8804e7 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2887,6 +2887,7 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV colinfo[idx - 1].colname = msi_string_lookup( st, name_id, NULL ); else ERR( "column name %s is not defined in strings table\n", wine_dbgstr_w(name) ); + msiobj_release( &rec->hdr ); } MSI_ViewClose( q ); msiobj_release( &q->hdr );
Signed-off-by: Hans Leidekker hans@codeweavers.com