April 2016 - Wine-commits - list.winehq.org

Piotr Caban : gdi32/enhmfdrv: Add ExtTextOut tests with unmatched BeginPath/EndPath calls.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 3a12eb2083cced856f99fd93ab9dc5f3b0f2d5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a12eb2083cced856f99fd93a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:20 2016 +0200 gdi32/enhmfdrv: Add ExtTextOut tests with unmatched BeginPath/EndPath calls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ebe7e02..c61f870 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -240,6 +240,16 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); + /* 4. test with unmatched BeginPath/EndPath calls */ + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = EndPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = ExtTextOutA(hdcMetafile, 0, 60, 0, NULL, text, lstrlenA(text), NULL); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + hFont = SelectObject(hdcMetafile, hFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %d\n", GetLastError());

1 0

Jeremy Newman : fix outdated links in the non-english help pages
by Jeremy Newman 28 Apr '16

28 Apr '16

Module: website Branch: master Commit: 105454a15196779a9af303eeae69d910523f732a URL: http://source.winehq.org/git/website.git/?a=commit;h=105454a15196779a9af303… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 28 14:58:54 2016 -0500 fix outdated links in the non-english help pages --- templates/de/help.template | 6 +++--- templates/fr/help.template | 6 +++--- templates/pl/help.template | 6 +++--- templates/pt/help.template | 6 +++--- templates/tr/help.template | 6 +++--- templates/uk/help.template | 4 ++-- templates/zh-cn/help.template | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=105454a15196779a9a…

1 0

Aurimas Fišeras : kernel32/nls: Update currency for Baltic states.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 4eca454729bfb7764e461267f55915992bfa3773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eca454729bfb7764e461267f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 27 19:10:22 2016 +0300 kernel32/nls: Update currency for Baltic states. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/eti.nls | 6 +++--- dlls/kernel32/nls/lth.nls | 6 +++--- dlls/kernel32/nls/lvi.nls | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls index cd7b3b2..b9cf956 100644 --- a/dlls/kernel32/nls/eti.nls +++ b/dlls/kernel32/nls/eti.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "dets" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Estonia" - LOCALE_SCURRENCY "kr" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "esmaspäev" LOCALE_SDAYNAME2 "teisipäev" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "pühapäev" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Estonia" - LOCALE_SENGCURRNAME "Estonian Kroon" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Estonian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "EEK" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "et-EE" LOCALE_SNATIVECTRYNAME "Eesti" - LOCALE_SNATIVECURRNAME "Kroon" + LOCALE_SNATIVECURRNAME "Euro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "eesti (Eesti)" LOCALE_SNATIVELANGNAME "eesti" diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 7b44d6a..46a766e 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SABBREVMONTHNAME12 "Grd" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Lithuania" - LOCALE_SCURRENCY "Lt" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pirmadienis" LOCALE_SDAYNAME2 "antradienis" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SDAYNAME7 "sekmadienis" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Lithuania" - LOCALE_SENGCURRNAME "Lithuanian Litas" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Lithuanian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "LTL" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "lt-LT" LOCALE_SNATIVECTRYNAME "Lietuva" - LOCALE_SNATIVECURRNAME "Litas" + LOCALE_SNATIVECURRNAME "Euras" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "lietuvių (Lietuva)" LOCALE_SNATIVELANGNAME "lietuvių" diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls index f1dcb2f..8a7a8e7 100644 --- a/dlls/kernel32/nls/lvi.nls +++ b/dlls/kernel32/nls/lvi.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Dec" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Latvia" - LOCALE_SCURRENCY "Ls" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pirmdiena" LOCALE_SDAYNAME2 "otrdiena" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "svētdiena" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Latvia" - LOCALE_SENGCURRNAME "Latvian Lats" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Latvian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "LVL" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "lv-LV" LOCALE_SNATIVECTRYNAME "Latvija" - LOCALE_SNATIVECURRNAME "Lats" + LOCALE_SNATIVECURRNAME "Eiro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "latviešu (Latvija)" LOCALE_SNATIVELANGNAME "latviešu"

1 0

Andrey Gusev : kernel32/nls: Update currency name and fix a typo.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 1a20354ca56484d78884f33e531032329a1fe364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a20354ca56484d78884f33e5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 27 19:39:15 2016 +0300 kernel32/nls: Update currency name and fix a typo. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/ukr.nls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index f61e07b..fa50528 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "неділя" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Ukraine" - LOCALE_SENGCURRNAME "Ukrainian Grivna" + LOCALE_SENGCURRNAME "Ukrainian Hryvnia" LOCALE_SENGLANGUAGE "Ukrainian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "UAH" @@ -127,8 +127,8 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SNATIVECTRYNAME "Україна" LOCALE_SNATIVECURRNAME "гривня" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "україньска (Україна)" - LOCALE_SNATIVELANGNAME "україньска" + LOCALE_SNATIVEDISPLAYNAME "українська (Україна)" + LOCALE_SNATIVELANGNAME "українська" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "UKR " LOCALE_SPOSITIVESIGN ""

1 0

Jacek Caban : wininet: Don' t use INTERNET_MAX_HOST_NAME_LENGTH in InternetGetSecurityInfoByURLW, .
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 72f5c3f2e711f0fe4ff6afa799e1424933d46d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f5c3f2e711f0fe4ff6afa79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 19:19:47 2016 +0200 wininet: Don't use INTERNET_MAX_HOST_NAME_LENGTH in InternetGetSecurityInfoByURLW,. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e82a6a4..6cf890b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4499,23 +4499,28 @@ BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR lpszURL, PCCERT_CHAIN_CONTEXT *p */ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags) { - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; URL_COMPONENTSW url = {sizeof(url)}; server_t *server; - BOOL res = FALSE; + WCHAR *hostname; + BOOL res; TRACE("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); - url.lpszHostName = hostname; - url.dwHostNameLength = sizeof(hostname)/sizeof(WCHAR); - + url.dwHostNameLength = 1; res = InternetCrackUrlW(lpszURL, 0, 0, &url); if(!res || url.nScheme != INTERNET_SCHEME_HTTPS) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE; } + hostname = heap_strndupW(url.lpszHostName, url.dwHostNameLength); + if(!hostname) { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + server = get_server(hostname, url.nPort, TRUE, FALSE); + heap_free(hostname); if(!server) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE;

1 0

Jacek Caban : wininet: Don't use INTERNET_MAX_* macros in parse_proxy_url.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: e0c7741d2257b07cb58ac618e7ae39816fa22d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c7741d2257b07cb58ac618e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 19:20:18 2016 +0200 wininet: Don't use INTERNET_MAX_* macros in parse_proxy_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6cf890b..83919b1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -521,41 +521,32 @@ static void free_global_proxy( void ) static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) { - static const WCHAR fmt[] = {'%','s',':','%','u',0}; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; - URL_COMPONENTSW uc; - - hostname[0] = username[0] = password[0] = 0; - memset( &uc, 0, sizeof(uc) ); - uc.dwStructSize = sizeof(uc); - uc.lpszHostName = hostname; - uc.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - uc.lpszUserName = username; - uc.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - uc.lpszPassword = password; - uc.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + static const WCHAR fmt[] = {'%','.','*','s',':','%','u',0}; + URL_COMPONENTSW uc = {sizeof(uc)}; + + uc.dwHostNameLength = 1; + uc.dwUserNameLength = 1; + uc.dwPasswordLength = 1; if (!InternetCrackUrlW( url, 0, 0, &uc )) return FALSE; - if (!hostname[0]) + if (!uc.dwHostNameLength) { if (!(info->proxy = heap_strdupW( url ))) return FALSE; info->proxyUsername = NULL; info->proxyPassword = NULL; return TRUE; } - if (!(info->proxy = heap_alloc( (strlenW(hostname) + 12) * sizeof(WCHAR) ))) return FALSE; - sprintfW( info->proxy, fmt, hostname, uc.nPort ); + if (!(info->proxy = heap_alloc( (uc.dwHostNameLength + 12) * sizeof(WCHAR) ))) return FALSE; + sprintfW( info->proxy, fmt, uc.dwHostNameLength, uc.lpszHostName, uc.nPort ); - if (!username[0]) info->proxyUsername = NULL; - else if (!(info->proxyUsername = heap_strdupW( username ))) + if (!uc.dwUserNameLength) info->proxyUsername = NULL; + else if (!(info->proxyUsername = heap_strndupW( uc.lpszUserName, uc.dwUserNameLength ))) { heap_free( info->proxy ); return FALSE; } - if (!password[0]) info->proxyPassword = NULL; - else if (!(info->proxyPassword = heap_strdupW( password ))) + if (!uc.dwPasswordLength) info->proxyPassword = NULL; + else if (!(info->proxyPassword = heap_strndupW( uc.lpszPassword, uc.dwPasswordLength ))) { heap_free( info->proxyUsername ); heap_free( info->proxy );

1 0

Jacek Caban : wininet: Don' t use INTERNET_MAX_HOST_NAME_LENGTH in InternetCheckConnectionW.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 8e2586db52ea839e92965be38cab548da5ef74ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2586db52ea839e92965be38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 19:20:39 2016 +0200 wininet: Don't use INTERNET_MAX_HOST_NAME_LENGTH in InternetCheckConnectionW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 83919b1..5359794 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3330,13 +3330,12 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe BOOL rc = FALSE; static const CHAR ping[] = "ping -c 1 "; static const CHAR redirect[] = " >/dev/null 2>/dev/null"; - CHAR *command = NULL; - WCHAR hostW[INTERNET_MAX_HOST_NAME_LENGTH]; - DWORD len; + WCHAR *host; + DWORD len, host_len; INTERNET_PORT port; int status = -1; - FIXME("\n"); + FIXME("(%s %x %x)\n", debugstr_w(lpszUrl), dwFlags, dwReserved); /* * Crack or set the Address @@ -3355,27 +3354,34 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe } else { - URL_COMPONENTSW components; + URL_COMPONENTSW components = {sizeof(components)}; - ZeroMemory(&components,sizeof(URL_COMPONENTSW)); - components.lpszHostName = (LPWSTR)hostW; - components.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + components.dwHostNameLength = 1; if (!InternetCrackUrlW(lpszUrl,0,0,&components)) goto End; - TRACE("host name : %s\n",debugstr_w(components.lpszHostName)); + host = components.lpszHostName; + host_len = components.dwHostNameLength; port = components.nPort; - TRACE("port: %d\n", port); + TRACE("host name: %s port: %d\n",debugstr_wn(host, host_len), port); } if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { struct sockaddr_storage saddr; socklen_t sa_len = sizeof(saddr); + WCHAR *host_z; int fd; + BOOL b; - if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len, NULL)) + host_z = heap_strndupW(host, host_len); + if (!host_z) + return FALSE; + + b = GetAddress(host_z, port, (struct sockaddr *)&saddr, &sa_len, NULL); + heap_free(host_z); + if(!b) goto End; init_winsock(); fd = socket(saddr.ss_family, SOCK_STREAM, 0); @@ -3391,15 +3397,18 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe /* * Build our ping command */ - len = WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, NULL, 0, NULL, NULL); - command = heap_alloc(strlen(ping)+len+strlen(redirect)); - strcpy(command,ping); - WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, command+strlen(ping), len, NULL, NULL); - strcat(command,redirect); + char *command; + + len = WideCharToMultiByte(CP_UNIXCP, 0, host, host_len, NULL, 0, NULL, NULL); + command = heap_alloc(strlen(ping)+len+strlen(redirect)+1); + strcpy(command, ping); + WideCharToMultiByte(CP_UNIXCP, 0, host, host_len, command+sizeof(ping)-1, len, NULL, NULL); + strcpy(command+sizeof(ping)-1+len, redirect); TRACE("Ping command is : %s\n",command); status = system(command); + heap_free( command ); TRACE("Ping returned a code of %i\n",status); @@ -3409,7 +3418,6 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe } End: - heap_free( command ); if (rc == FALSE) INTERNET_SetLastError(ERROR_NOT_CONNECTED);

1 0

Nikolay Sivov : hnetcfg: Claim success in INetFwOpenPorts::Add().
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 65ba59322d0448ebfbdfb3a1b437913cf3aae844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ba59322d0448ebfbdfb3a1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 21:51:36 2016 +0300 hnetcfg: Claim success in INetFwOpenPorts::Add(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 036ecb9..7d74965 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -526,7 +526,7 @@ static HRESULT WINAPI fw_ports_Add( fw_ports *This = impl_from_INetFwOpenPorts( iface ); FIXME("%p, %p\n", This, port); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI fw_ports_Remove(

1 0

Sebastian Lackner : server: Fix detection of duplicate console history lines.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 152b00b20f09062a97cf0f05d8bad84cc56a02f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b00b20f09062a97cf0f05d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 04:23:26 2016 +0200 server: Fix detection of duplicate console history lines. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index efb20da..4d275f0 100644 --- a/server/console.c +++ b/server/console.c @@ -1055,7 +1055,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA ptr[len] = 0; if (console->history_mode && console->history_index && - strncmpW( console->history[console->history_index - 1], ptr, len ) == 0) + !strcmpW( console->history[console->history_index - 1], ptr )) { /* ok, mode ask us to not use twice the same string... * so just free mem and returns

1 0

Austin English : kernel32: Add FreeUserPhysicalPages stub.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: b0ce049cbbfecf747ffab6815bccbd59a20a2130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce049cbbfecf747ffab6815… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 28 05:41:38 2016 +0200 kernel32: Add FreeUserPhysicalPages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-2.spec | 4 ++-- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index cf10c20..2ad54b7 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -1,6 +1,6 @@ -@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) kernel32.AllocateUserPhysicalPages +@ stdcall AllocateUserPhysicalPages(long ptr ptr) kernel32.AllocateUserPhysicalPages @ stub AllocateUserPhysicalPagesNuma -@ stub FreeUserPhysicalPages +@ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages @ stub GetMemoryErrorHandlingCapabilities @ stub MapUserPhysicalPages @ stub RegisterBadMemoryNotification diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index eeed785..fffd0e4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI AllocateUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PT SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *userarray) +{ + FIXME("stub: %p %p %p\n", process, pages, userarray); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 71dbe4d..ec7155b6e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -154,7 +154,7 @@ @ stdcall AllocConsole() @ stub -i386 AllocLSCallback @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback -@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) +@ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @@ -535,7 +535,7 @@ @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback -@ stub FreeUserPhysicalPages +@ stdcall FreeUserPhysicalPages(long ptr ptr) @ stub FreeVirtualBuffer @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress

1 0