wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Hans Leidekker : include: Define IEnumWbemClassObject and IWbemServices.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 2e1eb80c2399c3f6e5d232b271666b7f1081d52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1eb80c2399c3f6e5d232b27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:57:44 2010 +0200 include: Define IEnumWbemClassObject and IWbemServices. --- include/wbemcli.idl | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 184 insertions(+), 0 deletions(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index b2ac6c1..db6a5ac 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -24,6 +24,10 @@ import "objidl.idl"; interface IWbemContext; interface IWbemServices; interface IWbemStatusCodeText; +interface IWbemCallResult; +interface IWbemObjectSink; +interface IWbemClassObject; +interface IEnumWbemClassObject; typedef [v1_enum] enum tag_WBEMSTATUS { @@ -209,3 +213,183 @@ interface IWbemStatusCodeText : IUnknown [in] LONG lFlags, [out] BSTR *MessageText); }; + +[ + object, + restricted, + uuid(9556dc99-828c-11cf-a37e-00aa003240c7), + pointer_default(unique) +] +interface IWbemServices : IUnknown +{ + HRESULT OpenNamespace( + [in] const BSTR strNamespace, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemServices **ppWorkingNamespace, + [out] IWbemCallResult **ppResult); + + HRESULT CancelAsyncCall( + [in] IWbemObjectSink *pSink); + + HRESULT QueryObjectSink( + [in] long lFlags, + [out] IWbemObjectSink **ppResponseHandler); + + HRESULT GetObject( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemClassObject **ppObject, + [out] IWbemCallResult **ppCallResult); + + HRESULT GetObjectAsync( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT PutClass( + [in] IWbemClassObject *pObject, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT PutClassAsync( + [in] IWbemClassObject *pObject, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT DeleteClass( + [in] const BSTR strClass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT DeleteClassAsync( + [in] const BSTR strClass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT CreateClassEnum( + [in] const BSTR strSuperclass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT CreateClassEnumAsync( + [in] const BSTR strSuperclass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT PutInstance( + [in] IWbemClassObject *pInst, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT PutInstanceAsync( + [in] IWbemClassObject *pInst, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT DeleteInstance( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT DeleteInstanceAsync( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT CreateInstanceEnum( + [in] const BSTR strFilter, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT CreateInstanceEnumAsync( + [in] const BSTR strFilter, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT ExecQuery( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT ExecQueryAsync( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT ExecNotificationQuery( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT ExecNotificationQueryAsync( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT ExecMethod( + [in] const BSTR strObjectPath, + [in] const BSTR strMethodName, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemClassObject *pInParams, + [out] IWbemClassObject **ppOutParams, + [out] IWbemCallResult **ppCallResult); + + HRESULT ExecMethodAsync( + [in] const BSTR strObjectPath, + [in] const BSTR strMethodName, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemClassObject *pInParams, + [in] IWbemObjectSink *pResponseHandler); +}; + +[ + object, + restricted, + uuid(027947e1-d731-11ce-a357-000000000001) +] +interface IEnumWbemClassObject : IUnknown +{ + HRESULT Reset(); + + HRESULT Next( + [in] long lTimeout, + [in] ULONG uCount, + [out, size_is(uCount), length_is(*puReturned)] IWbemClassObject **apObjects, + [out] ULONG *puReturned); + + HRESULT NextAsync( + [in] ULONG uCount, + [in] IWbemObjectSink *pSink); + + HRESULT Clone( + [out] IEnumWbemClassObject **ppEnum); + + HRESULT Skip( + [in] long lTimeout, + [in] ULONG nCount); +};

1 0

Michael Stefaniuc : ole32: Allocate a small temp variable on the stack instead of the heap.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 620ca68d01b3952480172efb94b1612403967ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620ca68d01b3952480172efb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:43:50 2010 +0200 ole32: Allocate a small temp variable on the stack instead of the heap. --- dlls/ole32/ole2.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2b301e4..0829ca1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2530,19 +2530,17 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres2)) { DWORD dwConnection; - FORMATETC *pfe; if (renderopt == OLERENDER_DRAW && !pFormatEtc) { - pfe = HeapAlloc(GetProcessHeap(), 0, sizeof(FORMATETC)); - pfe->cfFormat = 0; - pfe->ptd = NULL; - pfe->dwAspect = DVASPECT_CONTENT; - pfe->lindex = -1; - pfe->tymed = TYMED_NULL; - }else - pfe = pFormatEtc; - hres = IOleCache_Cache(pOleCache, pfe, ADVF_PRIMEFIRST, &dwConnection); - if (!pFormatEtc && pfe) - HeapFree(GetProcessHeap(), 0, pfe); + FORMATETC pfe; + pfe.cfFormat = 0; + pfe.ptd = NULL; + pfe.dwAspect = DVASPECT_CONTENT; + pfe.lindex = -1; + pfe.tymed = TYMED_NULL; + hres = IOleCache_Cache(pOleCache, &pfe, ADVF_PRIMEFIRST, &dwConnection); + } + else + hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); IOleCache_Release(pOleCache); } }

1 0

Michael Stefaniuc : ddraw: Add missing unlock on an error path (Smatch).
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: ef104dc4653af81188edb32371b4eb5b902e2789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef104dc4653af81188edb3237… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:44:14 2010 +0200 ddraw: Add missing unlock on an error path (Smatch). --- dlls/ddraw/ddraw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f3ebade..346c7c5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2947,6 +2947,7 @@ static HRESULT CreateSurface(IDirectDraw7 *iface, if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) { WARN("Application wanted to create back buffer primary surface\n"); + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDCAPS; }

1 0

Michael Stefaniuc : user32: Simplify the error handling in BITMAP_Load().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 5a2cc9410586b32aacdb9a878686b68d96e941ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2cc9410586b32aacdb9a878… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:45:21 2010 +0200 user32: Simplify the error handling in BITMAP_Load(). This fixes a memleak on an error path (Smatch). --- dlls/user32/cursoricon.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 29b9bd2..42bba6d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2291,7 +2291,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfType != 0x4d42 /* 'BM' */) { WARN("Invalid/unsupported bitmap format!\n"); - goto end_close; + goto end; } if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } @@ -2312,7 +2312,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bm_type == -1) { WARN("Invalid bitmap format!\n"); - goto end_close; + goto end; } if(desiredx != 0) @@ -2371,7 +2371,6 @@ end: if (screen_mem_dc) DeleteDC(screen_mem_dc); HeapFree(GetProcessHeap(), 0, scaled_info); HeapFree(GetProcessHeap(), 0, fix_info); -end_close: if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr ); return hbitmap;

1 0

Michael Stefaniuc : crypt32: Remove redundant NULL check before CryptMemFree (Smatch).
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: ef247562914f4d04debf776e0a360949710737ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef247562914f4d04debf776e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:44:02 2010 +0200 crypt32: Remove redundant NULL check before CryptMemFree (Smatch). --- dlls/crypt32/message.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index b57c407..51b874e 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -523,10 +523,9 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, } else ret = FALSE; - if (crlBlob) - CryptMemFree(crlBlob); - if (certBlob) - CryptMemFree(certBlob); + + CryptMemFree(crlBlob); + CryptMemFree(certBlob); if (freeProv) CryptReleaseContext(hCryptProv, 0); return ret;

1 0

Juan Lang : ws2_32: Implement WSAIoctl for SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 9addae9d663ec0cff1e748190c12c4203dbbf5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9addae9d663ec0cff1e748190… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 13:18:12 2010 -0700 ws2_32: Implement WSAIoctl for SIO_ROUTING_INTERFACE_QUERY. --- dlls/ws2_32/socket.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 15 +++------ 2 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f605d0d..22e6138 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3257,6 +3257,86 @@ INT WINAPI WSAIoctl(SOCKET s, release_sock_fd(s, fd); break; } + case WS_SIO_ROUTING_INTERFACE_QUERY: + { + struct WS_sockaddr *daddr = (struct WS_sockaddr *)lpvInBuffer; + struct WS_sockaddr_in *daddr_in = (struct WS_sockaddr_in *)daddr; + struct WS_sockaddr_in *saddr_in = (struct WS_sockaddr_in *)lpbOutBuffer; + MIB_IPFORWARDROW row; + PMIB_IPADDRTABLE ipAddrTable = NULL; + DWORD size, i, found_index; + + TRACE("-> WS_SIO_ROUTING_INTERFACE_QUERY request\n"); + + if (!lpvInBuffer) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (cbInBuffer < sizeof(struct WS_sockaddr)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (!lpbOutBuffer) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (!lpcbBytesReturned) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (daddr->sa_family != AF_INET) + { + FIXME("unsupported address family %d\n", daddr->sa_family); + WSASetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + if (cbOutBuffer < sizeof(struct WS_sockaddr_in)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (GetBestRoute(daddr_in->sin_addr.S_un.S_addr, 0, &row) != NOERROR) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (GetIpAddrTable(NULL, &size, FALSE) != ERROR_INSUFFICIENT_BUFFER) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + ipAddrTable = HeapAlloc(GetProcessHeap(), 0, size); + if (GetIpAddrTable(ipAddrTable, &size, FALSE)) + { + HeapFree(GetProcessHeap(), 0, ipAddrTable); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + for (i = 0, found_index = ipAddrTable->dwNumEntries; + i < ipAddrTable->dwNumEntries; i++) + { + if (ipAddrTable->table[i].dwIndex == row.dwForwardIfIndex) + found_index = i; + } + if (found_index == ipAddrTable->dwNumEntries) + { + ERR("no matching IP address for interface %d\n", + row.dwForwardIfIndex); + HeapFree(GetProcessHeap(), 0, ipAddrTable); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + saddr_in->sin_family = AF_INET; + saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; + saddr_in->sin_port = 0; + *lpcbBytesReturned = sizeof(struct WS_sockaddr_in); + HeapFree(GetProcessHeap(), 0, ipAddrTable); + return 0; + } case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index abe0934..25bda61 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4290,17 +4290,14 @@ static void test_sioRoutingInterfaceQuery(void) } ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, NULL, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT /* Win98 */ || WSAGetLastError() == WSAEINVAL /* NT4 */|| @@ -4310,7 +4307,6 @@ static void test_sioRoutingInterfaceQuery(void) sin.sin_family = AF_INET; ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT /* Win98 */ || WSAGetLastError() == WSAEINVAL), @@ -4318,24 +4314,23 @@ static void test_sioRoutingInterfaceQuery(void) sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEINVAL /* NT4 */ || WSAGetLastError() == WSAEFAULT), "expected WSAEINVAL or WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), &sout, sizeof(sout), &bytesReturned, NULL, NULL); - todo_wine ok(!ret || broken(WSAGetLastError() == WSAEINVAL /* NT4 */), "WSAIoctl failed: %d\n", WSAGetLastError()); if (!ret) { ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", sout.sin_family); - if (sout.sin_family == AF_INET) - ok(sout.sin_addr.s_addr == htonl(INADDR_LOOPBACK), - "expected %08x, got %08x\n", htonl(INADDR_LOOPBACK), - htonl(sout.sin_addr.s_addr)); + /* We expect the source address to be INADDR_LOOPBACK as well, but + * there's no guarantee that a route to the loopback address exists, + * so rather than introduce spurious test failures we do not test the + * source address. + */ } closesocket(sock); }

1 0

Thomas Mullaly : urlmon: Improve IUri support for mk: URIs.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: da1ceb1154eb88ceff1868ec44a4e05e7f3f3d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1ceb1154eb88ceff1868ec4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 27 18:00:21 2010 -0400 urlmon: Improve IUri support for mk: URIs. --- dlls/urlmon/tests/uri.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 ++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3e6f5a8..0453441 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4209,6 +4209,62 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_ABOUT,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "mk:@MSITStore:C:\\Program Files/AutoCAD 2008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",0,S_OK,FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"mk:@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:C:\\Program Files/AutoCAD 2008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",0,S_OK,FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ef66186..2aee38a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3081,6 +3081,11 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len; + } else if(data->scheme_type == URL_SCHEME_MK && *ptr == '\\') { + /* MK URIs don't get '\\' percent encoded. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = *ptr; + ++uri->canon_len; } else { if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len);

1 0

Francois Gouget : ws2_32: Make WS2_AcceptEx() and WS2_GetAcceptExSockaddrs( ) static.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d33ff209b3dd84150a28636b6341e32c835a0d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33ff209b3dd84150a28636b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:39 2010 +0200 ws2_32: Make WS2_AcceptEx() and WS2_GetAcceptExSockaddrs() static. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b01b623..f605d0d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1846,7 +1846,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, /*********************************************************************** * AcceptEx */ -BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, +static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, LPOVERLAPPED overlapped) { @@ -1945,7 +1945,7 @@ BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD des /*********************************************************************** * GetAcceptExSockaddrs */ -void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, +static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, struct WS_sockaddr **local_addr, LPINT local_addr_len, struct WS_sockaddr **remote_addr, LPINT remote_addr_len) {

1 0

Francois Gouget : gameux/tests: Make test_install_uninstall_game() and _isFileExists() static.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 0c7c1de8d77c8db6f5f6fb2da207b9954e9bb127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7c1de8d77c8db6f5f6fb2da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:49 2010 +0200 gameux/tests: Make test_install_uninstall_game() and _isFileExists() static. --- dlls/gameux/tests/gameexplorer.c | 3 ++- dlls/gameux/tests/gamestatistics.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 9ce0e39..ba22256 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -607,7 +607,8 @@ static void test_add_remove_game(void) IGameExplorer_Release(ge); } } -void test_install_uninstall_game(void) + +static void test_install_uninstall_game(void) { static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 29bfcf3..eac4398 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -168,7 +168,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta * TRUE file exists * FALSE file does not exist */ -BOOL _isFileExists(LPCWSTR lpFile) +static BOOL _isFileExists(LPCWSTR lpFile) { HANDLE hFile = CreateFileW(lpFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0

Francois Gouget : mscoree: Make find_mono_dll() static.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 5c046d13d5f47d658cdc0dd2b5b84aa5516f22ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c046d13d5f47d658cdc0dd2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:44 2010 +0200 mscoree: Make find_mono_dll() static. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7cc3887..980bed1 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) +static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0};

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
86
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 September 2010