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

Dmitry Timoshkov : kernel32: Add a workaround for broken apps that pass negative values to ReadConsole.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: e03a3fe509d525708556c6f310025db9a8cba279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03a3fe509d525708556c6f31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:09:02 2014 +0900 kernel32: Add a workaround for broken apps that pass negative values to ReadConsole. --- dlls/kernel32/console.c | 12 ++++++++++-- dlls/kernel32/tests/console.c | 10 ++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 9d47bf4..303b638 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -34,6 +34,7 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <limits.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -1614,9 +1615,10 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfC } if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) + { ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL); - - if (lpNumberOfCharsRead) *lpNumberOfCharsRead = ncr; + if (lpNumberOfCharsRead) *lpNumberOfCharsRead = ncr; + } HeapFree(GetProcessHeap(), 0, ptr); return ret; @@ -1637,6 +1639,12 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, TRACE("(%p,%p,%d,%p,%p)\n", hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved); + if (nNumberOfCharsToRead > INT_MAX) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if (!GetConsoleMode(hConsoleInput, &mode)) return FALSE; if ((fd = get_console_bare_fd(hConsoleInput)) != -1) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 52dcaac..5928e8c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2566,8 +2566,6 @@ static void test_ReadConsole(void) ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); -if (0) /* FIXME: uncomment once Wine doesn't hang forever */ -{ bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(std_input, buf, -128, &bytes, NULL); @@ -2580,18 +2578,14 @@ if (0) /* FIXME: uncomment once Wine doesn't hang forever */ ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); - ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes); -} + ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); -if (0) /* FIXME: uncomment once Wine doesn't hang forever */ -{ bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); - ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes); -} + ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); } START_TEST(console)

1 0

Dmitry Timoshkov : ole32: Add support for VT_INT/ VT_UINT to PropVariantClear and PropVariantCopy.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 3cb0c8133680c7e602802d2f34d722defb89ca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb0c8133680c7e602802d2f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:09:26 2014 +0900 ole32: Add support for VT_INT/VT_UINT to PropVariantClear and PropVariantCopy. --- dlls/ole32/ole2.c | 10 ++++++++++ dlls/ole32/tests/propvariant.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 67a17f8..407ae38 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2863,6 +2863,8 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI2: case VT_UI4: case VT_UI8: + case VT_INT: + case VT_UINT: case VT_LPSTR: case VT_LPWSTR: case VT_FILETIME: @@ -2890,6 +2892,8 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI2|VT_VECTOR: case VT_UI4|VT_VECTOR: case VT_UI8|VT_VECTOR: + case VT_INT|VT_VECTOR: + case VT_UINT|VT_VECTOR: case VT_LPSTR|VT_VECTOR: case VT_LPWSTR|VT_VECTOR: case VT_FILETIME|VT_VECTOR: @@ -2936,6 +2940,8 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ case VT_UI2: case VT_UI4: case VT_UI8: + case VT_INT: + case VT_UINT: case VT_FILETIME: break; case VT_STREAM: @@ -3042,6 +3048,8 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ case VT_ERROR: case VT_I8: case VT_UI8: + case VT_INT: + case VT_UINT: case VT_R8: case VT_CY: case VT_DATE: @@ -3110,6 +3118,8 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ case VT_ERROR: elemSize = sizeof(pvarSrc->u.scode); break; case VT_I8: elemSize = sizeof(pvarSrc->u.hVal); break; case VT_UI8: elemSize = sizeof(pvarSrc->u.uhVal); break; + case VT_INT: elemSize = sizeof(pvarSrc->u.lVal); break; + case VT_UINT: elemSize = sizeof(pvarSrc->u.ulVal); break; case VT_CY: elemSize = sizeof(pvarSrc->u.cyVal); break; case VT_DATE: elemSize = sizeof(pvarSrc->u.date); break; case VT_FILETIME: elemSize = sizeof(pvarSrc->u.filetime); break; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 8a6def1..9e0f66b 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -64,8 +64,8 @@ static const struct valid_mapping { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_INT */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_UINT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */

1 0

Dmitry Timoshkov : ole32/tests: Add more tests for PropVariantClear.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 7de7fc653b1eb44d9937f31d037451c8d1048f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de7fc653b1eb44d9937f31d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:09:42 2014 +0900 ole32/tests: Add more tests for PropVariantClear. --- dlls/ole32/tests/propvariant.c | 51 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 9e0f66b..7477b6a 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -184,28 +184,71 @@ static void test_validtypes(void) HRESULT hr; unsigned int i; - memset(&propvar, 0, sizeof(propvar)); + memset(&propvar, 0x55, sizeof(propvar)); + hr = PropVariantClear(&propvar); + ok(hr == STG_E_INVALIDPARAMETER, "expected STG_E_INVALIDPARAMETER, got %08x\n", hr); +todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "expected 0, got %#x/%#x\n", + U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); for (i = 0; i < sizeof(valid_types)/sizeof(valid_types[0]); i++) { VARTYPE vt; + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i; hr = PropVariantClear(&propvar); expect(hr, vt); + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_ARRAY; hr = PropVariantClear(&propvar); expect(hr, vt); - + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_VECTOR; hr = PropVariantClear(&propvar); expect(hr, vt); - + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_BYREF; hr = PropVariantClear(&propvar); expect(hr, vt); - + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); } }

1 0

Dmitry Timoshkov : ole32: PropVariantClear should always reset contents of the passed in PROPVARIANT.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 0946c154fa851c92425e4b90f8951ebb5baba781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0946c154fa851c92425e4b90f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:10:28 2014 +0900 ole32: PropVariantClear should always reset contents of the passed in PROPVARIANT. --- dlls/ole32/ole2.c | 11 ++++++++--- dlls/ole32/tests/propvariant.c | 27 ++++----------------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 407ae38..ed454cd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2919,7 +2919,10 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ hr = PROPVARIANT_ValidateType(pvar->vt); if (FAILED(hr)) + { + memset(pvar, 0, sizeof(*pvar)); return hr; + } switch(pvar->vt) { @@ -3006,12 +3009,14 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ } } else + { WARN("Invalid/unsupported type %d\n", pvar->vt); + hr = STG_E_INVALIDPARAMETER; + } } - ZeroMemory(pvar, sizeof(*pvar)); - - return S_OK; + memset(pvar, 0, sizeof(*pvar)); + return hr; } /*********************************************************************** diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 7477b6a..d8d027f 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -187,9 +187,7 @@ static void test_validtypes(void) memset(&propvar, 0x55, sizeof(propvar)); hr = PropVariantClear(&propvar); ok(hr == STG_E_INVALIDPARAMETER, "expected STG_E_INVALIDPARAMETER, got %08x\n", hr); -todo_wine ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); -todo_wine ok(U(propvar).uhVal.QuadPart == 0, "expected 0, got %#x/%#x\n", U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -202,25 +200,16 @@ todo_wine vt = propvar.vt = i; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); memset(&propvar, 0x55, sizeof(propvar)); U(propvar).pszVal = NULL; - vt = propvar.vt = i | VT_ARRAY; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -229,11 +218,7 @@ todo_wine vt = propvar.vt = i | VT_VECTOR; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -242,11 +227,7 @@ todo_wine vt = propvar.vt = i | VT_BYREF; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); }

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: d01a5533d0838df8490d9b784f3901f703577a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01a5533d0838df8490d9b784… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 15 23:35:38 2014 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 516ad2e..6edb9c0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11737,6 +11737,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Utilitário de Registro de DLL do Wine\n" +"\n" +"Fornece serviços de registro de DLL.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11751,54 +11755,65 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Uso:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] arquivo\n" +"\n" +"Opções:\n" +" [/u] Remove o registro de um servidor.\n" +" [/s] Modo silencioso (nenhuma mensagem será exibida).\n" +" [/i] Executa DllInstall, passando o parâmetro opcional [cmdline].\n" +"\tQuando é usado com [/u] a operação DllInstall é chamada com modo de " +"desinstalação.\n" +" [/n] Não executar DllRegisterServer. Essa opção deve ser usada com [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Parâmetro inválido ou não reconhecido [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Falha ao abrir '%1'\n" +msgstr "regsvr32: Falha ao carregar a DLL '%1'\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 não implementado na DLL '%2'\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao registrar DLL '%1'\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' registrada com sucesso\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao remover o registro da DLL '%1'\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registro da DLL '%1' removido com sucesso\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao instalar DLL '%1'\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' instalada com sucesso\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao desinstalar DLL '%1'\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' desinstalada com sucesso\n" #: start.rc:55 msgid ""

1 0

Hermès Bélusca-Maïto : shell32: Automatically expand CPL applet path string.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: a08160680be1a3164e882fcc41504f115ba62f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08160680be1a3164e882fcc4… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Wed Apr 9 15:27:31 2014 +0200 shell32: Automatically expand CPL applet path string. --- dlls/shell32/control.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index fe392e3..b393154 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -62,6 +62,7 @@ void Control_UnloadApplet(CPlApplet* applet) CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { CPlApplet* applet; + DWORD len; unsigned i; CPLINFO info; NEWCPLINFOW newinfo; @@ -69,21 +70,30 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) return applet; - if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { - WARN("Cannot allocate memory for applet path\n"); + len = ExpandEnvironmentStringsW(cmd, NULL, 0); + if (len > 0) + { + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)))) + { + WARN("Cannot allocate memory for applet path\n"); + goto theError; + } + ExpandEnvironmentStringsW(cmd, applet->cmd, len+1); + } + else + { + WARN("Cannot expand applet path\n"); goto theError; } - lstrcpyW(applet->cmd, cmd); - applet->hWnd = hWnd; - if (!(applet->hModule = LoadLibraryW(cmd))) { - WARN("Cannot load control panel applet %s\n", debugstr_w(cmd)); + if (!(applet->hModule = LoadLibraryW(applet->cmd))) { + WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; } if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) { - WARN("Not a valid control panel applet %s\n", debugstr_w(cmd)); + WARN("Not a valid control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; } if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) {

1 0

Francois Gouget : testbot/testagentd: Fix the buffer reallocation in vformat_msg() on Windows.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: tools Branch: master Commit: 8c824018012b516a30a0094ee781a49ec3b67297 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8c824018012b516a30a0094e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 16 18:34:09 2014 +0200 testbot/testagentd: Fix the buffer reallocation in vformat_msg() on Windows. On Windows vsnprintf() returns -1 if the buffer is too small, which we didn't detect because len was unsigned. --- testbot/src/testagentd/testagentd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 2aec9e9..4bda532 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -136,9 +136,9 @@ static int broken = 0; /* If true, then the server should exit */ static int quit = 0; -static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list valist) +static char* vformat_msg(char** buf, int* size, const char* format, va_list valist) { - unsigned len; + int len; va_list args; len = 1; do @@ -161,7 +161,7 @@ static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list return *buf; } -static char* format_msg(char** buf, unsigned* size, const char* format, ...) +static char* format_msg(char** buf, int* size, const char* format, ...) { va_list valist; va_start(valist, format); @@ -172,7 +172,7 @@ static char* format_msg(char** buf, unsigned* size, const char* format, ...) /* This is a message which indicates the reason for the status */ static char* status_msg = NULL; -static unsigned status_size = 0; +static int status_size = 0; static void vset_status_msg(const char* format, va_list valist) { vformat_msg(&status_msg, &status_size, format, valist); @@ -937,7 +937,7 @@ static void do_getproperties(SOCKET client) { const char* arch; char* buf = NULL; - unsigned size = 0; + int size = 0; if (!expect_list_size(client, 0)) {

1 0

Austin English : index.html: Update 1.6 references to 1.8.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: bugzilla Branch: master Commit: 53d249de3ee25ff2cafa3e6e3bda50300b432fb2 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=53d249de3ee25ff2cafa3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 16 02:39:38 2014 -0700 index.html: Update 1.6 references to 1.8. --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 79344e6..54e9b79 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.6.0&order=bugs.bug_severity">Wine 1.6</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index f1bad5a..a099e31 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,8 +150,8 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.6.0&order=bugs.bug_severity">Wine 1.6</a> - These bugs are scheduled to be fixed before Wine 1.6 is released. + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> + These bugs are scheduled to be fixed before Wine 1.8 is released. </li> <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a>

1 0

Nikolay Sivov : wine.inf: Fix FontCache service registration info.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: cb35df7ee61944adf083543f9872c9e97acbee75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb35df7ee61944adf083543f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 18:13:52 2014 +0400 wine.inf: Fix FontCache service registration info. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 802b0cf..70010dd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3032,7 +3032,7 @@ ErrorControl=1 [FontCacheServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\fntcache.dll" -;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"fontcache" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"fontcache" [TaskSchedulerService] AddReg=TaskSchedulerServiceKeys

1 0

Alexandre Julliard : wrc: Allow specifying the default message font in dialogs by setting DS_SETFONT.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 03167b43698ad49c9c2dd90fb927e96fb3af9aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03167b43698ad49c9c2dd90fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 15 19:50:11 2014 +0200 wrc: Allow specifying the default message font in dialogs by setting DS_SETFONT. --- tools/wrc/genres.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 61b2b29..9cea432 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -682,6 +682,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) } put_string(res, dlg->font->name, str_unicode, TRUE, dlg->lvc.language); } + else if (dlg->style->or_mask & DS_SETFONT) put_word( res, 0x7fff ); put_pad(res); while(ctrl)

1 0