wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Hugh McMaster : reg: Handle data for REG_DWORD_LITTLE_ENDIAN and REG_DWORD_BIG_ENDIAN.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: b14e1ba801f5a3323c5e88d46a95355372780356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e1ba801f5a3323c5e88d46… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:33 2016 +1100 reg: Handle data for REG_DWORD_LITTLE_ENDIAN and REG_DWORD_BIG_ENDIAN. REG_DWORD_LITTLE_ENDIAN is #define'd as REG_DWORD, so the LITTLE_ENDIAN case is just a comment added for clarity. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 ++ programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index d648cd0..663f835 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -238,6 +238,8 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r break; } case REG_DWORD: + /* case REG_DWORD_LITTLE_ENDIAN: */ + case REG_DWORD_BIG_ENDIAN: /* Yes, this is correct! */ { LPWSTR rest; DWORD val; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index eac5d60..aedca14 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -308,7 +308,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); dword = 456; - verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like * an ordinary REG_DWORD - that is little endian. GG */

1 0

Hugh McMaster : reg: Handle data for REG_EXPAND_SZ.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 03afd26eb1a5583a17736f646af950747d6b9eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03afd26eb1a5583a17736f646… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:32 2016 +1100 reg: Handle data for REG_EXPAND_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + programs/reg/tests/reg.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bc0b261..d648cd0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -230,6 +230,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { case REG_NONE: case REG_SZ: + case REG_EXPAND_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 74284c7..eac5d60 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -186,11 +186,11 @@ static void test_add(void) /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d \"dead^%PATH^%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, TODO_REG_SIZE); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -198,11 +198,11 @@ static void test_add(void) run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, TODO_REG_SIZE); + verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r);

1 0

Hugh McMaster : reg: Handle data from REG_NONE.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: f1d45b5f443624229cc9cd98205cf8b84f94ca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d45b5f443624229cc9cd982… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:31 2016 +1100 reg: Handle data from REG_NONE. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + programs/reg/tests/reg.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e4289f3..bc0b261 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -228,6 +228,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r switch (reg_type) { + case REG_NONE: case REG_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4534f7d..74284c7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -149,7 +149,7 @@ static void test_add(void) /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); - verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE); + verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r);

1 0

Hugh McMaster : reg: Fail if REG_DWORD is passed with no data argument.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 5061899c4614e87eca58dfd7299e5838e9eb7536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5061899c4614e87eca58dfd72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:30 2016 +1100 reg: Fail if REG_DWORD is passed with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 ++++++ programs/reg/tests/reg.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index cc8cac2..e4289f3 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -366,6 +366,12 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, output_message(STRING_UNSUPPORTED_TYPE, type); return 1; } + if (reg_type == REG_DWORD && !data) + { + RegCloseKey(subkey); + output_message(STRING_INVALID_CMDLINE); + return 1; + } if (data) reg_data = get_regdata(data,reg_type,separator,&reg_count); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cdf8359..4534f7d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -257,7 +257,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg: Call RegCloseKey before exiting if the user chooses to cancel the overwriting operation.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e0492b27acf1448eb4006aba74194e49303b2fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0492b27acf1448eb4006aba7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:29 2016 +1100 reg: Call RegCloseKey before exiting if the user chooses to cancel the overwriting operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 63b518f..cc8cac2 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -352,6 +352,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) { + RegCloseKey(subkey); output_message(STRING_CANCELLED); return 0; }

1 0

Stefan Leichter : kernel32: Return a dummy value in GetSystemPreferredUILanguages.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 9cd67d2a5e7a7ad441287e803c166523814e2bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd67d2a5e7a7ad441287e803… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Feb 10 22:46:38 2016 +0100 kernel32: Return a dummy value in GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/locale.c | 10 ---------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d7619db..b499aa5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1053,6 +1053,8 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) */ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) { + LCTYPE type; + int lsize; if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1069,9 +1071,44 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff return FALSE; } - FIXME("(0x%x %p %p %p) stub\n", flags, count, buffer, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); + + if (flags & MUI_LANGUAGE_ID) + type = LOCALE_ILANGUAGE; + else + type = LOCALE_SNAME; + + lsize = GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, NULL, 0); + if (!lsize) + { + /* keep last error from callee */ + return FALSE; + } + lsize++; + if (!*size) + { + *size = lsize; + *count = 1; + return TRUE; + } + + if (lsize > *size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if (!GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, buffer, *size)) + { + /* keep last error from callee */ + return FALSE; + } + + buffer[lsize-1] = 0; + *size = lsize; + *count = 1; + TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size); + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 6726fb9..d49e0d6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4623,10 +4623,8 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); count = 0xdeadbeef; @@ -4657,20 +4655,16 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); /* second parameter @@ -4696,20 +4690,16 @@ static void test_GetSystemPreferredUILanguages(void) size_id = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); count = 0xdeadbeef; size_name = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); size_buffer = max(size_id, size_name);

1 0

Louis Lenders : uxtheme: Fix CloseThemeData with invalid handle value.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 997e2046df8368ab23f87bfa7fa3cb2372a4e000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e2046df8368ab23f87bfa7… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Feb 12 10:51:42 2016 +0100 uxtheme: Fix CloseThemeData with invalid handle value. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8947587..7d07680 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -746,7 +746,7 @@ void WINAPI SetThemeAppProperties(DWORD dwFlags) HRESULT WINAPI CloseThemeData(HTHEME hTheme) { TRACE("(%p)\n", hTheme); - if(!hTheme) + if(!hTheme || hTheme == INVALID_HANDLE_VALUE) return E_HANDLE; return MSSTYLES_CloseThemeClass(hTheme); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 49eba64..4aeedbc 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -541,6 +541,8 @@ static void test_CloseThemeData(void) hRes = pCloseThemeData(NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = pCloseThemeData(INVALID_HANDLE_VALUE); + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } START_TEST(system)

1 0

Pierre Schweitzer : mpr: Partially implement WNetUseConnectionW().
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: d070c263adf840cc14dde84eb8e73b04490d1900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d070c263adf840cc14dde84eb… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Feb 12 14:03:44 2016 +0300 mpr: Partially implement WNetUseConnectionW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 834a826..62e1479 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1582,17 +1582,79 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, LPNETRESOURCEA lpNetResource, /***************************************************************** * WNetUseConnectionW [MPR.@] */ -DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, LPNETRESOURCEW lpNetResource, - LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags, - LPWSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) +DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR password, + LPCWSTR userid, DWORD flags, LPWSTR accessname, DWORD *buffer_size, DWORD *result ) { - FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, - debugstr_w(lpAccessName), lpBufferSize, lpResult ); + WNetProvider *provider; + DWORD index, ret, caps; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", + hwndOwner, resource, password, debugstr_w(userid), flags, + accessname, buffer_size, result ); + + if (!providerTable || providerTable->numProviders == 0) + return WN_NO_NETWORK; + + if (!resource) + return ERROR_INVALID_PARAMETER; + + if (!resource->lpProvider) + { + FIXME("Networking provider selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (!resource->lpLocalName && (flags & CONNECT_REDIRECT)) + { + FIXME("Locale device selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (flags & CONNECT_INTERACTIVE) + return ERROR_BAD_NET_NAME; + + index = _findProviderIndexW(resource->lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; + + provider = &providerTable->table[index]; + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + if (accessname && buffer_size && *buffer_size) + { + DWORD len; + + if (resource->lpLocalName) + len = strlenW(resource->lpLocalName); + else + len = strlenW(resource->lpRemoteName); + + if (++len > *buffer_size) + { + *buffer_size = len; + return ERROR_MORE_DATA; + } + } + else + accessname = NULL; + + ret = WN_ACCESS_DENIED; + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(hwndOwner, resource, (LPWSTR)password, (LPWSTR)userid, flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(resource, (LPWSTR)password, (LPWSTR)userid); + + if (ret == WN_SUCCESS && accessname) + { + if (resource->lpLocalName) + strcpyW(accessname, resource->lpLocalName); + else + strcpyW(accessname, resource->lpRemoteName); + } + + return ret; } /*********************************************************************

1 0

Nikolay Sivov : mpr: Query for NPAddConnection and NPAddConnection3 when loading a provider.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 164fe0470ccf7cb3c0946cbb52d4139aec0c4a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164fe0470ccf7cb3c0946cbb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 12 14:03:43 2016 +0300 mpr: Query for NPAddConnection and NPAddConnection3 when loading a provider. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 01e49e7..834a826 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -56,6 +56,8 @@ typedef struct _WNetProvider PF_NPEnumResource enumResource; PF_NPCloseEnum closeEnum; PF_NPGetResourceInformation getResourceInformation; + PF_NPAddConnection addConnection; + PF_NPAddConnection3 addConnection3; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -162,8 +164,9 @@ static void _tryLoadProvider(PCWSTR provider) if (hLib) { - PF_NPGetCaps getCaps = (PF_NPGetCaps)GetProcAddress(hLib, - "NPGetCaps"); +#define MPR_GETPROC(proc) ((PF_##proc)GetProcAddress(hLib, #proc)) + + PF_NPGetCaps getCaps = MPR_GETPROC(NPGetCaps); TRACE("loaded lib %p\n", hLib); if (getCaps) @@ -182,22 +185,17 @@ static void _tryLoadProvider(PCWSTR provider) if (provider->dwEnumScopes) { TRACE("supports enumeration\n"); - provider->openEnum = (PF_NPOpenEnum) - GetProcAddress(hLib, "NPOpenEnum"); - TRACE("openEnum is %p\n", provider->openEnum); - provider->enumResource = (PF_NPEnumResource) - GetProcAddress(hLib, "NPEnumResource"); - TRACE("enumResource is %p\n", - provider->enumResource); - provider->closeEnum = (PF_NPCloseEnum) - GetProcAddress(hLib, "NPCloseEnum"); - TRACE("closeEnum is %p\n", provider->closeEnum); - provider->getResourceInformation = (PF_NPGetResourceInformation) - GetProcAddress(hLib, "NPGetResourceInformation"); - TRACE("getResourceInformation is %p\n", - provider->getResourceInformation); - if (!provider->openEnum || !provider->enumResource - || !provider->closeEnum) + provider->openEnum = MPR_GETPROC(NPOpenEnum); + TRACE("NPOpenEnum %p\n", provider->openEnum); + provider->enumResource = MPR_GETPROC(NPEnumResource); + TRACE("NPEnumResource %p\n", provider->enumResource); + provider->closeEnum = MPR_GETPROC(NPCloseEnum); + TRACE("NPCloseEnum %p\n", provider->closeEnum); + provider->getResourceInformation = MPR_GETPROC(NPGetResourceInformation); + TRACE("NPGetResourceInformation %p\n", provider->getResourceInformation); + if (!provider->openEnum || + !provider->enumResource || + !provider->closeEnum) { provider->openEnum = NULL; provider->enumResource = NULL; @@ -206,6 +204,10 @@ static void _tryLoadProvider(PCWSTR provider) WARN("Couldn't load enumeration functions\n"); } } + provider->addConnection = MPR_GETPROC(NPAddConnection); + provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + TRACE("NPAddConnection %p\n", provider->addConnection); + TRACE("NPAddConnection3 %p\n", provider->addConnection3); providerTable->numProviders++; } else @@ -215,6 +217,8 @@ static void _tryLoadProvider(PCWSTR provider) HeapFree(GetProcessHeap(), 0, name); FreeLibrary(hLib); } + +#undef MPR_GETPROC } else {

1 0

Aric Stewart : imm32: Detach hMsgBuf when sending messages in ImmGenerateMessage.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e7f725ec5f641fbb425bb44cbfa17b6cd5de5da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f725ec5f641fbb425bb44cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 12 09:31:11 2016 -0600 imm32: Detach hMsgBuf when sending messages in ImmGenerateMessage. The issues is that if a message being sent in ImmGenerateMessage gets turned around and sent into an IME that in response to that message calls ImmGenerateMessage, the hMsgBuf still has the old message in it and it ends up getting processed in a loop again and again. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2d08378..af47470 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2893,15 +2893,23 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) if (data->IMC.dwNumMsgBuf > 0) { LPTRANSMSG lpTransMsg; - DWORD i; + HIMCC hMsgBuf; + DWORD i, dwNumMsgBuf; - lpTransMsg = ImmLockIMCC(data->IMC.hMsgBuf); - for (i = 0; i < data->IMC.dwNumMsgBuf; i++) - ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); - - ImmUnlockIMCC(data->IMC.hMsgBuf); + /* We are going to detach our hMsgBuff so that if processing messages + generates new messages they go into a new buffer */ + hMsgBuf = data->IMC.hMsgBuf; + dwNumMsgBuf = data->IMC.dwNumMsgBuf; + data->IMC.hMsgBuf = ImmCreateIMCC(0); data->IMC.dwNumMsgBuf = 0; + + lpTransMsg = ImmLockIMCC(hMsgBuf); + for (i = 0; i < dwNumMsgBuf; i++) + ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); + + ImmUnlockIMCC(hMsgBuf); + ImmDestroyIMCC(hMsgBuf); } return TRUE;

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
76
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 February 2016