wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Rico Schüller : d3dcompiler: Parse OSG5 in the reflection interface.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 19fea20963ba0020bea8ba32431edb50897555f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fea20963ba0020bea8ba324… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 6 21:56:35 2011 +0100 d3dcompiler: Parse OSG5 in the reflection interface. --- dlls/d3dcompiler_43/reflection.c | 55 ++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4b0467a..96adb04 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE +{ + D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6 = 6, + D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, +}; + static BOOL copy_name(const char *ptr, char **name) { size_t name_len; @@ -538,15 +544,34 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c return S_OK; } -HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, const char *data, DWORD data_size) +HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section) { D3D11_SIGNATURE_PARAMETER_DESC *d; unsigned int string_data_offset; unsigned int string_data_size; - const char *ptr = data; + const char *ptr = section->data; char *string_data; unsigned int i; DWORD count; + enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE element_size; + + switch (section->tag) + { + case TAG_OSG5: + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7; + break; + + case TAG_ISGN: + case TAG_OSGN: + case TAG_PCSG: + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; + break; + + default: + FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; + break; + } read_dword(&ptr, &count); TRACE("%u elements\n", count); @@ -560,9 +585,10 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons return E_OUTOFMEMORY; } - /* 2 DWORDs for the header, 6 for each element. */ - string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); - string_data_size = data_size - string_data_offset; + /* 2 DWORDs for the header, element_size for each element. */ + string_data_offset = 2 * sizeof(DWORD) + count * element_size * sizeof(DWORD); + string_data_size = section->data_size - string_data_offset; + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); if (!string_data) { @@ -570,15 +596,21 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons HeapFree(GetProcessHeap(), 0, d); return E_OUTOFMEMORY; } - memcpy(string_data, data + string_data_offset, string_data_size); + memcpy(string_data, section->data + string_data_offset, string_data_size); for (i = 0; i < count; ++i) { UINT name_offset; DWORD mask; - /* todo: Parse stream in shaderblobs v5 (dx11) */ - d[i].Stream = 0; + if (element_size == D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7) + { + read_dword(&ptr, &d[i].Stream); + } + else + { + d[i].Stream = 0; + } read_dword(&ptr, &name_offset); d[i].SemanticName = string_data + (name_offset - string_data_offset); @@ -675,7 +707,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->isgn, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->isgn, section); if (FAILED(hr)) { WARN("Failed to parse section ISGN.\n"); @@ -683,6 +715,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_OSG5: case TAG_OSGN: reflection->osgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->osgn)); if (!reflection->osgn) @@ -692,7 +725,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->osgn, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->osgn, section); if (FAILED(hr)) { WARN("Failed to parse section OSGN.\n"); @@ -709,7 +742,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->pcsg, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->pcsg, section); if (FAILED(hr)) { WARN("Failed to parse section PCSG.\n");

1 0

André Hentschel : oleaut32/tests: Add more safearray tests.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 1a37f6e9405c0fe97d59847f8fcd7cda619276b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a37f6e9405c0fe97d59847f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 7 20:44:43 2011 +0100 oleaut32/tests: Add more safearray tests. --- dlls/oleaut32/tests/safearray.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 97ba9dd..849bd01 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1590,13 +1590,30 @@ static void test_SafeArrayCopy(void) hres = SafeArrayAllocDescriptor(1, &sa); ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + sa->cbElements = 16; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(sa != sa2, "SafeArrayCopy performed shallow copy\n"); + + hres = SafeArrayDestroy(sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + sa2 = (void*)0xdeadbeef; + hres = SafeArrayCopy(NULL, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(!sa2, "SafeArrayCopy didn't return NULL for output array\n"); + + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + + sa2 = (void*)0xdeadbeef; hres = SafeArrayCopy(sa, &sa2); ok(hres == E_INVALIDARG, "SafeArrayCopy with empty array should have failed with error E_INVALIDARG instead of 0x%08x\n", hres); - sa->cbElements = 16; - hres = SafeArrayCopy(sa, &sa2); - ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(!sa2, "SafeArrayCopy didn't return NULL for output array\n"); hres = SafeArrayDestroy(sa2); ok(hres == S_OK, "got 0x%08x\n", hres);

1 0

André Hentschel : netapi32: Add stub implementation for NetServerDiskEnum.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: ae3e768a2e1f9c21b355798c8fbf473db3d83434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3e768a2e1f9c21b355798c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 6 19:42:36 2011 +0100 netapi32: Add stub implementation for NetServerDiskEnum. --- dlls/netapi32/netapi32.c | 18 ++++++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index fb4468f..fafce6b 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -95,6 +95,24 @@ NET_API_STATUS WINAPI NetServerEnumEx( } /************************************************************ + * NetServerDiskEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetServerDiskEnum( + LMCSTR ServerName, + DWORD Level, + LPBYTE *Bufptr, + DWORD PrefMaxlen, + LPDWORD EntriesRead, + LPDWORD totalentries, + LPDWORD Resume_Handle) +{ + FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(ServerName), + Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, Resume_Handle); + + return ERROR_NO_BROWSER_SERVERS_FOUND; +} + +/************************************************************ * NetServerGetInfo (NETAPI32.@) */ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 78bf22d..7905504 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -172,7 +172,7 @@ @ stub NetScheduleJobGetInfo @ stub NetServerComputerNameAdd @ stub NetServerComputerNameDel -@ stub NetServerDiskEnum +@ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetServerEnum(wstr long ptr long ptr ptr long wstr ptr) @ stdcall NetServerEnumEx(wstr long ptr long ptr ptr long wstr wstr) @ stdcall NetServerGetInfo(wstr long ptr)

1 0

André Hentschel : netapi32: Add stub implementation for NetUseDel.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 01ae887ebe1294f8e937f0fc2618ed661c1cee84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ae887ebe1294f8e937f0fc2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 6 19:39:33 2011 +0100 netapi32: Add stub implementation for NetUseDel. --- dlls/netapi32/access.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 7170259..91f98b1 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -908,3 +908,9 @@ NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LP FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); return NERR_Success; } + +NET_API_STATUS WINAPI NetUseDel(LMSTR servername, LMSTR usename, DWORD forcecond) +{ + FIXME("%s %s %d stub\n", debugstr_w(servername), debugstr_w(usename), forcecond); + return NERR_Success; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 6470280..78bf22d 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -198,7 +198,7 @@ @ stub NetShareSetInfo @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stdcall NetUseAdd(wstr long ptr ptr) -@ stub NetUseDel +@ stdcall NetUseDel(wstr wstr long) @ stdcall NetUseEnum(wstr long ptr long ptr ptr ptr) @ stub NetUseGetInfo @ stdcall NetUserAdd(wstr long ptr ptr)

1 0

Alexander Kochetkov : comctl32: Fixed height of comboboxex32.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: d668e76461dabd4504fade2efa28874724801b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d668e76461dabd4504fade2ef… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Sun Feb 6 19:41:30 2011 +0300 comctl32: Fixed height of comboboxex32. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/tests/comboex.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index e516ea8..10d8b87 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1693,7 +1693,7 @@ static LRESULT COMBOEX_WindowPosChanging (const COMBOEX_INFO *infoPtr, WINDOWPOS height = (cb_wrect.bottom-cb_wrect.top) + (cbx_wrect.bottom-cbx_wrect.top) - (cbx_crect.bottom-cbx_crect.top); - if (wp->cy < height) wp->cy = height; + wp->cy = height; if (infoPtr->hwndEdit) { COMBOEX_AdjustEditPos (infoPtr); InvalidateRect (infoPtr->hwndCombo, 0, TRUE); diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index a747500..ca30482 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -380,6 +380,53 @@ static void test_CB_GETLBTEXT(void) DestroyWindow(hCombo); } +static void test_WM_WINDOWPOSCHANGING(void) +{ + HWND hCombo; + WINDOWPOS wp; + RECT rect; + int combo_height; + int ret; + + hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + ok(hCombo != NULL, "createComboEx failed\n"); + ret = GetWindowRect(hCombo, &rect); + ok(ret, "GetWindowRect failed\n"); + combo_height = rect.bottom - rect.top; + ok(combo_height > 0, "wrong combo height\n"); + + /* Test height > combo_height */ + wp.x = rect.left; + wp.y = rect.top; + wp.cx = (rect.right - rect.left); + wp.cy = combo_height * 2; + wp.flags = 0; + wp.hwnd = hCombo; + wp.hwndInsertAfter = NULL; + + ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); + ok(ret == 0, "expected 0, got %x", ret); + ok(wp.cy == combo_height, + "Expected height %d, got %d\n", combo_height, wp.cy); + + /* Test height < combo_height */ + wp.x = rect.left; + wp.y = rect.top; + wp.cx = (rect.right - rect.left); + wp.cy = combo_height / 2; + wp.flags = 0; + wp.hwnd = hCombo; + wp.hwndInsertAfter = NULL; + + ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); + ok(ret == 0, "expected 0, got %x", ret); + ok(wp.cy == combo_height, + "Expected height %d, got %d\n", combo_height, wp.cy); + + ret = DestroyWindow(hCombo); + ok(ret, "DestroyWindow failed\n"); +} + static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -528,6 +575,7 @@ START_TEST(comboex) test_comboboxex(); test_WM_LBUTTONDOWN(); test_CB_GETLBTEXT(); + test_WM_WINDOWPOSCHANGING(); test_comboboxex_subclass(); test_get_set_item();

1 0

Matteo Bruni : d3dcompiler: Include the string terminator in the output blob.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: dbc8c9c299ebc0cd8a93c7e0fb2d5dd2922d6eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc8c9c299ebc0cd8a93c7e0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 4 16:41:42 2011 +0100 d3dcompiler: Include the string terminator in the output blob. --- dlls/d3dcompiler_43/compiler.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ca48611..42ad09b 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -306,6 +306,7 @@ static int wpp_close_output(void) if(!new_wpp_output) return 0; wpp_output = new_wpp_output; wpp_output[wpp_output_size]='\0'; + wpp_output_size++; return 1; }

1 0

Joris Huizer : shdocvw: Initialise ie pointer as it's tested (Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: e88caf015ee3a1d669f63e5f5337be5f7f2a09d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88caf015ee3a1d669f63e5f5… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Feb 5 14:37:40 2011 +0100 shdocvw: Initialise ie pointer as it's tested (Clang). --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index f8d74ac..9d8668e 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -868,7 +868,7 @@ static BOOL create_ie_window(LPCSTR cmdline) static ULONG open_dde_url(WCHAR *dde_url) { - InternetExplorer *ie, *iter; + InternetExplorer *ie = NULL, *iter; WCHAR *url, *url_end; VARIANT urlv; HRESULT hres;

1 0

Francois Gouget : comctl32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: fc55c4a2d5d5a2ed9bc557c48e5913d73ffd7810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc55c4a2d5d5a2ed9bc557c48… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 7 12:30:37 2011 +0100 comctl32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5ef277c..653807f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1425,14 +1425,14 @@ static void test_htreeitem_layout(void) ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; - ins.item.mask = 0; + U(ins).item.mask = 0; item1 = TreeView_InsertItem(hTree, &ins); check_item(item1, hChild, 0, 0); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; - ins.item.mask = 0; + U(ins).item.mask = 0; item2 = TreeView_InsertItem(hTree, &ins); check_item(item2, hRoot, hChild, 0);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put_borderRightColor.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 26380e1720db6c759fe1e236d77295e88ad5d0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26380e1720db6c759fe1e236d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 7 13:38:19 2011 +1100 mshtml: Implement IHTMLStyle put_borderRightColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3a976cd..45efd95 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1559,8 +1559,10 @@ static HRESULT WINAPI HTMLStyle_get_borderTopColor(IHTMLStyle *iface, VARIANT *p static HRESULT WINAPI HTMLStyle_put_borderRightColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderRightColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9cc25a3..b5babed 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5461,6 +5461,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderTopColor(style, vDefault); ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + /* borderRightColor */ + hres = IHTMLStyle_get_borderRightColor(style, &vDefault); + ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("blue"); + hres = IHTMLStyle_put_borderRightColor(style, v); + ok(hres == S_OK, "put_borderRightColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderRightColor(style, &v); + ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "blue"), "expected blue = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderRightColor(style, vDefault); + ok(hres == S_OK, "putborderRightColorr: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Hans Leidekker : msi/tests: Show that a failing call to MsiGetSourcePath( SOURCEDIR) sets the SOURCEDIR property.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: b2b4005fe44f4ee76e96bda2b3ab45b7a129f3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b4005fe44f4ee76e96bda2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 7 09:40:33 2011 +0100 msi/tests: Show that a failing call to MsiGetSourcePath(SOURCEDIR) sets the SOURCEDIR property. --- dlls/msi/tests/package.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 706e925..cc7be1e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11939,6 +11939,23 @@ static void test_sourcedir(void) ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); ok(size == 0, "Expected 0, got %d\n", size); + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SOURCEDIR", path, &size); + ok(r == ERROR_DIRECTORY, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, "kiwi"), "Expected \"kiwi\", got \"%s\"\n", path); + ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + + /* SOURCEDIR after calling MsiGetSourcePath */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine { + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + r = MsiDoAction(hpkg, "ResolveSource"); ok(r == ERROR_SUCCESS, "file cost failed\n");

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
68
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 February 2011