wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Michael Stefaniuc : dmband: COM cleanup for IDirectMusicTrack8.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 70eadcd543caed54eeb892de2121901347cbe512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eadcd543caed54eeb892de2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:16:24 2015 +0200 dmband: COM cleanup for IDirectMusicTrack8. --- dlls/dmband/bandtrack.c | 131 +++++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70eadcd543caed54eeb89…

1 0

Michael Stefaniuc : dmband: Pass objects instead of ifaces to helpers.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 367ee6caa9153077d94902a8e56ec75c3cf2d72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=367ee6caa9153077d94902a8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:15:04 2015 +0200 dmband: Pass objects instead of ifaces to helpers. --- dlls/dmband/bandtrack.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 3c00415..9159f17 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -306,10 +306,9 @@ static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_IsDirty (LPPERSISTSTR return S_FALSE; } -static HRESULT IDirectMusicBandTrack_IPersistStream_LoadBand (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicBand** ppBand, - DMUS_PRIVATE_BAND_ITEM_HEADER* pHeader) { - - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); +static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream, + IDirectMusicBand **ppBand, DMUS_PRIVATE_BAND_ITEM_HEADER *pHeader) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -352,9 +351,9 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_LoadBand (LPPERSISTSTREAM if return S_OK; } -static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface);*/ +static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, ListSize[3], ListCount[3]; @@ -426,8 +425,8 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicBandTrack_IPersistStream_LoadBand (iface, pClonedStream, &pBand, &header); + + hr = load_band(This, pClonedStream, &pBand, &header); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -474,9 +473,9 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); +static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -538,7 +537,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (LPPERSIS } case DMUS_FOURCC_BANDS_LIST: { TRACE_(dmfile)(": TRACK list\n"); - hr = IDirectMusicBandTrack_IPersistStream_ParseBandsList (iface, &Chunk, pStm); + hr = parse_bands_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -584,7 +583,7 @@ static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Load (LPPERSISTSTREAM switch (Chunk.fccID) { case DMUS_FOURCC_BANDTRACK_FORM: { TRACE_(dmfile)(": Band track form\n"); - hr = IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (iface, &Chunk, pStm); + hr = parse_bandtrack_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmime: Move struct definitions to the files that need them.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 619c697da0a2968bfee1f9fd7ad990d05739658a URL: http://source.winehq.org/git/wine.git/?a=commit;h=619c697da0a2968bfee1f9fd7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:12:30 2015 +0200 dmime: Move struct definitions to the files that need them. --- dlls/dmime/dmime_private.h | 141 ----------------------------------------- dlls/dmime/lyricstrack.c | 8 +++ dlls/dmime/markertrack.c | 8 +++ dlls/dmime/paramcontroltrack.c | 8 +++ dlls/dmime/segtriggertrack.c | 9 +++ dlls/dmime/seqtrack.c | 8 +++ dlls/dmime/sysextrack.c | 8 +++ dlls/dmime/tempotrack.c | 10 +++ dlls/dmime/timesigtrack.c | 8 +++ dlls/dmime/wavetrack.c | 11 ++++ 10 files changed, 78 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=619c697da0a2968bfee1f…

1 0

Jacek Caban : msscript.ocx: Added ScriptControl class factory.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: cabbb922e6528759380dafec918c5d4ee9f55257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabbb922e6528759380dafec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 25 13:31:19 2015 +0200 msscript.ocx: Added ScriptControl class factory. --- dlls/msscript.ocx/msscript.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 30666a0..cf62ba4 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -16,9 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" +#include "initguid.h" #include "ole2.h" #include "rpcproxy.h" +#include "msscript.h" #include "wine/debug.h" @@ -26,6 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); static HINSTANCE msscript_instance; +HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + /****************************************************************** * DllMain (msscript.ocx.@) */ @@ -45,11 +55,65 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) return TRUE; } +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl ScriptControlFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ScriptControl_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ScriptControlFactory = { &ScriptControlFactoryVtbl }; + /*********************************************************************** * DllGetClassObject (msscript.ocx.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_ScriptControl, rclsid)) { + TRACE("(CLSID_ScriptControl %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&ScriptControlFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Michael Müller : wininet: Fix arguments of HttpAddRequestHeaders.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: efd41e4f2b1c784d4939aa10d869f87f2384f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd41e4f2b1c784d4939aa10d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:28:02 2015 +0200 wininet: Fix arguments of HttpAddRequestHeaders. --- dlls/wininet/http.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3be88b7..dc54820 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1671,7 +1671,8 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); } else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) @@ -1692,7 +1693,8 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(data); heap_free(authorization); } @@ -3413,7 +3415,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, HTTP_ACCEPT, lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | HTTP_ADDHDR_FLAG_REQ | - (i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); + (i == 0 ? (HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD) : 0)); } } @@ -4253,7 +4255,8 @@ static void HTTP_InsertCookies(http_request_t *request) if(res != ERROR_SUCCESS || !cookies) return; - HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(cookies); } @@ -4974,7 +4977,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_FixURL(request); if (request->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) { - HTTP_ProcessHeader(request, szConnection, szKeepAlive, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, szConnection, szKeepAlive, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); } HTTP_InsertAuthorization(request, request->authInfo, szAuthorization); HTTP_InsertAuthorization(request, request->proxyAuthInfo, szProxy_Authorization); @@ -5991,7 +5995,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) /* Add status code */ HTTP_ProcessHeader(request, szStatus, status_code, - HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(request->version); heap_free(request->statusText);

1 0

Michael Müller : rpcrt4: Fix arguments of HttpAddRequestHeaders.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: ab82b446a0e771e5dd261975eb58937f78c99cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab82b446a0e771e5dd261975e… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:27:43 2015 +0200 rpcrt4: Fix arguments of HttpAddRequestHeaders. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8c0263b..fbc2ad7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2275,7 +2275,7 @@ static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; sprintfW(header, fmtW, len); - if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE))) return RPC_S_OK; + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD))) return RPC_S_OK; return RPC_S_SERVER_UNAVAILABLE; } @@ -2867,7 +2867,7 @@ static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request } if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC) - HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE); + HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); destroy_authinfo(info); return status;

1 0

Michael Müller : wininet/tests: Add tests for overriding host header.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 1b53917ece1a3b0fb3f8422c9798453ef84f85ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b53917ece1a3b0fb3f8422c9… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:27:30 2015 +0200 wininet/tests: Add tests for overriding host header. --- dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index df7dd07..b841795 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2051,6 +2051,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSADATA wsaData; int last_request = 0; char host_header[22]; + char host_header_override[30]; static BOOL test_b = FALSE; static int test_no_cache = 0; @@ -2077,6 +2078,7 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(si->hEvent); sprintf(host_header, "Host: localhost:%d", si->port); + sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); do { @@ -2351,6 +2353,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "/test_host_override")) + { + if (strstr(buffer, host_header_override)) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -2946,6 +2955,105 @@ static void test_connection_header(int port) InternetCloseHandle(ses); } +static void test_header_override(int port) +{ + char buffer[128], host_header_override[30], full_url[128]; + HINTERNET ses, con, req; + DWORD size, count, err; + BOOL ret; + + sprintf(host_header_override, "Host: test.local:%d\r\n", port); + sprintf(full_url, "http://localhost:%d/test_host_override", port); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + err = GetLastError(); + todo_wine ok(!ret, "HttpQueryInfo succeeded\n"); + todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + ok(ret, "HttpQueryInfo failed\n"); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + todo_wine ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code_todo(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n"); + todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code_todo(req, 400); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http1_1(int port) { HINTERNET ses, con, req; @@ -4322,6 +4430,7 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/test6"); test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); + test_header_override(si.port); test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port);

1 0

Nikolay Sivov : dmsynth: Cleanup IDirectMusicSynth8 creation helper.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 32924d4ed0e49b74f5d4f6bbe2d63a4837f40117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32924d4ed0e49b74f5d4f6bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 12:13:43 2015 +0300 dmsynth: Cleanup IDirectMusicSynth8 creation helper. --- dlls/dmsynth/synth.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index af8a6fd..cdf8026 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -575,31 +575,37 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) -{ - IDirectMusicSynth8Impl *obj; - - TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynth8Impl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; - obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; - obj->ref = 0; - /* fill in caps */ - obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); - obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; - obj->pCaps.guidPort = CLSID_DirectMusicSynth; - obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; - obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; - obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; - obj->pCaps.dwMaxChannelGroups = 1000; - obj->pCaps.dwMaxVoices = 1000; - obj->pCaps.dwMaxAudioChannels = 2; - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - MultiByteToWideChar (CP_ACP, 0, "Microsoft Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); - - return IDirectMusicSynth8Impl_QueryInterface ((LPDIRECTMUSICSYNTH8)obj, lpcGUID, ppobj); +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj, IUnknown *outer) +{ + static const WCHAR descrW[] = {'M','i','c','r','o','s','o','f','t',' ', + 'S','y','n','t','h','e','s','i','z','e','r',0}; + IDirectMusicSynth8Impl *obj; + HRESULT hr; + + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ppobj, outer); + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (NULL == obj) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; + obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; + obj->ref = 1; + /* fill in caps */ + obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); + obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; + obj->pCaps.guidPort = CLSID_DirectMusicSynth; + obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; + obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; + obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; + obj->pCaps.dwMaxChannelGroups = 1000; + obj->pCaps.dwMaxVoices = 1000; + obj->pCaps.dwMaxAudioChannels = 2; + obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; + strcpyW(obj->pCaps.wszDescription, descrW); + + hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); + IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); + return hr; }

1 0

Michael Müller : fltlib: Add stub for FilterLoad.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: ca0973486aeee2d7f4d919f326fd472a24c77b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0973486aeee2d7f4d919f32… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 08:17:11 2015 +0200 fltlib: Add stub for FilterLoad. --- dlls/fltlib/fltlib.c | 15 ++++++++++++--- dlls/fltlib/fltlib.spec | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 50f46ac..b968c2b 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -79,13 +79,22 @@ HRESULT WINAPI FilterFindClose(HANDLE handle) } /********************************************************************** + * FilterLoad (FLTLIB.@) + */ +HRESULT WINAPI FilterLoad(LPCWSTR filtername) +{ + FIXME("(%s) stub\n", debugstr_w(filtername)); + return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); +} + +/********************************************************************** * FilterUnload (FLTLIB.@) */ -HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +HRESULT WINAPI FilterUnload(LPCWSTR filtername) { - FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + FIXME("(%s) stub\n", debugstr_w(filtername)); - if (!lpFilterName) + if (!filtername) return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); return S_OK; diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index 91e803b..226a615 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -16,7 +16,7 @@ @ stub FilterInstanceFindFirst @ stub FilterInstanceFindNext @ stub FilterInstanceGetInformation -@ stub FilterLoad +@ stdcall FilterLoad(wstr) @ stub FilterReplyMessage @ stub FilterSendMessage @ stdcall FilterUnload(wstr)

1 0

Akihiro Sagawa : winetest: Add SystemPreferredUILanguages to the log.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: c908c9c7c9e0da51a2b35915965e5a1d519497dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c908c9c7c9e0da51a2b359159… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 25 00:42:07 2015 +0900 winetest: Add SystemPreferredUILanguages to the log. A few GDI functions are affected by System account's display language (by GetSystemPreferredUILanguages). --- programs/winetest/main.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0149377..1eb49b6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -445,20 +445,35 @@ static void print_version (void) static void print_language(void) { HMODULE hkernel32; + BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, PULONG, PZZWSTR, PULONG); LANGID (WINAPI *pGetUserDefaultUILanguage)(void); LANGID (WINAPI *pGetThreadUILanguage)(void); - xprintf (" SystemDefaultLCID=%x\n", GetSystemDefaultLCID()); - xprintf (" UserDefaultLCID=%x\n", GetUserDefaultLCID()); - xprintf (" ThreadLocale=%x\n", GetThreadLocale()); + xprintf (" SystemDefaultLCID=%04x\n", GetSystemDefaultLCID()); + xprintf (" UserDefaultLCID=%04x\n", GetUserDefaultLCID()); + xprintf (" ThreadLocale=%04x\n", GetThreadLocale()); hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + + if (pGetSystemPreferredUILanguages && !running_under_wine()) + { + WCHAR langW[32]; + ULONG num, size = sizeof(langW)/sizeof(langW[0]); + if (pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) + { + char lang[32], *p = lang; + WideCharToMultiByte(CP_ACP, 0, langW, size, lang, sizeof(lang), NULL, NULL); + for (p += strlen(p) + 1; *p != '\0'; p += strlen(p) + 1) *(p - 1) = ','; + xprintf (" SystemPreferredUILanguages=%s\n", lang); + } + } if (pGetUserDefaultUILanguage) - xprintf (" UserDefaultUILanguage=%x\n", pGetUserDefaultUILanguage()); + xprintf (" UserDefaultUILanguage=%04x\n", pGetUserDefaultUILanguage()); if (pGetThreadUILanguage) - xprintf (" ThreadUILanguage=%x\n", pGetThreadUILanguage()); + xprintf (" ThreadUILanguage=%04x\n", pGetThreadUILanguage()); } static inline BOOL is_dot_dir(const char* x)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
61
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 June 2015