July 2017 - Wine-Commits - list.winehq.org

Zebediah Figura : msi/tests: Use static linking for a couple functions.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: e76b42c0966a4f4445312ac5b9e5a9f6a425af99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76b42c0966a4f4445312ac5b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:10 2017 -0500 msi/tests: Use static linking for a couple functions. These are available on all of the test machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 110 ++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 1173c92..0b287f4 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -38,9 +38,7 @@ static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','p','a','c','k','a','g','e','.','m','s','i',0}; static char CURR_DIR[MAX_PATH]; -static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); -static UINT (WINAPI *pMsiSetExternalUIRecord)(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); @@ -67,9 +65,7 @@ static void init_functionpointers(void) #define GET_PROC(mod, func) \ p ## func = (void*)GetProcAddress(mod, #func); - GET_PROC(hmsi, MsiApplyMultiplePatchesA); GET_PROC(hmsi, MsiGetComponentPathExA); - GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, CheckTokenMembership); @@ -8795,48 +8791,43 @@ static void test_MsiApplyMultiplePatches(void) { UINT r, type = GetDriveTypeW(NULL); - if (!pMsiApplyMultiplePatchesA) { - win_skip("MsiApplyMultiplePatchesA not found\n"); - return; - } - - r = pMsiApplyMultiplePatchesA(NULL, NULL, NULL); + r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = pMsiApplyMultiplePatchesA("", NULL, NULL); + r = MsiApplyMultiplePatchesA("", NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";", NULL, NULL); + r = MsiApplyMultiplePatchesA(";", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); + r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); + r = MsiApplyMultiplePatchesA(";;", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); + r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = pMsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); + r = MsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } @@ -9154,6 +9145,7 @@ static void test_externalui(void) INSTALLUI_HANDLER_RECORD prev_record; MSIHANDLE hpkg, hrecord; UINT r; + INT retval = 0; prev = MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); @@ -9178,48 +9170,41 @@ static void test_externalui(void) ok(r == 0, "expected 0, got %u\n", r); ok(externalui_ran == 1, "external UI callback did not run\n"); - if (pMsiSetExternalUIRecord) - { - INT retval = 0; - - prev = MsiSetExternalUIA(prev, 0, NULL); - ok(prev == externalui_callback, "wrong callback function %p\n", prev); - r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); - ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); - - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 0, "expected 0, got %u\n", r); - ok(externalui_ran == 0, "external UI callback should not have run\n"); - ok(externalui_record_ran == 1, "external UI record callback did not run\n"); - - MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); - - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 0, "expected 0, got %u\n", r); - ok(externalui_ran == 1, "external UI callback did not run\n"); - ok(externalui_record_ran == 1, "external UI record callback did not run\n"); - - retval = 1; - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 1, "expected 1, got %u\n", r); - ok(externalui_ran == 0, "external UI callback should not have run\n"); - ok(externalui_record_ran == 1, "external UI record callback did not run\n"); - - /* filter and context should be kept separately */ - r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); - ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); - - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 0, "expected 0, got %u\n", r); - ok(externalui_ran == 1, "external UI callback did not run\n"); - ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); - } - else - win_skip("MsiSetExternalUIRecord is not available\n"); + prev = MsiSetExternalUIA(prev, 0, NULL); + ok(prev == externalui_callback, "wrong callback function %p\n", prev); + r = MsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + retval = 1; + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 1, "expected 1, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + /* filter and context should be kept separately */ + r = MsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); MsiCloseHandle(hpkg); DeleteFileA(msifile); @@ -9496,7 +9481,7 @@ static void test_externalui_message(void) /* processing SHOWDIALOG with a record handler causes a crash on XP */ MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval); - r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); + r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); flush_sequence(); @@ -9703,8 +9688,7 @@ START_TEST(package) test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); test_externalui(); - if (pMsiSetExternalUIRecord) - test_externalui_message(); + test_externalui_message(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: b143ae84a7f5fc95cf2d815fcef66c4db554910f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b143ae84a7f5fc95cf2d815fc… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Jul 20 23:09:06 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 188 ++++++++++++++++-------------------------------------------- 1 file changed, 50 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b143ae84a7f5fc95cf2d8…

1 0

Zebediah Figura : msi: Don't set _BrowseProperty.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 44fb23dc32872385000a5f2c6494130b15d1c626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fb23dc32872385000a5f2c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:12 2017 -0500 msi: Don't set _BrowseProperty. This is a revert of 166a7e993cb0033fac7ec2712c346558fb7bd100. _BrowseProperty is not set by Windows, but should rather be set by the program in question. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6c24f61..4c44a84 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -746,8 +746,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szPrintHoodFolder[] = {'P','r','i','n','t','H','o','o','d','F','o','l','d','e','r',0}; static const WCHAR szRecentFolder[] = {'R','e','c','e','n','t','F','o','l','d','e','r',0}; static const WCHAR szComputerName[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; - static const WCHAR szBrowseProperty[] = {'_','B','r','o','w','s','e','P','r','o','p','e','r','t','y',0}; - static const WCHAR szInstallDir[] = {'I','N','S','T','A','L','L','D','I','R',0}; /* * Other things that probably should be set: @@ -1019,7 +1017,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_free( computername ); } } - msi_set_property( package->db, szBrowseProperty, szInstallDir, -1 ); } static MSIPACKAGE *msi_alloc_package( void )

1 0

Józef Kucia : d3d11: Introduce d3d_blend_state_create () helper function.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 7448012ecc56cc14c4b80a8d1607c703efa1b1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7448012ecc56cc14c4b80a8d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:57 2017 +0200 d3d11: Introduce d3d_blend_state_create() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 70 ++++---------------------------------------- dlls/d3d11/state.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 67 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 479c84f..b887ac5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -402,8 +402,8 @@ static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendStat return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); } -HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, - const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, + struct d3d_blend_state **state) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e84c365..95783e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3001,70 +3001,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_blend_state *object; - struct wine_rb_entry *entry; - D3D11_BLEND_DESC tmp_desc; - unsigned int i, j; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); - if (!desc) - return E_INVALIDARG; - - /* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use - * D3D11_BLEND_DESC as a key in the rbtree. */ - memset(&tmp_desc, 0, sizeof(tmp_desc)); - tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; - tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable; - for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - j = desc->IndependentBlendEnable ? i : 0; - tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; - tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; - tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; - tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; - tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; - tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; - tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; - tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; - - if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) - FIXME("Color mask %#x not supported for render target %u.\n", - tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); - } - - /* glSampleCoverage() */ - if (tmp_desc.AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); - /* glEnableIndexedEXT(GL_BLEND, ...) */ - if (tmp_desc.IndependentBlendEnable) - FIXME("Per-rendertarget blend not implemented.\n"); - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); - - TRACE("Returning existing blend state %p.\n", object); - *blend_state = &object->ID3D11BlendState_iface; - ID3D11BlendState_AddRef(*blend_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) - { - WARN("Failed to initialize blend state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_blend_state_create(device, desc, &object))) return hr; - } - TRACE("Created blend state %p.\n", object); *blend_state = &object->ID3D11BlendState_iface; return S_OK; @@ -5390,18 +5333,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *i const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11BlendState *d3d11_blend_state; + struct d3d_blend_state *object; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); - if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, (D3D11_BLEND_DESC *)desc, - &d3d11_blend_state))) + if (FAILED(hr = d3d_blend_state_create(device, (const D3D11_BLEND_DESC *)desc, &object))) return hr; - hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState1, (void **)blend_state); - ID3D11BlendState_Release(d3d11_blend_state); - return hr; + *blend_state = &object->ID3D10BlendState1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 43dd10f..39768c5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -283,7 +283,7 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc1, }; -HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, +static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) { state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; @@ -308,6 +308,77 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d return S_OK; } +HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, + struct d3d_blend_state **state) +{ + struct d3d_blend_state *object; + struct wine_rb_entry *entry; + D3D11_BLEND_DESC tmp_desc; + unsigned int i, j; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + /* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use + * D3D11_BLEND_DESC as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + j = desc->IndependentBlendEnable ? i : 0; + tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; + tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + + if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) + FIXME("Color mask %#x not supported for render target %u.\n", + tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); + } + + /* glSampleCoverage() */ + if (tmp_desc.AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + if (tmp_desc.IndependentBlendEnable) + FIXME("Per-rendertarget blend not implemented.\n"); + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); + + TRACE("Returning existing blend state %p.\n", object); + ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) + { + WARN("Failed to initialize blend state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created blend state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) { if (!iface)

1 0

Hugh McMaster : regedit: Remove an unused #define.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: cc1d2525c4e5f15db3e3154ec0b5319975936f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1d2525c4e5f15db3e3154ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:08 2017 +0000 regedit: Remove an unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 57be5da..3f036f6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -37,11 +37,6 @@ #define REG_VAL_BUF_SIZE 4096 -/* maximal number of characters in hexadecimal data line, - * including the indentation, but not including the '\' character - */ -#define REG_FILE_HEX_LINE_LEN (2 + 25 * 3) - extern const WCHAR* reg_class_namesW[]; static HKEY reg_class_keys[] = {

1 0

Alexandre Julliard : ntdll: Add small assembly wrappers for snooping instead of saving/ restoring the entire context.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 143143ad00631d97c860fcb6a558b9b02e63e648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143143ad00631d97c860fcb6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 16:18:45 2017 +0200 ntdll: Add small assembly wrappers for snooping instead of saving/restoring the entire context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 101 +++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index db21872..9ffe28a 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -840,9 +840,6 @@ typedef struct { /* code part */ BYTE lcall; /* 0xe8 call snoopentry (relative) */ - /* NOTE: If you move snoopentry OR nrofargs fix the relative offset - * calculation! - */ DWORD snoopentry; /* SNOOP_Entry relative */ /* unreached */ int nrofargs; @@ -863,15 +860,12 @@ typedef struct { /* code part */ BYTE lcall; /* 0xe8 call snoopret relative*/ - /* NOTE: If you move snoopret OR origreturn fix the relative offset - * calculation! - */ DWORD snoopret; /* SNOOP_Ret relative */ /* unreached */ FARPROC origreturn; SNOOP_DLL *dll; DWORD ordinal; - DWORD origESP; + void **origESP; DWORD *args; /* saved args across a stdcall */ } SNOOP_RETURNENTRY; @@ -1025,8 +1019,7 @@ FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *export { fun->name = ename; fun->lcall = 0xe8; - /* NOTE: origreturn struct member MUST come directly after snoopentry */ - fun->snoopentry = (char*)SNOOP_Entry-((char*)(&fun->nrofargs)); + fun->snoopentry = (char *)SNOOP_Entry - (char *)(&fun->snoopentry + 1); fun->origfun = origfun; fun->nrofargs = -1; } @@ -1070,29 +1063,19 @@ static void SNOOP_PrintArg(DWORD x) __ENDTRY } -#define CALLER1REF (*(DWORD*)context->Esp) - -void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) +void WINAPI __regs_SNOOP_Entry( void **stack ) { - DWORD ordinal=0,entry = context->Eip - 5; - SNOOP_DLL *dll = firstdll; - SNOOP_FUN *fun = NULL; + SNOOP_DLL *dll; + SNOOP_FUN *fun = (SNOOP_FUN *)((char *)stack[0] - 5); SNOOP_RETURNENTRIES **rets = &firstrets; SNOOP_RETURNENTRY *ret; int i=0, max; - while (dll) { - if ( ((char*)entry>=(char*)dll->funs) && - ((char*)entry<=(char*)(dll->funs+dll->nrofordinals)) - ) { - fun = (SNOOP_FUN*)entry; - ordinal = fun-dll->funs; - break; - } - dll=dll->next; - } + for (dll = firstdll; dll; dll = dll->next ) + if (fun >= dll->funs && fun < dll->funs + dll->nrofordinals) break; + if (!dll) { - FIXME("entrypoint 0x%08x not found\n",entry); + FIXME("entrypoint %p not found\n", fun); return; /* oops */ } /* guess cdecl ... */ @@ -1102,7 +1085,7 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) * which has (for xxxxxxxx up to 255 the opcode "83 C4 xx". * (after that 81 C2 xx xx xx xx) */ - LPBYTE reteip = (LPBYTE)CALLER1REF; + LPBYTE reteip = stack[1]; if (reteip) { if ((reteip[0]==0x83)&&(reteip[1]==0xc4)) @@ -1128,33 +1111,31 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) PAGE_EXECUTE_READWRITE); if (!addr) return; *rets = addr; - memset(*rets,0,4096); i = 0; /* entry 0 is free */ } ret = &((*rets)->entry[i]); ret->lcall = 0xe8; - /* NOTE: origreturn struct member MUST come directly after snoopret */ - ret->snoopret = ((char*)SNOOP_Return)-(char*)(&ret->origreturn); - ret->origreturn = (FARPROC)CALLER1REF; - CALLER1REF = (DWORD)&ret->lcall; + ret->snoopret = (char *)SNOOP_Return - (char *)(&ret->snoopret + 1); + ret->origreturn = stack[1]; + stack[1] = &ret->lcall; ret->dll = dll; ret->args = NULL; - ret->ordinal = ordinal; - ret->origESP = context->Esp; + ret->ordinal = fun - dll->funs; + ret->origESP = stack; - context->Eip = (DWORD)fun->origfun; + stack[0] = fun->origfun; if (!TRACE_ON(snoop)) return; if (TRACE_ON(timestamp)) print_timestamp(); if (fun->name) DPRINTF("%04x:CALL %s.%s(",GetCurrentThreadId(),dll->name,fun->name); - else DPRINTF("%04x:CALL %s.%d(",GetCurrentThreadId(),dll->name,dll->ordbase+ordinal); + else DPRINTF("%04x:CALL %s.%d(",GetCurrentThreadId(),dll->name,dll->ordbase+ret->ordinal); if (fun->nrofargs>0) { max = fun->nrofargs; if (max>16) max=16; for (i=0;i<max;i++) { - SNOOP_PrintArg(*(DWORD*)(context->Esp + 4 + sizeof(DWORD)*i)); + SNOOP_PrintArg( (DWORD)stack[i + 2] ); if (i<fun->nrofargs-1) DPRINTF(","); } if (max!=fun->nrofargs) @@ -1163,16 +1144,16 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) DPRINTF("<unknown, check return>"); ret->args = RtlAllocateHeap(GetProcessHeap(), 0,16*sizeof(DWORD)); - memcpy(ret->args,(LPBYTE)(context->Esp + 4),sizeof(DWORD)*16); + memcpy(ret->args, stack + 2, sizeof(DWORD)*16); } DPRINTF(") ret=%08x\n",(DWORD)ret->origreturn); } - -void WINAPI __regs_SNOOP_Return( CONTEXT *context ) +void WINAPI __regs_SNOOP_Return( void **stack ) { - SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)(context->Eip - 5); + SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)((char *)stack[0] - 5); SNOOP_FUN *fun = &ret->dll->funs[ret->ordinal]; + DWORD retval = (DWORD)stack[-1]; /* get saved %eax from the stack */ /* We haven't found out the nrofargs yet. If we called a cdecl * function it is too late anyway and we can just set '0' (which @@ -1180,8 +1161,8 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) * If stdcall -> everything ok. */ if (ret->dll->funs[ret->ordinal].nrofargs<0) - ret->dll->funs[ret->ordinal].nrofargs=(context->Esp - ret->origESP-4)/4; - context->Eip = (DWORD)ret->origreturn; + ret->dll->funs[ret->ordinal].nrofargs = stack - ret->origESP - 1; + stack[0] = ret->origreturn; if (!TRACE_ON(snoop)) { ret->origreturn = NULL; /* mark as empty */ @@ -1207,8 +1188,7 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) SNOOP_PrintArg(ret->args[i]); if (i<max-1) DPRINTF(","); } - DPRINTF(") retval=%08x ret=%08x\n", - context->Eax,(DWORD)ret->origreturn ); + DPRINTF(") retval=%08x ret=%08x\n", retval, (DWORD)ret->origreturn ); RtlFreeHeap(GetProcessHeap(),0,ret->args); ret->args = NULL; } @@ -1217,19 +1197,40 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) if (fun->name) DPRINTF("%04x:RET %s.%s() retval=%08x ret=%08x\n", GetCurrentThreadId(), - ret->dll->name, fun->name, context->Eax, (DWORD)ret->origreturn); + ret->dll->name, fun->name, retval, (DWORD)ret->origreturn); else DPRINTF("%04x:RET %s.%d() retval=%08x ret=%08x\n", GetCurrentThreadId(), ret->dll->name,ret->dll->ordbase+ret->ordinal, - context->Eax, (DWORD)ret->origreturn); + retval, (DWORD)ret->origreturn); } ret->origreturn = NULL; /* mark as empty */ } -/* assembly wrappers that save the context */ -DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0 ) -DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0 ) +/* small wrappers that save registers and get the stack pointer */ +#define SNOOP_WRAPPER(name) \ + __ASM_STDCALL_FUNC( name, 0, \ + "pushl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "pushl %ecx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "pushl %edx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "leal 12(%esp),%eax\n\t" \ + "pushl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "call " __ASM_NAME("__regs_" #name) __ASM_STDCALL(4) "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %edx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %ecx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "ret" ) + +SNOOP_WRAPPER( SNOOP_Entry ) +SNOOP_WRAPPER( SNOOP_Return ) #else /* __i386__ */

1 0

Hans Leidekker : webservices: Add support for reading float values.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 82306e84f327bf113f8ae3e07f0d90300a71510d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82306e84f327bf113f8ae3e07… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:53 2017 +0200 webservices: Add support for reading float values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 164 ++++++++++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 89 ++++++++++++++++++ dlls/webservices/webservices_private.h | 1 + include/webservices.h | 11 +++ 4 files changed, 263 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82306e84f327bf113f8ae…

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3::get_textContent implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: c8cab0d3f6cd74838e7d872ac68cd69133717cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cab0d3f6cd74838e7d872ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 20 18:11:29 2017 +0200 mshtml: Added IHTMLDOMNode3::get_textContent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 10 ++++++++-- dlls/mshtml/tests/elements.js | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 8202803..ec18648 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1248,8 +1248,14 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT *p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMNode_GetTextContent(This->nsnode, &nsstr); + return return_nsstr_variant(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDOMNode3_isEqualNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isEqual) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index c307e50..79eb68a 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -59,6 +59,19 @@ function test_input_selection() { next_test(); } +function test_textContent() { + var text = document.createTextNode("test"); + ok(text.textContent === "test", "text.textContent = " + text.textContent); + + var div = document.createElement("div"); + document.body.appendChild(div); + div.innerHTML = "abc<script>/* */</script><div>text</div>"; + ok(div.textContent === "abc/* */text", "div.textContent = " + div.textContent); + + next_test(); +} + var tests = [ - test_input_selection + test_input_selection, + test_textContent ];

1 0

Hans Leidekker : webservices: Set default channel envelope and addressing versions.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 0ea201cbf7d0f3c045674ad11e4f2fd5bbfdbc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea201cbf7d0f3c045674ad11… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:54 2017 +0200 webservices: Set default channel envelope and addressing versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 6 ++++++ dlls/webservices/tests/channel.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 6326d60..5abd394 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -193,12 +193,18 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, { struct channel *channel; ULONG i, msg_size = 65536; + WS_ENVELOPE_VERSION env_version = WS_ENVELOPE_VERSION_SOAP_1_2; + WS_ADDRESSING_VERSION addr_version = WS_ADDRESSING_VERSION_1_0; HRESULT hr; if (!(channel = alloc_channel())) return E_OUTOFMEMORY; prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &msg_size, sizeof(msg_size) ); + prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, + &env_version, sizeof(env_version) ); + prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, + &addr_version, sizeof(addr_version) ); channel->type = type; channel->binding = binding; diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index ceefad9..86df4f7 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -28,6 +28,8 @@ static void test_WsCreateChannel(void) WS_CHANNEL_STATE state; WS_CHANNEL_PROPERTY prop; WS_ENCODING encoding; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; ULONG size; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); @@ -48,6 +50,18 @@ static void test_WsCreateChannel(void) ok( hr == S_OK, "got %08x\n", hr ); ok( encoding == WS_ENCODING_XML_UTF8, "got %u\n", encoding ); + env_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + /* read-only property */ state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); @@ -81,6 +95,18 @@ static void test_WsCreateChannel(void) hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( encoding == WS_ENCODING_XML_BINARY_SESSION_1, "got %u\n", encoding ); + + env_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); WsFreeChannel( channel ); }

1 0

Hugh McMaster : regedit: Remove unused header includes from regproc.c.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 9d23db6b122fa5ce5f43b2eaf05f94a4b59d179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d23db6b122fa5ce5f43b2eaf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:16 2017 +0000 regedit: Remove unused header includes from regproc.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 3f036f6..b726251 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -22,17 +22,12 @@ */ #include <errno.h> -#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <io.h> #include <windows.h> -#include <winnt.h> -#include <winreg.h> -#include <assert.h> #include <wine/unicode.h> -#include <wine/debug.h> #include "regproc.h" #define REG_VAL_BUF_SIZE 4096

1 0