wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Alexandre Julliard : ole32/tests: Avoid sizeof in traces.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: a456e641db520994509aa27fba5714979cdb93b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a456e641db520994509aa27fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 5 15:17:57 2010 +0100 ole32/tests: Avoid sizeof in traces. --- dlls/ole32/tests/hglobalstream.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 1fed237..5632b24 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -88,7 +88,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.LowPart = 0; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- invalid seek argument */ @@ -98,7 +98,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.LowPart = 123; hr = IStream_Seek(pStream, ll, STREAM_SEEK_END+1, &ull); ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); - ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should not have changed HighPart, got %d\n", ull.u.HighPart); /* IStream_Seek -- valid position argument (seek to beginning) */ @@ -133,7 +133,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.LowPart = 0; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- ignore HighPart in the move value (seek to beginning) */ @@ -163,7 +163,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.LowPart = 0x80000000; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); - ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- invalid LowPart value (seek to beginning) */ @@ -178,7 +178,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.LowPart = 0x80000000; hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); - ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- valid LowPart value (seek to beginning) */

1 0

Alasdair Sinclair : gdiplus: Create a full BITMAPINFO to prevent clobbering memory with palette data.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 0ecd8daa16e4aa3df157a1175c611cdffc66d6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecd8daa16e4aa3df157a1175… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Fri Mar 5 02:21:19 2010 +0000 gdiplus: Create a full BITMAPINFO to prevent clobbering memory with palette data. --- dlls/gdiplus/image.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bb2f7ff..d72d4cf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1614,7 +1614,7 @@ static GpStatus get_screen_resolution(REAL *xres, REAL *yres) GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { - BITMAPINFOHEADER bmih; + BITMAPINFO* pbmi; HBITMAP hbitmap; INT row_size, dib_stride; HDC hdc; @@ -1644,26 +1644,33 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if(stride == 0) stride = dib_stride; - bmih.biSize = sizeof(BITMAPINFOHEADER); - bmih.biWidth = width; - bmih.biHeight = -height; - bmih.biPlanes = 1; + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!pbmi) + return OutOfMemory; + + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = width; + pbmi->bmiHeader.biHeight = -height; + pbmi->bmiHeader.biPlanes = 1; /* FIXME: use the rest of the data from format */ - bmih.biBitCount = PIXELFORMATBPP(format); - bmih.biCompression = BI_RGB; - bmih.biSizeImage = 0; - bmih.biXPelsPerMeter = 0; - bmih.biYPelsPerMeter = 0; - bmih.biClrUsed = 0; - bmih.biClrImportant = 0; + pbmi->bmiHeader.biBitCount = PIXELFORMATBPP(format); + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; hdc = CreateCompatibleDC(NULL); - if (!hdc) return GenericError; + if (!hdc) { + GdipFree(pbmi); + return GenericError; + } - hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, (void**)&bits, - NULL, 0); + hbitmap = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); DeleteDC(hdc); + GdipFree(pbmi); if (!hbitmap) return GenericError;

1 0

Henri Verbeet : server: Allow the debugger to be debugged.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 1970fb35d40240448a311cf2fcd371c9d61300cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1970fb35d40240448a311cf2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 5 12:28:12 2010 +0100 server: Allow the debugger to be debugged. --- dlls/kernel32/tests/debugger.c | 114 ++++++++++++++++++++++++++++++++++++++++ server/debugger.c | 6 -- 2 files changed, 114 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 9acea22..d37217a 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -22,6 +22,7 @@ #include <assert.h> #include <windows.h> +#include <winternl.h> #include <winreg.h> #include "wine/test.h" @@ -29,6 +30,14 @@ #define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) #endif +#ifdef __GNUC__ +#define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define PRINTF_ATTR(fmt,args) +#endif + +#define child_ok (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_child_ok + static int myARGC; static char** myARGV; @@ -36,6 +45,18 @@ static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); +static LONG child_failures; + +static void PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) +{ + va_list valist; + + va_start(valist, msg); + winetest_vok(condition, msg, valist); + va_end(valist); + if (!condition) ++child_failures; +} + /* Copied from the process test */ static void get_file_name(char* buf) { @@ -466,6 +487,94 @@ static void test_RemoteDebugger(void) "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); } +struct child_blackbox +{ + LONG failures; +}; + +static void doChild(int argc, char **argv) +{ + struct child_blackbox blackbox; + const char *blackbox_file; + HANDLE parent; + DWORD ppid; + BOOL ret; + + blackbox_file = argv[4]; + sscanf(argv[3], "%08x", &ppid); + + parent = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, ppid); + child_ok(!!parent, "OpenProcess failed, last error %#x.\n", GetLastError()); + + ret = DebugActiveProcess(ppid); + child_ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); + + ret = pDebugActiveProcessStop(ppid); + child_ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError()); + + ret = CloseHandle(parent); + child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + + blackbox.failures = child_failures; + save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); +} + +static void test_debug_loop(int argc, char **argv) +{ + const char *arguments = " debugger child "; + struct child_blackbox blackbox; + char blackbox_file[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DWORD pid; + char *cmd; + BOOL ret; + + if (!pDebugActiveProcessStop) + { + win_skip("DebugActiveProcessStop not available, skipping test.\n"); + return; + } + + pid = GetCurrentProcessId(); + get_file_name(blackbox_file); + cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv[0]) + strlen(arguments) + strlen(blackbox_file) + 10); + sprintf(cmd, "%s%s%08x %s", argv[0], arguments, pid, blackbox_file); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, cmd); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + + if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + } + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + + load_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); + ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures); + + ret = DeleteFileA(blackbox_file); + ok(ret, "DeleteFileA failed, last error %#x.\n", GetLastError()); +} + START_TEST(debugger) { HMODULE hdll; @@ -484,9 +593,14 @@ START_TEST(debugger) { doDebugger(myARGC, myARGV); } + else if (myARGC >= 5 && !strcmp(myARGV[2], "child")) + { + doChild(myARGC, myARGV); + } else { test_ExitCode(); test_RemoteDebugger(); + test_debug_loop(myARGC, myARGV); } } diff --git a/server/debugger.c b/server/debugger.c index 795a24a..727f3be 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -420,16 +420,10 @@ void generate_debug_event( struct thread *thread, int code, const void *arg ) /* attach a process to a debugger thread and suspend it */ static int debugger_attach( struct process *process, struct thread *debugger ) { - struct thread *thread; - if (process->debugger) goto error; /* already being debugged */ if (!is_process_init_done( process )) goto error; /* still starting up */ if (list_empty( &process->thread_list )) goto error; /* no thread running in the process */ - /* make sure we don't create a debugging loop */ - for (thread = debugger; thread; thread = thread->process->debugger) - if (thread->process == process) goto error; - /* don't let a debugger debug its console... won't work */ if (debugger->process->console && console_get_renderer(debugger->process->console)->process == process) goto error;

1 0

Louis Lenders : activeds: Add stub for ADsGetLastError.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 3bad522f578ae72aa8ed5ed65c4ce068a6ffee05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bad522f578ae72aa8ed5ed65… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Mar 5 12:00:37 2010 +0100 activeds: Add stub for ADsGetLastError. --- dlls/activeds/activeds.spec | 2 +- dlls/activeds/activeds_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/activeds/activeds.spec b/dlls/activeds/activeds.spec index 63625d5..2b45834 100644 --- a/dlls/activeds/activeds.spec +++ b/dlls/activeds/activeds.spec @@ -6,7 +6,7 @@ 8 stub ADsBuildVarArrayInt 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) 12 stub ADsSetLastError -13 stub ADsGetLastError +13 stdcall ADsGetLastError(ptr ptr long ptr long) 14 stub AllocADsMem 15 stdcall FreeADsMem(ptr) 16 stub ReallocADsMem diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 9c03ac1..2fa4ec7 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -95,6 +95,15 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR } /***************************************************** + * ADsGetLastError [ACTIVEDS.13] + */ +HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) +{ + FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); + return E_NOTIMPL; +} + +/***************************************************** * FreeADsMem [ACTIVEDS.15] */ BOOL WINAPI FreeADsMem(LPVOID pMem)

1 0

Hans Leidekker : winhttp: Implement WINHTTP_QUERY_STATUS_TEXT.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: bcc4040dcff2064c7c83ab0ced081c0469f611f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc4040dcff2064c7c83ab0ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:29:49 2010 +0100 winhttp: Implement WINHTTP_QUERY_STATUS_TEXT. --- dlls/winhttp/request.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 65d9e55..f2c48a8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -670,6 +670,24 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID *buflen = len - sizeof(WCHAR); return ret; } + case WINHTTP_QUERY_STATUS_TEXT: + { + DWORD len = (strlenW( request->status_text ) + 1) * sizeof(WCHAR); + if (len > *buflen) + { + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + *buflen = len; + return FALSE; + } + else if (buffer) + { + strcpyW( buffer, request->status_text ); + TRACE("returning string: %s\n", debugstr_w(buffer)); + ret = TRUE; + } + *buflen = len - sizeof(WCHAR); + return ret; + } default: { if (attr >= sizeof(attribute_table)/sizeof(attribute_table[0]) || !attribute_table[attr])

1 0

Hans Leidekker : msi: Also update the UI when removing files listed in the RemoveFiles table.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 73d316c58d6bcff48db33498131a543a194fd510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d316c58d6bcff48db334981… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:29:17 2010 +0100 msi: Also update the UI when removing files listed in the RemoveFiles table. --- dlls/msi/files.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7ccb2c7..4050163 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -912,6 +912,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + MSIRECORD *uirow; LPCWSTR component, filename, dirprop; UINT install_mode; LPWSTR dir = NULL, path = NULL; @@ -966,6 +967,12 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) } done: + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString(row, 1) ); + MSI_RecordSetStringW( uirow, 9, dir ); + ui_actiondata( package, szRemoveFiles, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(path); msi_free(dir); return ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Update the UI in the RegisterUser action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: ab9a1813264f342f9488d0bb3ffc9148603d4ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9a1813264f342f9488d0bb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:28:34 2010 +0100 msi: Update the UI in the RegisterUser action. --- dlls/msi/action.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 46e28d9..15730f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4782,10 +4782,10 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) static UINT ACTION_RegisterUser(MSIPACKAGE *package) { - HKEY hkey=0; - LPWSTR buffer; - LPWSTR productid; - UINT rc,i; + HKEY hkey = 0; + LPWSTR buffer, productid = NULL; + UINT i, rc = ERROR_SUCCESS; + MSIRECORD *uirow; static const WCHAR szPropKeys[][80] = { @@ -4806,12 +4806,12 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) if (msi_check_unpublish(package)) { MSIREG_DeleteUserDataProductKey(package->ProductCode); - return ERROR_SUCCESS; + goto end; } productid = msi_dup_property( package, INSTALLPROPERTY_PRODUCTIDW ); if (!productid) - return ERROR_SUCCESS; + goto end; rc = MSIREG_OpenInstallProps(package->ProductCode, package->Context, NULL, &hkey, TRUE); @@ -4826,11 +4826,13 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) } end: + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, productid ); + ui_actiondata( package, szRegisterUser, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(productid); RegCloseKey(hkey); - - /* FIXME: call ui_actiondata */ - return rc; }

1 0

Hans Leidekker : msi: Update the UI in the RegisterProduct action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 4341f18c7e281eb41798a46e6a1367dd2aeebafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4341f18c7e281eb41798a46e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:28:11 2010 +0100 msi: Update the UI in the RegisterProduct action. --- dlls/msi/action.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d3b3127..46e28d9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4531,6 +4531,7 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) static UINT ACTION_RegisterProduct(MSIPACKAGE *package) { WCHAR squashed_pc[SQUISH_GUID_SIZE]; + MSIRECORD *uirow; LPWSTR upgrade_code; HKEY hkey, props; HKEY upgrade; @@ -4575,8 +4576,12 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) } done: - RegCloseKey(hkey); + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, package->ProductCode ); + ui_actiondata( package, szRegisterProduct, uirow ); + msiobj_release( &uirow->hdr ); + RegCloseKey(hkey); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Display the product code in the PublishProduct action .
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: c547fb36294da0992b692a1550bedcde8c1d2def URL: http://source.winehq.org/git/wine.git/?a=commit;h=c547fb36294da0992b692a155… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:27:49 2010 +0100 msi: Display the product code in the PublishProduct action. --- dlls/msi/action.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8f55e13..d3b3127 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3469,7 +3469,6 @@ static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) CHAR buffer[1024]; DWORD sz; UINT rc; - MSIRECORD *uirow; FileName = MSI_RecordGetString(row,1); if (!FileName) @@ -3508,14 +3507,8 @@ static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) } while (sz == 1024); msi_free(FilePath); - CloseHandle(the_file); - uirow = MSI_CreateRecord(1); - MSI_RecordSetStringW(uirow,1,FileName); - ui_actiondata(package,szPublishProduct,uirow); - msiobj_release( &uirow->hdr ); - return ERROR_SUCCESS; } @@ -3777,8 +3770,8 @@ done: static UINT ACTION_PublishProduct(MSIPACKAGE *package) { UINT rc; - HKEY hukey=0; - HKEY hudkey=0; + HKEY hukey = NULL, hudkey = NULL; + MSIRECORD *uirow; /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_check_publish(package)) @@ -3816,6 +3809,11 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = msi_publish_icons(package); end: + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, package->ProductCode ); + ui_actiondata( package, szPublishProduct, uirow ); + msiobj_release( &uirow->hdr ); + RegCloseKey(hukey); RegCloseKey(hudkey);

1 0

Hans Leidekker : msi: Update the UI in the MsiPublishAssemblies action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: e90fbf09c737738ce35b4d648c18224bd6334034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90fbf09c737738ce35b4d648… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:27:31 2010 +0100 msi: Update the UI in the MsiPublishAssemblies action. --- dlls/msi/action.c | 98 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 42 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 276250f..8f55e13 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6272,6 +6272,7 @@ typedef struct tagMSIASSEMBLY MSIFILE *file; LPWSTR manifest; LPWSTR application; + LPWSTR display_name; DWORD attributes; BOOL installed; } MSIASSEMBLY; @@ -6322,11 +6323,17 @@ static UINT install_assembly(MSIPACKAGE *package, MSIASSEMBLY *assembly, LPWSTR path) { IAssemblyCache *cache; + MSIRECORD *uirow; HRESULT hr; UINT r = ERROR_FUNCTION_FAILED; TRACE("installing assembly: %s\n", debugstr_w(path)); + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 2, assembly->display_name ); + ui_actiondata( package, szMsiPublishAssemblies, uirow ); + msiobj_release( &uirow->hdr ); + if (assembly->feature) msi_feature_set_state(package, assembly->feature, INSTALLSTATE_LOCAL); @@ -6416,81 +6423,87 @@ static void append_str(LPWSTR *str, DWORD *size, LPCWSTR append) lstrcatW(*str, append); } -static BOOL check_assembly_installed(MSIDATABASE *db, IAssemblyCache *cache, - MSICOMPONENT *comp) +static WCHAR *get_assembly_display_name( MSIDATABASE *db, MSICOMPONENT *comp ) { - ASSEMBLY_INFO asminfo; - ASSEMBLY_NAME name; - MSIQUERY *view; - LPWSTR disp; - DWORD size; - BOOL found; - UINT r; - static const WCHAR separator[] = {',',' ',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n','=',0}; static const WCHAR Culture[] = {'C','u','l','t','u','r','e','=',0}; - static const WCHAR PublicKeyToken[] = { - 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=',0}; + static const WCHAR PublicKeyToken[] = {'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=',0}; static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','M','s','i','A','s','s','e','m','b','l','y','N','a','m','e','`',' ', 'W','H','E','R','E',' ','`','C','o','m','p','o','n','e','n','t','_','`', '=','\'','%','s','\'',0}; + ASSEMBLY_NAME name; + MSIQUERY *view; + LPWSTR display_name; + DWORD size; + UINT r; - disp = NULL; - found = FALSE; - ZeroMemory(&name, sizeof(ASSEMBLY_NAME)); - ZeroMemory(&asminfo, sizeof(ASSEMBLY_INFO)); + display_name = NULL; + memset( &name, 0, sizeof(ASSEMBLY_NAME) ); - r = MSI_OpenQuery(db, &view, query, comp->Component); + r = MSI_OpenQuery( db, &view, query, comp->Component ); if (r != ERROR_SUCCESS) - return ERROR_SUCCESS; + return NULL; - MSI_IterateRecords(view, NULL, parse_assembly_name, &name); - msiobj_release(&view->hdr); + MSI_IterateRecords( view, NULL, parse_assembly_name, &name ); + msiobj_release( &view->hdr ); if (!name.name) { ERR("No assembly name specified!\n"); - goto done; + return NULL; } - append_str(&disp, &size, name.name); + append_str( &display_name, &size, name.name ); if (name.version) { - append_str(&disp, &size, separator); - append_str(&disp, &size, Version); - append_str(&disp, &size, name.version); + append_str( &display_name, &size, separator ); + append_str( &display_name, &size, Version ); + append_str( &display_name, &size, name.version ); } - if (name.culture) { - append_str(&disp, &size, separator); - append_str(&disp, &size, Culture); - append_str(&disp, &size, name.culture); + append_str( &display_name, &size, separator ); + append_str( &display_name, &size, Culture ); + append_str( &display_name, &size, name.culture ); } - if (name.pubkeytoken) { - append_str(&disp, &size, separator); - append_str(&disp, &size, PublicKeyToken); - append_str(&disp, &size, name.pubkeytoken); + append_str( &display_name, &size, separator ); + append_str( &display_name, &size, PublicKeyToken ); + append_str( &display_name, &size, name.pubkeytoken ); } + msi_free( name.name ); + msi_free( name.version ); + msi_free( name.culture ); + msi_free( name.pubkeytoken ); + + return display_name; +} + +static BOOL check_assembly_installed( MSIDATABASE *db, IAssemblyCache *cache, MSICOMPONENT *comp ) +{ + ASSEMBLY_INFO asminfo; + LPWSTR disp; + BOOL found = FALSE; + HRESULT hr; + + disp = get_assembly_display_name( db, comp ); + if (!disp) + return FALSE; + + memset( &asminfo, 0, sizeof(ASSEMBLY_INFO) ); asminfo.cbAssemblyInfo = sizeof(ASSEMBLY_INFO); - IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, - disp, &asminfo); - found = (asminfo.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); -done: - msi_free(disp); - msi_free(name.name); - msi_free(name.version); - msi_free(name.culture); - msi_free(name.pubkeytoken); + hr = IAssemblyCache_QueryAssemblyInfo( cache, QUERYASMINFO_FLAG_VALIDATE, disp, &asminfo ); + if (SUCCEEDED(hr)) + found = (asminfo.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); + msi_free( disp ); return found; } @@ -6596,6 +6609,7 @@ static void free_assemblies(struct list *assemblies) list_remove(&assembly->entry); msi_free(assembly->application); msi_free(assembly->manifest); + msi_free(assembly->display_name); msi_free(assembly); } }

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
92
Older →

Jump to page:

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-commits March 2010