February 2014 - Wine-commits

Alexandre Julliard : tools: Remove no longer used fnt2fon tool.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: ab588410917dcae4ec1d769c5375c2fc6718183c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab588410917dcae4ec1d769c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 10:53:04 2014 +0100 tools: Remove no longer used fnt2fon tool. --- tools/Makefile.in | 5 - tools/fnt2fon.c | 388 ----------------------------------------------------- 2 files changed, 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab588410917dcae4ec1d7…

1 0

Alexandre Julliard : sfnt2fon: Use getopt_long to allow arbitrary option order.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 207ae9f5c23af91d678c62e8bcf0833c286e5978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207ae9f5c23af91d678c62e8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 17:06:49 2014 +0100 sfnt2fon: Use getopt_long to allow arbitrary option order. --- tools/sfnt2fon/sfnt2fon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 4b47682..7612bc2 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -646,7 +646,7 @@ static char **parse_options( int argc, char **argv ) { int optc; - while ((optc = getopt( argc, argv, "d:ho:qr:s" )) != -1) + while ((optc = getopt_long( argc, argv, "d:ho:qr:s", NULL, NULL )) != -1) { switch(optc) {

1 0

Alexandre Julliard : make_specfiles: Don' t propagate -noname flag to non-ordinal functions.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 8013173924cf4096432b3d29ab8e9f7293e852f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8013173924cf4096432b3d29a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 11:19:16 2014 +0100 make_specfiles: Don't propagate -noname flag to non-ordinal functions. --- tools/make_specfiles | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 1dd4533..9b9a6b6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -223,15 +223,15 @@ sub update_file($) # parse a spec file line sub parse_line($$$) { - my ($name, $line, $_) = @_; + my ($name, $line, $str) = @_; - if (/^\s*(\@|\d+)\s+(stdcall|cdecl|varargs|thiscall|stub|extern)\s+((?:-\S+\s+)*)([A-Za-z0-9_\@\$?]+)(?:\s*($[^)]*$))?(?:\s+([A-Za-z0-9_\@\$?.]+))?(\s*\#.*)?/) + if ($str =~ /^\s*(\@|\d+)\s+(stdcall|cdecl|varargs|thiscall|stub|extern)\s+((?:-\S+\s+)*)([A-Za-z0-9_\@\$?]+)(?:\s*($[^)]*$))?(?:\s+([A-Za-z0-9_\@\$?.]+))?(\s*\#.*)?/) { return ( "ordinal" => $1, "callconv" => $2, "flags" => $3, "name" => $4, "args" => $5 || "", "target" => $6 || $4, "comment" => $7, "spec" => $name ); } - return () if /^\s*$/; - return () if /^\s*\#/; + return () if $str =~ /^\s*$/; + return () if $str =~ /^\s*\#/; printf STDERR "$name.spec:$line: error: Unrecognized line $_\n"; } @@ -300,6 +300,7 @@ sub update_spec_file($) { $flags = $parent{flags}; $flags =~ s/-ordinal\s*// if $descr{ordinal} eq "@"; + $flags =~ s/-noname\s*// if $descr{ordinal} eq "@"; if ($descr{flags} =~ /-private/) # preserve -private flag { $flags = "-private " . $flags unless $flags =~ /-private/;

1 0

Ken Thomases : wined3d: Don't clear the GL context such that it can' t be restored.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 75d53c9aed0b93b5a3607d2949d04d0570e781b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d53c9aed0b93b5a3607d294… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 5 14:01:15 2014 -0600 wined3d: Don't clear the GL context such that it can't be restored. --- dlls/wined3d/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 256052f..4cd6342 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1016,9 +1016,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - /* Force making the context current again, to verify it is still valid - * (workaround for broken drivers) */ - context_set_current(NULL); /* I don't think that the interface guarantees that the device is destroyed from the same thread * it was created. Thus make sure a context is active for the glDelete* calls */

1 0

Ken Thomases : wined3d: Don't clear the GL context if it' s not the one being destroyed by context_destroy_gl_resources().
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 59226e36b79b60a26345481022109ccce9341cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59226e36b79b60a2634548102… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 5 15:24:19 2014 -0600 wined3d: Don't clear the GL context if it's not the one being destroyed by context_destroy_gl_resources(). The previous code clears the GL context if the context being destroyed is not valid, even though the current one is some arbitrary, unrelated context. --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 587613c..c835414 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -888,10 +888,10 @@ static void context_destroy_gl_resources(struct wined3d_context *context) restore_dc = wglGetCurrentDC(); restore_pf = GetPixelFormat(restore_dc); - if (context->valid && restore_ctx != context->glCtx) - context_set_gl_context(context); - else + if (restore_ctx == context->glCtx) restore_ctx = NULL; + else if (context->valid) + context_set_gl_context(context); LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry) {

1 0

Vincent Povirk : windowscodecs: Silence a fixme.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: ed1a03e49463ceed7e75622596ad3407f965e4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1a03e49463ceed7e7562259… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 5 15:46:47 2014 -0600 windowscodecs: Silence a fixme. --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 335d754..579989b 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -954,7 +954,9 @@ static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReade static HRESULT WINAPI PngDecoder_Block_GetCount(IWICMetadataBlockReader *iface, UINT *pcCount) { - FIXME("%p,%p: stub\n", iface, pcCount); + static int once; + TRACE("%p,%p\n", iface, pcCount); + if (!once++) FIXME("stub\n"); return E_NOTIMPL; }

1 0

Vincent Povirk : mscoree/tests: Fix failures when .NET 4 but not 1 or 2 is installed.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: dad9dc941fe1f9d7e6cbe370ef852e3fbb425c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad9dc941fe1f9d7e6cbe370e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 5 16:33:39 2014 -0600 mscoree/tests: Fix failures when .NET 4 but not 1 or 2 is installed. --- dlls/mscoree/tests/mscoree.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 19e8fdd..852944f 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -34,6 +34,8 @@ static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); static HRESULT (WINAPI *pCreateConfigStream)(LPCWSTR, IStream**); static HRESULT (WINAPI *pCreateInterface)(REFCLSID, REFIID, VOID**); +static int no_legacy_runtimes; + static BOOL init_functionpointers(void) { hmscoree = LoadLibraryA("mscoree.dll"); @@ -85,9 +87,8 @@ static void test_versioninfo(void) hr = pGetCORVersion(version, 1, &size); if (hr == CLR_E_SHIM_RUNTIME) { - /* FIXME: Get Mono packaged properly so we can fail here. */ - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); - skip("No .NET runtimes are installed\n"); + no_legacy_runtimes = 1; + win_skip("No legacy .NET runtimes are installed\n"); return; } @@ -208,6 +209,12 @@ static void test_loadlibraryshim(void) HMODULE hdll; CHAR dllpath[MAX_PATH]; + if (no_legacy_runtimes) + { + win_skip("No legacy .NET runtimes are installed\n"); + return; + } + hr = pLoadLibraryShim(fusion, v1_1, NULL, &hdll); ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) @@ -395,6 +402,12 @@ static void test_createinstance(void) HRESULT hr; ICLRMetaHost *host; + if (no_legacy_runtimes) + { + /* If we don't have 1.x or 2.0 runtimes, we should at least have .NET 4. */ + ok(pCreateInterface != NULL, "no legacy runtimes or .NET 4 interfaces available\n"); + } + if(!pCreateInterface) { win_skip("Function CreateInterface not found.\n");

1 0

Frédéric Delanoy : rundll32: Use BOOL type where appropriate.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: b3d07c7846ef2698e1594dd0abb998dcfee60008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d07c7846ef2698e1594dd0a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 5 23:39:59 2014 +0100 rundll32: Use BOOL type where appropriate. --- programs/rundll32/rundll32.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index 53508c9..ec0ae59 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -164,11 +164,12 @@ static LPWSTR get_next_arg(LPWSTR *cmdline) { LPWSTR s; LPWSTR arg,d; - int in_quotes,bcount,len=0; + BOOL in_quotes; + int bcount,len=0; /* count the chars */ bcount=0; - in_quotes=0; + in_quotes=FALSE; s=*cmdline; while (1) { if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) { @@ -193,7 +194,7 @@ static LPWSTR get_next_arg(LPWSTR *cmdline) return NULL; bcount=0; - in_quotes=0; + in_quotes=FALSE; d=arg; s=*cmdline; while (*s) {

1 0

Bruno Jesus : ws2_32: Fix some parameters checking in AcceptEx.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 3c64a7c4e241823dd6590c9651693fa325aa2e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c64a7c4e241823dd6590c965… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 5 22:38:54 2014 -0200 ws2_32: Fix some parameters checking in AcceptEx. --- dlls/ws2_32/socket.c | 7 +++---- dlls/ws2_32/tests/sock.c | 7 +------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ff5a533..1c558bf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2386,10 +2386,9 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW return FALSE; } - if ((local_addr_len < sizeof(struct sockaddr_in) + 16) - || (rem_addr_len < sizeof(struct sockaddr_in) + 16)) + if (!rem_addr_len) { - SetLastError(WSAEINVAL); + SetLastError(WSAEFAULT); return FALSE; } @@ -2404,7 +2403,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW fd = get_sock_fd( acceptor, FILE_READ_DATA, NULL ); if (fd == -1) { - SetLastError(WSAEINVAL); + SetLastError(WSAENOTSOCK); return FALSE; } release_sock_fd( acceptor, fd ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1c22503..cb67533 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5935,8 +5935,7 @@ todo_wine bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); -todo_wine - ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " + ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid accepting socket " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -5949,7 +5948,6 @@ todo_wine bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); -todo_wine ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, "AcceptEx on too small local address size returned %d + errno %d\n", bret, WSAGetLastError()); @@ -5958,7 +5956,6 @@ todo_wine bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); -todo_wine ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address " "size returned %d + errno %d\n", bret, WSAGetLastError()); @@ -5967,13 +5964,11 @@ todo_wine bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); -todo_wine ok(bret == FALSE && (WSAGetLastError() == WSAEFAULT || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); -todo_wine ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = CancelIo((HANDLE) listener);

1 0

Nikolay Sivov : ole32: Implement CoGetInstanceFromFile().
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 35f218c39eb6707f43eb4917539003c7df8250b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f218c39eb6707f43eb49175… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 6 08:44:46 2014 +0400 ole32: Implement CoGetInstanceFromFile(). --- dlls/ole32/compobj.c | 116 +++++++++++++++++++++++++++++++++++++------------ dlls/ole32/ole32.spec | 2 +- 2 files changed, 89 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3c0c085..4149ecb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3196,6 +3196,36 @@ HRESULT WINAPI CoCreateInstance( return hres; } +static void init_multi_qi(DWORD count, MULTI_QI *mqi) +{ + ULONG i; + + for (i = 0; i < count; i++) + { + mqi[i].pItf = NULL; + mqi[i].hr = E_NOINTERFACE; + } +} + +static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi) +{ + ULONG index, fetched = 0; + + for (index = 0; index < count; index++) + { + mqi[index].hr = IUnknown_QueryInterface(unk, mqi[index].pIID, (void**)&mqi[index].pItf); + if (mqi[index].hr == S_OK) + fetched++; + } + + IUnknown_Release(unk); + + if (fetched == 0) + return E_NOINTERFACE; + + return fetched == count ? S_OK : CO_S_NOTALLINTERFACES; +} + /*********************************************************************** * CoCreateInstanceEx [OLE32.@] */ @@ -3209,8 +3239,6 @@ HRESULT WINAPI CoCreateInstanceEx( { IUnknown* pUnk = NULL; HRESULT hr; - ULONG index; - ULONG successCount = 0; /* * Sanity check @@ -3221,14 +3249,7 @@ HRESULT WINAPI CoCreateInstanceEx( if (pServerInfo!=NULL) FIXME("() non-NULL pServerInfo not supported!\n"); - /* - * Initialize all the "out" parameters. - */ - for (index = 0; index < cmq; index++) - { - pResults[index].pItf = NULL; - pResults[index].hr = E_NOINTERFACE; - } + init_multi_qi(cmq, pResults); /* * Get the object and get its IUnknown pointer. @@ -3242,31 +3263,70 @@ HRESULT WINAPI CoCreateInstanceEx( if (hr != S_OK) return hr; - /* - * Then, query for all the interfaces requested. - */ - for (index = 0; index < cmq; index++) + return return_multi_qi(pUnk, cmq, pResults); +} + +/*********************************************************************** + * CoGetInstanceFromFile [OLE32.@] + */ +HRESULT WINAPI CoGetInstanceFromFile( + COSERVERINFO *server_info, + CLSID *rclsid, + IUnknown *outer, + DWORD cls_context, + DWORD grfmode, + OLECHAR *filename, + DWORD count, + MULTI_QI *results +) +{ + IPersistFile *pf = NULL; + IUnknown* unk = NULL; + CLSID clsid; + HRESULT hr; + + if (count == 0 || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results); + + /* optionaly get CLSID from a file */ + if (!rclsid) { - pResults[index].hr = IUnknown_QueryInterface(pUnk, - pResults[index].pIID, - (VOID**)&(pResults[index].pItf)); + hr = GetClassFile(filename, &clsid); + if (FAILED(hr)) + { + ERR("failed to get CLSID from a file\n"); + return hr; + } - if (pResults[index].hr == S_OK) - successCount++; + rclsid = &clsid; } - /* - * Release our temporary unknown pointer. - */ - IUnknown_Release(pUnk); + hr = CoCreateInstance(rclsid, + outer, + cls_context, + &IID_IUnknown, + (void**)&unk); - if (successCount == 0) - return E_NOINTERFACE; + if (hr != S_OK) + return hr; - if (successCount!=cmq) - return CO_S_NOTALLINTERFACES; + /* init from file */ + hr = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&pf); + if (FAILED(hr)) + ERR("failed to get IPersistFile\n"); - return S_OK; + if (pf) + { + IPersistFile_Load(pf, filename, grfmode); + IPersistFile_Release(pf); + } + + return return_multi_qi(unk, count, results); } /*********************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d71168e..28a84a1 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -29,7 +29,7 @@ @ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) -@ stub CoGetInstanceFromFile #@ stdcall (ptr ptr ptr long wstr long ptr) return 0,ERR_NOTIMPLEMENTED +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stub CoGetInstanceFromIStorage #@ stdcall (ptr ptr ptr long ptr long ptr) return 0,ERR_NOTIMPLEMENTED @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr)

1 0