wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Huw Davies : ole32: Implement cross-process drag and drop.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6d1ef3a6a64f0fabf05ce1bba5f0ec4373684786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1ef3a6a64f0fabf05ce1bba… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 13:37:19 2010 +0100 ole32: Implement cross-process drag and drop. --- dlls/ole32/ole2.c | 219 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 188 insertions(+), 31 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 41989f3..f570167 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -116,6 +116,10 @@ static const WCHAR prop_olemenuW[] = static const WCHAR prop_oledroptarget[] = {'O','l','e','D','r','o','p','T','a','r','g','e','t','I','n','t','e','r','f','a','c','e',0}; +/* property to store Marshalled IDropTarget pointer */ +static const WCHAR prop_marshalleddroptarget[] = + {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; + static const WCHAR clsidfmtW[] = {'C','L','S','I','D','\\','{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', @@ -266,14 +270,134 @@ HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) { return 0; } -/*** - * OLEDD_FindDropTarget() +/************************************************************* + * get_droptarget_handle + * + * Retrieve a handle to the map containing the marshalled IDropTarget. + * This handle belongs to the process that called RegisterDragDrop. + * See get_droptarget_local_handle(). + */ +static inline HANDLE get_droptarget_handle(HWND hwnd) +{ + return GetPropW(hwnd, prop_marshalleddroptarget); +} + +/************************************************************* + * is_droptarget + * + * Is the window a droptarget. + */ +static inline BOOL is_droptarget(HWND hwnd) +{ + return get_droptarget_handle(hwnd) ? TRUE : FALSE; +} + +/************************************************************* + * get_droptarget_local_handle + * + * Retrieve a handle to the map containing the marshalled IDropTarget. + * The handle should be closed when finished with. + */ +static HANDLE get_droptarget_local_handle(HWND hwnd) +{ + HANDLE handle, local_handle = 0; + + handle = get_droptarget_handle(hwnd); + + if(handle) + { + DWORD pid; + HANDLE process; + + GetWindowThreadProcessId(hwnd, &pid); + process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid); + if(process) + { + DuplicateHandle(process, handle, GetCurrentProcess(), &local_handle, 0, FALSE, DUPLICATE_SAME_ACCESS); + CloseHandle(process); + } + } + return local_handle; +} + +/*********************************************************************** + * create_map_from_stream + * + * Helper for RegisterDragDrop. Creates a file mapping object + * with the contents of the provided stream. The stream must + * be a global memory backed stream. + */ +static HRESULT create_map_from_stream(IStream *stream, HANDLE *map) +{ + HGLOBAL hmem; + DWORD size; + HRESULT hr; + void *data; + + hr = GetHGlobalFromStream(stream, &hmem); + if(FAILED(hr)) return hr; + + size = GlobalSize(hmem); + *map = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, NULL); + if(!*map) return E_OUTOFMEMORY; + + data = MapViewOfFile(*map, FILE_MAP_WRITE, 0, 0, size); + memcpy(data, GlobalLock(hmem), size); + GlobalUnlock(hmem); + UnmapViewOfFile(data); + return S_OK; +} + +/*********************************************************************** + * create_stream_from_map + * + * Creates a stream from the provided map. + */ +static HRESULT create_stream_from_map(HANDLE map, IStream **stream) +{ + HRESULT hr = E_OUTOFMEMORY; + HGLOBAL hmem; + void *data; + MEMORY_BASIC_INFORMATION info; + + data = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + if(!data) return hr; + + VirtualQuery(data, &info, sizeof(info)); + TRACE("size %d\n", (int)info.RegionSize); + + hmem = GlobalAlloc(GMEM_MOVEABLE, info.RegionSize); + if(hmem) + { + memcpy(GlobalLock(hmem), data, info.RegionSize); + GlobalUnlock(hmem); + hr = CreateStreamOnHGlobal(hmem, TRUE, stream); + } + UnmapViewOfFile(data); + return hr; +} + +/*********************************************************************** + * get_droptarget_pointer * - * Returns IDropTarget pointer registered for this window. + * Retrieves the marshalled IDropTarget from the window. */ -static inline IDropTarget* OLEDD_FindDropTarget(HWND hwnd) +static IDropTarget* get_droptarget_pointer(HWND hwnd) { - return GetPropW(hwnd, prop_oledroptarget); + IDropTarget *droptarget = NULL; + HANDLE map; + IStream *stream; + + map = get_droptarget_local_handle(hwnd); + if(!map) return NULL; + + if(SUCCEEDED(create_stream_from_map(map, &stream))) + { + CoUnmarshalInterface(stream, &IID_IDropTarget, (void**)&droptarget); + IStream_Release(stream); + } + CloseHandle(map); + return droptarget; } /*********************************************************************** @@ -282,6 +406,9 @@ static inline IDropTarget* OLEDD_FindDropTarget(HWND hwnd) HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) { DWORD pid = 0; + HRESULT hr; + IStream *stream; + HANDLE map; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -309,13 +436,40 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) } /* check if the window is already registered */ - if (OLEDD_FindDropTarget(hwnd)) + if (is_droptarget(hwnd)) return DRAGDROP_E_ALREADYREGISTERED; - IDropTarget_AddRef(pDropTarget); - SetPropW(hwnd, prop_oledroptarget, pDropTarget); + /* + * Marshal the drop target pointer into a shared memory map and + * store the map's handle in a Wine specific window prop. We also + * store the drop target pointer itself in the + * "OleDropTargetInterface" prop for compatibility with Windows. + */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hr)) return hr; - return S_OK; + hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)pDropTarget, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + if(SUCCEEDED(hr)) + { + hr = create_map_from_stream(stream, &map); + if(SUCCEEDED(hr)) + { + IDropTarget_AddRef(pDropTarget); + SetPropW(hwnd, prop_oledroptarget, pDropTarget); + SetPropW(hwnd, prop_marshalleddroptarget, map); + } + else + { + LARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(stream); + } + } + IStream_Release(stream); + + return hr; } /*********************************************************************** @@ -323,7 +477,10 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) */ HRESULT WINAPI RevokeDragDrop(HWND hwnd) { - IDropTarget* droptarget; + HANDLE map; + IStream *stream; + IDropTarget *drop_target; + HRESULT hr; TRACE("(%p)\n", hwnd); @@ -334,13 +491,24 @@ HRESULT WINAPI RevokeDragDrop(HWND hwnd) } /* no registration data */ - if (!(droptarget = OLEDD_FindDropTarget(hwnd))) + if (!(map = get_droptarget_handle(hwnd))) return DRAGDROP_E_NOTREGISTERED; - IDropTarget_Release(droptarget); + drop_target = GetPropW(hwnd, prop_oledroptarget); + if(drop_target) IDropTarget_Release(drop_target); + RemovePropW(hwnd, prop_oledroptarget); + RemovePropW(hwnd, prop_marshalleddroptarget); - return S_OK; + hr = create_stream_from_map(map, &stream); + if(SUCCEEDED(hr)) + { + CoReleaseMarshalData(stream); + IStream_Release(stream); + } + CloseHandle(map); + + return hr; } /*********************************************************************** @@ -1975,30 +2143,17 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) * Find-out if there is a drag target under the mouse */ HWND next_target_wnd = hwndNewTarget; - IDropTarget *new_target; - DWORD pid; trackerInfo->curTargetHWND = hwndNewTarget; - do { - new_target = OLEDD_FindDropTarget(next_target_wnd); - } while (!new_target && (next_target_wnd = GetParent(next_target_wnd))); + while (next_target_wnd && !is_droptarget(next_target_wnd)) + next_target_wnd = GetParent(next_target_wnd); if (next_target_wnd) hwndNewTarget = next_target_wnd; - GetWindowThreadProcessId(hwndNewTarget, &pid); - if (pid != GetCurrentProcessId()) - { - FIXME("drop to another process window is unsupported\n"); - trackerInfo->curDragTargetHWND = 0; - trackerInfo->curTargetHWND = 0; - trackerInfo->curDragTarget = 0; - } - else - { - trackerInfo->curDragTargetHWND = hwndNewTarget; - trackerInfo->curDragTarget = new_target; - } + trackerInfo->curDragTargetHWND = hwndNewTarget; + if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); + trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); /* * If there is, notify it that we just dragged-in @@ -2016,6 +2171,7 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) { trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; + IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0; } } @@ -2027,6 +2183,7 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) */ trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; + if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0; } }

1 0

Huw Davies : ole32/tests: Relax the reference counting tests a bit. We only care whether references are held or not.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: a2e1dd29dcbc98ee1d6417af10b84a9768f4c653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e1dd29dcbc98ee1d6417af1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:16:17 2010 +0100 ole32/tests: Relax the reference counting tests a bit. We only care whether references are held or not. --- dlls/ole32/tests/dragdrop.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 55a5167..18674dd 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -31,8 +31,7 @@ #include "wine/test.h" -static int droptarget_addref_called; -static int droptarget_release_called; +static int droptarget_refs; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -54,14 +53,14 @@ static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, static ULONG WINAPI DropTarget_AddRef(IDropTarget* iface) { - droptarget_addref_called++; - return 2; + droptarget_refs++; + return droptarget_refs; } static ULONG WINAPI DropTarget_Release(IDropTarget* iface) { - droptarget_release_called++; - return 1; + droptarget_refs--; + return droptarget_refs; } static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, @@ -314,10 +313,10 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop((HWND)0xdeadbeef, &DropTarget); ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); - ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); + ok(droptarget_refs == 0, "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RegisterDragDrop(hwnd, &DropTarget); ok_ole_success(hr, "RegisterDragDrop"); - ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); prop = GetPropA(hwnd, "OleDropTargetInterface"); ok(prop == &DropTarget, "expected IDropTarget pointer %p, got %p\n", &DropTarget, prop); @@ -325,15 +324,15 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_release_called == 1 || - broken(droptarget_release_called == 0), /* NT4 */ - "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);

1 0

Dylan Smith : wordpad: Allow objects & images to be added with native riched20.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d8a05c37d992d8b51d26fc100bd86d35bf0ef203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a05c37d992d8b51d26fc100… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 22 08:30:19 2010 -0400 wordpad: Allow objects & images to be added with native riched20. Native riched20.dll seems to need an IRichEditOleCallback object in order to get a buffer to store the image (using the GetNewStorage method). --- programs/wordpad/Makefile.in | 3 +- programs/wordpad/olecallback.c | 210 ++++++++++++++++++++++++++++++++++++++++ programs/wordpad/wordpad.c | 31 +------ programs/wordpad/wordpad.h | 6 + 4 files changed, 220 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8a05c37d992d8b51d26f…

1 0

Jacek Caban : shdocvw: Don' t fail on invalid headers argument in navigate_url.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ad759e793cf86dda7c8611c607911f8f3a53a9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad759e793cf86dda7c8611c60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 13:58:45 2010 +0200 shdocvw: Don't fail on invalid headers argument in navigate_url. --- dlls/shdocvw/navigate.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6f05cf2..6d73fd9 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -759,19 +759,12 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, Flags, Flags ? V_VT(Flags) : -1, TargetFrameName, TargetFrameName ? V_VT(TargetFrameName) : -1); - if(PostData) { - TRACE("PostData vt=%d\n", V_VT(PostData)); - - if(V_VT(PostData) == (VT_ARRAY | VT_UI1)) { - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; - } + if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1)) { + SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); + post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; } - if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) { - if(V_VT(Headers) != VT_BSTR) - return E_INVALIDARG; - + if(Headers && V_VT(Headers) == VT_BSTR) { headers = V_BSTR(Headers); TRACE("Headers: %s\n", debugstr_w(headers)); }

1 0

Piotr Caban : msvcrt: Fixed strtod_l/wcstod_l implementation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 9915dd03b432664c15ce4d1a1b8a019aee53c739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9915dd03b432664c15ce4d1a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 12:35:08 2010 +0200 msvcrt: Fixed strtod_l/wcstod_l implementation. --- dlls/msvcrt/string.c | 5 ++++- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8c99399..f44e6eb 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -169,6 +169,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca int exp=0, sign=1; const char *p; double ret; + BOOL found_digit = FALSE; if(!str) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -191,6 +192,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca p++; while(isdigit(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; @@ -207,6 +209,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca p++; while(isdigit(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; @@ -217,7 +220,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca while(isdigit(*p)) p++; - if(p == str) { + if(!found_digit) { if(end) *end = (char*)str; return 0.0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 55cb5e4..e2324b0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1096,6 +1096,7 @@ static void test__strtod(void) const char double4[] = ".21e12"; const char double5[] = "214353e-3"; const char overflow[] = "1d9999999999999999999"; + const char white_chars[] = " d10"; char *end; double d; @@ -1123,6 +1124,10 @@ static void test__strtod(void) d = strtod("12.1d2", NULL); ok(almost_equal(d, 12.1e2), "d = %lf\n", d); + d = strtod(white_chars, &end); + ok(almost_equal(d, 0), "d = %lf\n", d); + ok(end == white_chars, "incorrect end (%d)\n", (int)(end-white_chars)); + /* Set locale with non '.' decimal point (',') */ if(!setlocale(LC_ALL, "Polish")) { win_skip("system with limited locales\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 03ecc7f..529547b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -133,6 +133,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, int exp=0, sign=1; const MSVCRT_wchar_t *p; double ret; + BOOL found_digit = FALSE; if(!str) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -154,6 +155,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, p++; while(isdigitW(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; @@ -169,6 +171,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, p++; while(isdigitW(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; @@ -179,7 +182,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, while(isdigitW(*p)) p++; - if(p == str) { + if(!found_digit) { if(end) *end = (MSVCRT_wchar_t*)str; return 0.0;

1 0

Hans Leidekker : msi/tests: Fix some more wow64 test failures.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: c4bf9fb7101ced58409d053e83d78d15fb389877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bf9fb7101ced58409d053e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:49:28 2010 +0200 msi/tests: Fix some more wow64 test failures. --- dlls/msi/tests/automation.c | 69 +++++++--- dlls/msi/tests/install.c | 314 ++++++++++++++++++++++++++----------------- dlls/msi/tests/package.c | 66 ++++++--- 3 files changed, 286 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4bf9fb7101ced58409d0…

1 0

Hans Leidekker : msi/tests: Avoid a long timeout in the test for DeleteServices.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: c4511481db93aa7c96eb9f0f33ec40c5b3cde1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4511481db93aa7c96eb9f0f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:49:05 2010 +0200 msi/tests: Avoid a long timeout in the test for DeleteServices. --- dlls/msi/tests/install.c | 47 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 82542d0..c5e26f5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -382,21 +382,39 @@ static const CHAR sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArgu static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" + "LaunchConditions\t\t100\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" "ResolveSource\t\t950\n" - "MoveFiles\t\t1700\n" - "InstallFiles\t\t4000\n" - "DuplicateFiles\t\t4500\n" - "WriteEnvironmentStrings\t\t4550\n" - "CreateShortcuts\t\t4600\n" - "StartServices\t\t5000\n" - "DeleteServices\t\t5500\n" - "InstallFinalize\t\t6600\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" + "DeleteServices\t\t5000\n" + "MoveFiles\t\t5100\n" + "InstallFiles\t\t5200\n" + "DuplicateFiles\t\t5300\n" + "StartServices\t\t5400\n" + "InstallFinalize\t\t6000\n"; + +static const CHAR sds_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "ResolveSource\t\t950\n" + "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100\n"; + "InstallInitialize\t\t1500\n" + "DeleteServices\tInstalled\t5000\n" + "MoveFiles\t\t5100\n" + "InstallFiles\t\t5200\n" + "DuplicateFiles\t\t5300\n" + "InstallServices\tNOT Installed\t5400\n" + "RegisterProduct\t\t5500\n" + "PublishFeatures\t\t5600\n" + "PublishProduct\t\t5700\n" + "InstallFinalize\t\t6000\n"; /* tables for test_continuouscabs */ static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -2693,8 +2711,9 @@ static const msi_table sds_tables[] = ADD_TABLE(feature), ADD_TABLE(feature_comp), ADD_TABLE(file), - ADD_TABLE(sss_install_exec_seq), + ADD_TABLE(sds_install_exec_seq), ADD_TABLE(service_control), + ADD_TABLE(service_install), ADD_TABLE(media), ADD_TABLE(property) }; @@ -9081,6 +9100,12 @@ static void test_delete_services(void) { UINT r; + if (on_win9x) + { + win_skip("Services are not implemented on Win9x and WinMe\n"); + return; + } + create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table));

1 0

Hans Leidekker : msi/tests: Skip tests when the current user has insufficient rights.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 10a32a0b7afa93b0c457d1ac09518fa09a06ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a32a0b7afa93b0c457d1ac0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:48:28 2010 +0200 msi/tests: Skip tests when the current user has insufficient rights. --- dlls/msi/tests/automation.c | 14 ++- dlls/msi/tests/db.c | 24 ++- dlls/msi/tests/format.c | 51 ++++- dlls/msi/tests/install.c | 501 +++++++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/msi.c | 113 ++++++++++ dlls/msi/tests/package.c | 186 +++++++++++++++- 6 files changed, 851 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10a32a0b7afa93b0c457d…

1 0

Hans Leidekker : msi/tests: Return an error code from helper_createpackage and package_from_db.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: dad50e3aa08c881972e5513dffd074a0498e0773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad50e3aa08c881972e5513df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:48:10 2010 +0200 msi/tests: Return an error code from helper_createpackage and package_from_db. --- dlls/msi/tests/db.c | 24 +++++--- dlls/msi/tests/format.c | 65 ++++++++++----------- dlls/msi/tests/package.c | 142 +++++++++++++++++++++++---------------------- 3 files changed, 119 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dad50e3aa08c881972e55…

1 0

Hans Leidekker : msi/tests: Fix test failures on wow64.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 21d09ffb4363ae76b3762eb56299bea7765cbee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d09ffb4363ae76b3762eb56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:47:46 2010 +0200 msi/tests: Fix test failures on wow64. --- dlls/msi/tests/msi.c | 644 +++++++++++++++++++++++++++------------------- dlls/msi/tests/package.c | 28 ++- dlls/msi/tests/source.c | 207 +++++++++------ 3 files changed, 518 insertions(+), 361 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21d09ffb4363ae76b3762…

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
90
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 July 2010