February 2016 - Wine-commits

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect().
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: ec590c8404e631628b5e08f9dbf064c69bc23ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec590c8404e631628b5e08f9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:36 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 523ad92..f9d45c5 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -776,7 +776,6 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface, D3DCUBEMAP_FACES face, UINT level) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -785,13 +784,10 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface, wined3d_mutex_lock(); sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_GetCubeMapSurface().
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 74bc7c43383652246bd86837c6feee7ef4788afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bc7c43383652246bd86837c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:37 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_GetCubeMapSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index f9d45c5..c096d43 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -719,7 +719,6 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9 D3DCUBEMAP_FACES face, UINT level, IDirect3DSurface9 **surface) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; UINT sub_resource_idx; DWORD level_count; @@ -735,13 +734,12 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9 } sub_resource_idx = level_count * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_LockBox().
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 9c280ddc841f5e4cb085ea7bfbd2beccabaed410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c280ddc841f5e4cb085ea7bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:38 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_LockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c096d43..a47c439 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1141,7 +1141,6 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; HRESULT hr; @@ -1149,13 +1148,10 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, iface, level, locked_box, box, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume9_LockBox(&volume_impl->IDirect3DVolume9_iface, locked_box, box, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_UnlockBox().
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 6f98e85783e2aa04178eebe549c566a89c7af5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f98e85783e2aa04178eebe54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:39 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_UnlockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index a47c439..adc33ad 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1160,20 +1160,16 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume9_UnlockBox(&volume_impl->IDirect3DVolume9_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_GetVolumeLevel().
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 17ce029f55cb65285c5b687958324d64ace43f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ce029f55cb65285c5b68795… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:40 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_GetVolumeLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index adc33ad..9cf10ae 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1117,19 +1117,17 @@ static HRESULT WINAPI d3d9_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture9 *if UINT level, IDirect3DVolume9 **volume) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - volume_impl = wined3d_resource_get_parent(sub_resource); *volume = &volume_impl->IDirect3DVolume9_iface; IDirect3DVolume9_AddRef(*volume); wined3d_mutex_unlock();

1 0

Sebastian Lackner : winedevice: Use LdrFindEntryForAddress to find LDR_MODULE address.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 4bed3d231e96687efbdba3ff4c96fbbdfe450ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bed3d231e96687efbdba3ff4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 06:11:26 2016 +0100 winedevice: Use LdrFindEntryForAddress to find LDR_MODULE address. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index ef1e1ef..43963b6 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -50,15 +50,18 @@ static DRIVER_EXTENSION driver_extension; /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { - LIST_ENTRY *entry, *list = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + LDR_MODULE *ldr; + ULONG_PTR magic; - for (entry = list->Flink; entry != list; entry = entry->Flink) + LdrLockLoaderLock( 0, NULL, &magic ); + if (LdrFindEntryForAddress( module, &ldr )) { - LDR_MODULE *ldr = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); - if (ldr->BaseAddress == module) return ldr; - if (ldr->BaseAddress > (void *)module) break; + WARN( "module not found for %p\n", module ); + ldr = NULL; } - return NULL; + LdrUnlockLoaderLock( 0, magic ); + + return ldr; } /* load the driver module file */

1 0

Sebastian Lackner : winedevice: Get rid of global driver_hkey variable and fix some leaks.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: e931f0e83daa30bc19b6139bfe3987425b9e76ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e931f0e83daa30bc19b6139bf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 06:11:36 2016 +0100 winedevice: Get rid of global driver_hkey variable and fix some leaks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 43963b6..94132ed 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -42,7 +42,6 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static WCHAR *driver_name; static SERVICE_STATUS_HANDLE service_handle; -static HKEY driver_hkey; static HANDLE stop_event; static DRIVER_OBJECT driver_obj; static DRIVER_EXTENSION driver_extension; @@ -203,6 +202,7 @@ static HMODULE load_driver(void) '\\','S','e','r','v','i','c','e','s','\\',0}; UNICODE_STRING keypath; + HKEY driver_hkey; HMODULE module; LPWSTR path = NULL, str; DWORD type, size; @@ -215,7 +215,7 @@ static HMODULE load_driver(void) { WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(str), GetLastError() ); HeapFree( GetProcessHeap(), 0, str); - return FALSE; + return NULL; } RtlInitUnicodeString( &keypath, str ); @@ -231,7 +231,12 @@ static HMODULE load_driver(void) ExpandEnvironmentStringsW(str,path,size); } HeapFree( GetProcessHeap(), 0, str ); - if (!path) return FALSE; + if (!path) + { + RtlFreeUnicodeString( &keypath ); + RegCloseKey( driver_hkey ); + return NULL; + } if (!strncmpiW( path, systemrootW, 12 )) { @@ -265,12 +270,17 @@ static HMODULE load_driver(void) lstrcatW(path, postfixW); str = path; } + RegCloseKey( driver_hkey ); WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); - if (!module) return NULL; + if (!module) + { + RtlFreeUnicodeString( &keypath ); + return NULL; + } init_driver( module, &keypath ); return module;

1 0

André Hentschel : winmm/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 4361a1f0902a574daf1dcb0c8b1bacf5b875dd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4361a1f0902a574daf1dcb0c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:21 2016 +0100 winmm/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 12 ++++-------- dlls/winmm/tests/midi.c | 8 +++----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 7470ed1..14500a5 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -721,10 +721,8 @@ static void test_recordWAVE(HWND hwnd) /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendStringA("record x to 2000 wait", NULL, 0, hwnd); ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); - if(!ndevs) todo_wine /* with sound disabled */ - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); - else - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); + todo_wine_if (!ndevs) /* with sound disabled */ + ok(ndevs > 0 ? !err : err == MCIERR_WAVE_INPUTSUNSUITABLE, "mci record to 2000 returned %s\n", dbg_mcierr(err)); if(err) { if (err==MCIERR_WAVE_INPUTSUNSUITABLE) skip("Please install audio driver. Everything is skipped.\n"); @@ -1165,10 +1163,8 @@ static void test_AutoOpenWAVE(HWND hwnd) test_notification(hwnd, "-prior to auto-open-", 0); err = mciSendStringA("play tempfile.wav notify", buf, sizeof(buf), hwnd); - if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); - else - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + todo_wine_if (ok_saved == MCIERR_FILE_NOT_FOUND) /* same as above */ + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendStringA("play tempfile.wav", buf, sizeof(buf), hwnd); diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 6438dba..b80d5d2 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -800,11 +800,9 @@ static void test_midi_outfns(HWND hwnd) ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*nt,w2k*/), "midiOutGetDevCaps MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); rc = midiOutOpen(&hm, MIDIMAPPER, 0, 0, CALLBACK_NULL); - if (rc==MIDIERR_INVALIDSETUP) todo_wine /* Wine without snd-seq */ - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k*/), "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k sound disabled*/), - "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); + todo_wine_if (rc == MIDIERR_INVALIDSETUP) /* Wine without snd-seq */ + ok(rc == MMSYSERR_BADDEVICEID || broken(rc == MMSYSERR_NODRIVER /*w2k sound disabled*/), + "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); if (!rc) { rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc));

1 0

Jacek Caban : mshtml: Added IHTMLXMLHttpRequest:: getResponseHeader implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 206bebfd8fca43b5c8aacbfc5e10c936dfd014ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=206bebfd8fca43b5c8aacbfc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 18:53:10 2016 +0100 mshtml: Added IHTMLXMLHttpRequest::getResponseHeader implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 17 +++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 5d11ec0..a16dad1 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -524,6 +524,19 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) ok(last == NULL, "last != NULL\n"); } +#define set_request_header(a,b,c) _set_request_header(__LINE__,a,b,c) +static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const char *header_a, const char *value_a) +{ + BSTR header = a2bstr(header_a), value = a2bstr(value_a); + HRESULT hres; + + hres = IHTMLXMLHttpRequest_setRequestHeader(xhr, header, value); + ok_(__FILE__,line)(hres == S_OK, "setRequestHeader failed: %08x\n", hres); + + SysFreeString(header); + SysFreeString(value); +} + static void test_responseXML(const char *expect_text) { IDispatch *disp; @@ -673,6 +686,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); + set_request_header(xhr, "x-wine-test", "sync-test"); + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); SET_EXPECT(xmlhttprequest_onreadystatechange_loading); @@ -835,6 +850,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); + set_request_header(xhr, "x-wine-test", "async-test"); + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); SET_EXPECT(xmlhttprequest_onreadystatechange_loading); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ba6dc05..d55570c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -613,8 +613,35 @@ static HRESULT WINAPI HTMLXMLHttpRequest_getResponseHeader(IHTMLXMLHttpRequest * static HRESULT WINAPI HTMLXMLHttpRequest_setRequestHeader(IHTMLXMLHttpRequest *iface, BSTR bstrHeader, BSTR bstrValue) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrHeader), debugstr_w(bstrValue)); - return E_NOTIMPL; + char *header_u, *value_u; + nsACString header, value; + nsresult nsres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrHeader), debugstr_w(bstrValue)); + + header_u = heap_strdupWtoU(bstrHeader); + if(bstrHeader && !header_u) + return E_OUTOFMEMORY; + + value_u = heap_strdupWtoU(bstrValue); + if(bstrValue && !value_u) { + heap_free(header_u); + return E_OUTOFMEMORY; + } + + nsACString_InitDepend(&header, header_u); + nsACString_InitDepend(&value, value_u); + nsres = nsIXMLHttpRequest_SetRequestHeader(This->nsxhr, &header, &value); + nsACString_Finish(&header); + nsACString_Finish(&value); + heap_free(header_u); + heap_free(value_u); + if(NS_FAILED(nsres)) { + ERR("SetRequestHeader failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = {

1 0

Alexandre Julliard : makefiles: Generate top-level rules for pot files.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: ce231568a97285102a18a9caf192c52b7172ac1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce231568a97285102a18a9caf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 15:36:02 2016 +0900 makefiles: Generate top-level rules for pot files. Get rid of the rsrc.pot and msg.pot hacks, use each individual source file instead. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 33 +------- configure | 212 ++++++++++++++++++++++----------------------------- configure.ac | 176 +++++++++++++++++++++--------------------- tools/make_makefiles | 4 +- tools/makedep.c | 118 ++++++++++++++++++---------- 5 files changed, 257 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce231568a97285102a18a…

1 0