December 2013 - Wine-commits

Bruno Jesus : ws2_32: Cope with invalid hints in getaddrinfo/GetAddrInfoW.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 719715c77426c7cb759a012d24f898622db5db6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=719715c77426c7cb759a012d2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 30 23:45:07 2013 -0200 ws2_32: Cope with invalid hints in getaddrinfo/GetAddrInfoW. --- dlls/ws2_32/socket.c | 46 +++++++++++---- dlls/ws2_32/tests/sock.c | 142 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 171 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=719715c77426c7cb759a0…

1 0

Frédéric Delanoy : urlmon/tests: Constify some character strings.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: e4c76bb3ca024b8596aa57802a8dc1c58ed6a650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c76bb3ca024b8596aa57802… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 31 03:00:43 2013 +0100 urlmon/tests: Constify some character strings. --- dlls/urlmon/tests/protocol.c | 2 +- dlls/urlmon/tests/url.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 7ba375b..25f78d0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1819,7 +1819,7 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocolEx *iface, case 1: { IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; - static WCHAR header[] = {'?',0}; + static const WCHAR header[] = {'?',0}; hres = IInternetProtocolSink_QueryInterface(binding_sink, &IID_IServiceProvider, (void**)&service_provider); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8fae051..83c5c8d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -967,7 +967,7 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, case 1: { IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; - static WCHAR header[] = {'?',0}; + static const WCHAR header[] = {'?',0}; hres = IInternetProtocolSink_QueryInterface(protocol_sink, &IID_IServiceProvider, (void**)&service_provider);

1 0

Frédéric Delanoy : user32/tests: Constify some character strings.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 5e94a5d4c9c6d40c2bb939d5925c8def613bddfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e94a5d4c9c6d40c2bb939d59… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 31 03:00:44 2013 +0100 user32/tests: Constify some character strings. --- dlls/user32/tests/dde.c | 14 +++++++------- dlls/user32/tests/static.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 4a50c39..3824081 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2397,8 +2397,8 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV char str[MAX_PATH]; static int msg_index = 0; static HCONV conversation = 0; - static char test_service [] = "TestDDEService"; - static char test_topic [] = "TestDDETopic"; + static const char test_service [] = "TestDDEService"; + static const char test_topic [] = "TestDDETopic"; msg_index++; @@ -2586,10 +2586,10 @@ static void test_end_to_end_client(BOOL type_a) HSZ server, topic; HCONV hconv; HDDEDATA hdata; - static char test_service[] = "TestDDEService"; - static WCHAR test_service_w[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; - static char test_topic[] = "TestDDETopic"; - static WCHAR test_topic_w[] = {'T','e','s','t','D','D','E','T','o','p','i','c',0}; + static const char test_service[] = "TestDDEService"; + static const WCHAR test_service_w[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; + static const char test_topic[] = "TestDDETopic"; + static const WCHAR test_topic_w[] = {'T','e','s','t','D','D','E','T','o','p','i','c',0}; trace("Start end to end client %s\n", type_a ? "ASCII" : "UNICODE"); @@ -2651,7 +2651,7 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) BOOL ret; DWORD res; HDDEDATA hdata; - static CHAR test_service[] = "TestDDEService"; + static const char test_service[] = "TestDDEService"; trace("start end to end server %s\n", type_a ? "ASCII" : "UNICODE"); server_pid = 0; diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 51d2bc3..d4aa9b1 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -119,7 +119,7 @@ static void test_updates(int style, int flags) START_TEST(static) { - static char szClassName[] = "testclass"; + static const char szClassName[] = "testclass"; WNDCLASSEXA wndclass; wndclass.cbSize = sizeof(wndclass);

1 0

Frédéric Delanoy : version/tests: Constify some character strings.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: b1fd27eb2d4ad9aa4ae50167ce10ae920e7857fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fd27eb2d4ad9aa4ae50167c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 31 03:00:45 2013 +0100 version/tests: Constify some character strings. --- dlls/version/tests/info.c | 2 +- dlls/version/tests/install.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index aa1982c..e66c9ee 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -204,7 +204,7 @@ static void test_info(void) VS_FIXEDFILEINFO *pFixedVersionInfo; UINT uiLength; char VersionString[MAX_PATH]; - static CHAR backslash[] = "\\"; + static const char backslash[] = "\\"; DWORDLONG dwlVersion; hdl = 0x55555555; diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index 6faeaba..9b84dce 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -34,9 +34,9 @@ static void test_find_file(void) char filename[MAX_PATH]; char outBuf[MAX_PATH]; char windir[MAX_PATH]; - static CHAR empty[] = "", - regedit[] = "regedit", - regedit_exe[] = "regedit.exe"; + static const char empty[] = "", + regedit[] = "regedit", + regedit_exe[] = "regedit.exe"; memset(appdir, 0, MAX_PATH); memset(windir, 0, MAX_PATH);

1 0

Frédéric Delanoy : winhttp/tests: Constify a character string.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: e7f8e9e81d7777f38d987626dd2707b293020b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f8e9e81d7777f38d987626d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 31 03:00:46 2013 +0100 winhttp/tests: Constify a character string. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e073e6a..255eb09 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -292,7 +292,7 @@ static void test_SendRequest (void) static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; static CHAR post_data[] = "mode=Test"; - static CHAR test_post[] = "mode => Test\\0\n"; + static const char test_post[] = "mode => Test\\0\n"; header_len = -1L; total_len = optional_len = sizeof(post_data);

1 0

Frédéric Delanoy : wininet/tests: Constify some character strings.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 0e7e87875ca480057cb8d35ff6832a7c3b93dc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7e87875ca480057cb8d35ff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 31 03:00:47 2013 +0100 wininet/tests: Constify some character strings. --- dlls/wininet/tests/http.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 951460f..2f9c36c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2330,13 +2330,13 @@ static void test_proxy_direct(int port) DWORD r, sz, error; char buffer[0x40], *url; WCHAR bufferW[0x40]; + static const char url_fmt[] = "http://test.winehq.org:%u/test2"; static CHAR username[] = "mike", password[] = "1101", - useragent[] = "winetest", - url_fmt[] = "http://test.winehq.org:%u/test2"; - static WCHAR usernameW[] = {'m','i','k','e',0}, - passwordW[] = {'1','1','0','1',0}, - useragentW[] = {'w','i','n','e','t','e','s','t',0}; + useragent[] = "winetest"; + static const WCHAR usernameW[] = {'m','i','k','e',0}, + passwordW[] = {'1','1','0','1',0}, + useragentW[] = {'w','i','n','e','t','e','s','t',0}; /* specify proxy type without the proxy and bypass */ SetLastError(0xdeadbeef); @@ -2675,8 +2675,8 @@ done: static void test_header_handling_order(int port) { - static char authorization[] = "Authorization: Basic dXNlcjpwd2Q="; - static char connection[] = "Connection: Close"; + static const char authorization[] = "Authorization: Basic dXNlcjpwd2Q="; + static const char connection[] = "Connection: Close"; static const char *types[2] = { "*", NULL }; HINTERNET session, connect, request;

1 0

Nikolay Sivov : ole32: Call moniker methods with proper wrappers.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: f041c2c5549e6a24c73004180d29fe327b058441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f041c2c5549e6a24c73004180… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 31 13:12:21 2013 +0400 ole32: Call moniker methods with proper wrappers. --- dlls/ole32/classmoniker.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 0c7e751..89c7297 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -119,20 +119,6 @@ static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface) } /****************************************************************************** - * ClassMoniker_Destroy (local function) - *******************************************************************************/ -static HRESULT ClassMoniker_Destroy(ClassMoniker* This) -{ - TRACE("(%p)\n",This); - - if (This->pMarshal) IUnknown_Release(This->pMarshal); - - HeapFree(GetProcessHeap(),0,This); - - return S_OK; -} - -/****************************************************************************** * ClassMoniker_Release ******************************************************************************/ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) @@ -145,7 +131,11 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) ref = InterlockedDecrement(&This->ref); /* destroy the object if there are no more references to it */ - if (ref == 0) ClassMoniker_Destroy(This); + if (ref == 0) + { + if (This->pMarshal) IUnknown_Release(This->pMarshal); + HeapFree(GetProcessHeap(),0,This); + } return ref; } @@ -277,7 +267,7 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, VOID** ppvResult) { TRACE("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); - return ClassMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); + return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); } /****************************************************************************** @@ -294,7 +284,7 @@ static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface, if (!ppmkReduced) return E_POINTER; - ClassMoniker_AddRef(iface); + IMoniker_AddRef(iface); *ppmkReduced = iface; @@ -600,7 +590,7 @@ static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); - return ClassMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); + return IMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } /*********************************************************************** @@ -612,7 +602,7 @@ static ULONG WINAPI ClassMonikerROTData_AddRef(IROTData *iface) TRACE("(%p)\n",iface); - return ClassMoniker_AddRef(&This->IMoniker_iface); + return IMoniker_AddRef(&This->IMoniker_iface); } /*********************************************************************** @@ -624,7 +614,7 @@ static ULONG WINAPI ClassMonikerROTData_Release(IROTData* iface) TRACE("(%p)\n",iface); - return ClassMoniker_Release(&This->IMoniker_iface); + return IMoniker_Release(&This->IMoniker_iface); } /****************************************************************************** @@ -874,9 +864,10 @@ static const IClassFactoryVtbl ClassMonikerCFVtbl = ClassMonikerCF_CreateInstance, ClassMonikerCF_LockServer }; -static const IClassFactoryVtbl *ClassMonikerCF = &ClassMonikerCFVtbl; + +static IClassFactory ClassMonikerCF = { &ClassMonikerCFVtbl }; HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) { - return IClassFactory_QueryInterface((IClassFactory *)&ClassMonikerCF, riid, ppv); + return IClassFactory_QueryInterface(&ClassMonikerCF, riid, ppv); }

1 0

Nikolay Sivov : include: Added IQueryCancelAutoPlay definition.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 6fa197f5374cc9c61d52f5b6d0fb67348659327c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa197f5374cc9c61d52f5b6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 31 13:12:48 2013 +0400 include: Added IQueryCancelAutoPlay definition. --- include/shobjidl.idl | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e129371..8fe87b7 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3308,6 +3308,19 @@ interface ICustomDestinationList : IUnknown HRESULT AbortList(); } +[ + uuid(ddefe873-6997-4e68-be26-39b633adbe12), + object, + pointer_default(unique) +] +interface IQueryCancelAutoPlay : IUnknown +{ + HRESULT AllowAutoPlay([in, string] LPCWSTR path, + [in] DWORD content_type, + [in, string] LPCWSTR label, + [in] DWORD serial_number); +} + /***************************************************************************** * ShellObjects typelibrary */ @@ -3396,4 +3409,12 @@ library ShellObjects { interface IEnumObjects; } + + [ + uuid(331f1768-05a9-4ddd-b86e-dae34ddc998a) + ] + coclass QueryCancelAutoPlay + { + interface IQueryCancelAutoPlay; + } }

1 0

Nikolay Sivov : shell32: Implement SHCreateQueryCancelAutoPlayMoniker() with some tests.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 3cd677958c8deefe457eeb5e305701bf4a4adf95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd677958c8deefe457eeb5e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 31 13:13:15 2013 +0400 shell32: Implement SHCreateQueryCancelAutoPlayMoniker() with some tests. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellole.c | 11 ++ dlls/shell32/tests/shellole.c | 326 +++++++++++++++++++++++++++++++++++++++++ include/shlobj.h | 1 + 4 files changed, 339 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd677958c8deefe457ee…

1 0

Ken Thomases : winemac: Defer adjusting window levels while the process is hidden.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 6447e8e75cd8eb7b50b385d1b98b2f9ae76e4b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6447e8e75cd8eb7b50b385d1b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 31 01:05:05 2013 -0600 winemac: Defer adjusting window levels while the process is hidden. While the process is hidden, it can't get a list of its windows which would be visible were it not hidden. --- dlls/winemac.drv/cocoa_app.m | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c31bceb..17644d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -488,8 +488,8 @@ int macdrv_err_on; - (void) adjustWindowLevels:(BOOL)active { - NSArray* windowNumbers = [NSWindow windowNumbersWithOptions:0]; - NSMutableArray* wineWindows = [[NSMutableArray alloc] initWithCapacity:[windowNumbers count]]; + NSArray* windowNumbers; + NSMutableArray* wineWindows; NSNumber* windowNumber; NSUInteger nextFloatingIndex = 0; __block NSInteger maxLevel = NSIntegerMin; @@ -497,6 +497,11 @@ int macdrv_err_on; __block WineWindow* prev = nil; WineWindow* window; + if ([NSApp isHidden]) return; + + windowNumbers = [NSWindow windowNumbersWithOptions:0]; + wineWindows = [[NSMutableArray alloc] initWithCapacity:[windowNumbers count]]; + // For the most part, we rely on the window server's ordering of the windows // to be authoritative. The one exception is if the "floating" property of // one of the windows has been changed, it may be in the wrong level and thus @@ -2127,6 +2132,11 @@ int macdrv_err_on; [self releaseMouseCapture]; } + - (void) applicationDidUnhide:(NSNotification*)aNotification + { + [self adjustWindowLevels]; + } + - (BOOL) applicationShouldHandleReopen:(NSApplication*)theApplication hasVisibleWindows:(BOOL)flag { // Note that "flag" is often wrong. WineWindows are NSPanels and NSPanels

1 0