September 2016 - Wine-Commits

Alexandre Julliard : kernel32: Avoid getting the heap lock inside an exception handler block.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 5d12f6377c38dc48862e730d86498a13fc62712f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d12f6377c38dc48862e730d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 20:48:49 2016 +0900 kernel32: Avoid getting the heap lock inside an exception handler block. In case of a caught exception the lock is not released. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 49cb027..6c64d57 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -557,7 +557,7 @@ HGLOBAL WINAPI GlobalHandle( /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* will fail. */ if (ISPOINTER(pmem)) { - if (HeapValidate( GetProcessHeap(), 0, pmem )) { + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) { handle = (HGLOBAL)pmem; /* valid fixed block */ break; } @@ -569,8 +569,8 @@ HGLOBAL WINAPI GlobalHandle( maybe_intern = HANDLE_TO_INTERN( handle ); if (maybe_intern->Magic == MAGIC_GLOBAL_USED) { test = maybe_intern->Pointer; - if (HeapValidate( GetProcessHeap(), 0, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ - HeapValidate( GetProcessHeap(), 0, maybe_intern )) /* intern valid arena? */ + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ + HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ break; /* valid moveable block */ } handle = 0; @@ -749,7 +749,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) hreturned = 0; if(ISPOINTER(hmem)) /* POINTER */ { - if(!HeapFree(GetProcessHeap(), 0, hmem)) + if(!HeapFree(GetProcessHeap(), HEAP_NO_SERIALIZE, hmem)) { SetLastError(ERROR_INVALID_HANDLE); hreturned = hmem; @@ -769,9 +769,9 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) /* SetLastError(ERROR_INVALID_HANDLE); */ if(pintern->Pointer) - if(!HeapFree(GetProcessHeap(), 0, (char *)(pintern->Pointer)-HGLOBAL_STORAGE)) + if(!HeapFree(GetProcessHeap(), HEAP_NO_SERIALIZE, (char *)(pintern->Pointer)-HGLOBAL_STORAGE)) hreturned=hmem; - if(!HeapFree(GetProcessHeap(), 0, pintern)) + if(!HeapFree(GetProcessHeap(), HEAP_NO_SERIALIZE, pintern)) hreturned=hmem; } else

1 0

Alexandre Julliard : kernel32: GMEM_FIXED blocks cannot be 0 size.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: cf9f185901f5f0718e6e59e3ad3545f4b497e622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9f185901f5f0718e6e59e3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 20:48:08 2016 +0900 kernel32: GMEM_FIXED blocks cannot be 0 size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 16 +++++++++++----- dlls/kernel32/tests/heap.c | 13 +++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index fffd0e4..49cb027 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -362,7 +362,7 @@ HGLOBAL WINAPI GlobalAlloc( if((flags & GMEM_MOVEABLE)==0) /* POINTER */ { - palloc=HeapAlloc(GetProcessHeap(), hpflags, size); + palloc = HeapAlloc( GetProcessHeap(), hpflags, max( 1, size )); TRACE( "(flags=%04x) returning %p\n", flags, palloc ); return palloc; } @@ -961,10 +961,16 @@ SIZE_T WINAPI GlobalCompact( DWORD minfree ) * Windows memory management does not provide a separate local heap * and global heap. */ -HLOCAL WINAPI LocalAlloc( - UINT flags, /* [in] Allocation attributes */ - SIZE_T size /* [in] Number of bytes to allocate */ -) { +HLOCAL WINAPI LocalAlloc( UINT flags, SIZE_T size ) +{ + /* LocalAlloc allows a 0-size fixed block, but GlobalAlloc doesn't */ + if (!(flags & LMEM_MOVEABLE)) + { + DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; + void *ret = HeapAlloc( GetProcessHeap(), heap_flags, size ); + TRACE( "(flags=%04x) returning %p\n", flags, ret ); + return ret; + } return GlobalAlloc( flags, size ); } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index b656dc2..2f7edc8 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -306,6 +306,12 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } + gbl = GlobalAlloc( GMEM_FIXED, 0 ); + SetLastError(0xdeadbeef); + size = GlobalSize( gbl ); + ok( size == 1, "wrong size %lu\n", size ); + GlobalFree( gbl ); + /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); @@ -438,6 +444,13 @@ static void test_heap(void) broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %d\n", GetLastError()); LocalFree(gbl); + gbl = LocalAlloc( LMEM_FIXED, 0 ); + SetLastError(0xdeadbeef); + size = LocalSize( gbl ); + ok( !size || broken(size == 1), /* vistau64 */ + "wrong size %lu\n", size ); + LocalFree( gbl ); + /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n");

1 0

Bruno Jesus : dinput: Remove trailing space from debug string.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 80fca2d86d2dfb8de9493736955e190b43ba7859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80fca2d86d2dfb8de94937369… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 12 16:07:57 2016 -0300 dinput: Remove trailing space from debug string. Spotted by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 98ab273..2933eb1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -195,7 +195,7 @@ static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion) } else { switch (dwDevType) { case DI8DEVCLASS_ALL: return "All devices"; - case DI8DEVCLASS_POINTER : return "DI8DEVCLASS_POINTER "; + case DI8DEVCLASS_POINTER: return "DI8DEVCLASS_POINTER"; case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD"; case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE"; case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL";

1 0

Sebastian Lackner : dinput: Use variable of correct type to store HRESULT value.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 2a5f05e3160489a8d9ab09030523904186aa7e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5f05e3160489a8d9ab09030… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 09:02:36 2016 +0200 dinput: Use variable of correct type to store HRESULT value. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2933eb1..06af92f 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -393,7 +393,8 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( IDirectInputImpl *This = impl_from_IDirectInput7A(iface); DIDEVICEINSTANCEA devInstance; unsigned int i; - int j, r; + int j; + HRESULT r; TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion),

1 0

André Hentschel : setupapi/tests: Try to delete pre-existing key.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 55efd7cfe4dc665963f84dd8d0fc32da7cf2c683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55efd7cfe4dc665963f84dd8d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 12 19:29:15 2016 +0200 setupapi/tests: Try to delete pre-existing key. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b6439d5..4c2fd58 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -451,7 +451,6 @@ static void testCreateDeviceInfo(void) DWORD i; static GUID deadbeef = {0xdeadbeef, 0xdead, 0xbeef, {0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; - LONG res; HKEY key; static const WCHAR bogus0000[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -459,8 +458,13 @@ static void testCreateDeviceInfo(void) 'L','E','G','A','C','Y','_','B','O','G','U','S','\\','0','0','0','0',0}; /* So we know we have a clean start */ - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus0000, &key); - ok(res != ERROR_SUCCESS, "Expected key to not exist\n"); + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus0000, &key)) + { + trace("Expected LEGACY_BOGUS\\0000 key to not exist, will be removed now\n"); + change_reg_permissions(bogus0000); + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus0000), "Could not delete LEGACY_BOGUS\\0000 key\n"); + } + /* No GUID given */ SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL,

1 0

Sebastian Lackner : oledlg: Properly use SUCCEEDED macro to check HRESULT.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 3a9907cfdc355d30f71d82d638325eb68c90a2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9907cfdc355d30f71d82d63… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 09:05:19 2016 +0200 oledlg: Properly use SUCCEEDED macro to check HRESULT. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/insobjdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 159f12b..7cbea4e 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -480,7 +480,7 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo) WideCharToMultiByte(CP_ACP, 0, wcsFile, -1, pdlgInfo->lpOleUIInsertObject->lpszFile, pdlgInfo->lpOleUIInsertObject->cchFile, NULL, NULL); - if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid))) + if (SUCCEEDED(hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid))) { if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATEFILEOBJECT) {

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 5b4541231d526c468b232d93ab52dcca610ed744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4541231d526c468b232d93a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 13 01:13:01 2016 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 117 ++++++++++++++++++++---------------------------------------- 1 file changed, 38 insertions(+), 79 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index f34f87b..3f356b0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2964,7 +2964,7 @@ msgstr "Reiniciar" #: dinput.rc:51 msgid "Player" -msgstr "Tocador" +msgstr "Jogador" #: dinput.rc:52 winecfg.rc:89 msgid "Device" @@ -7469,16 +7469,12 @@ msgid "&Convert..." msgstr "&Converter..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objeto" +msgstr "%1 %2 &Objeto" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objeto" +msgstr "%1 &Objeto" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8598,58 +8594,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Ocultar" +msgstr "Ocultar %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Outro" +msgstr "Esconder Outras" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Mostrar" +msgstr "Mostrar Todas" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Sair de %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Sair" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Janela" +msgstr "Janela" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Minimizar" +msgstr "Minimizar" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Mais zoom" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Modo de Tela Cheia" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "&Trazer para a Frente" +msgstr "Trazer Tudo Para Frente" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -11646,122 +11628,103 @@ msgid "The operation completed successfully\n" msgstr "A operação foi completada com sucesso\n" #: reg.rc:40 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Erro: Nome de chave inválido\n" +msgstr "reg: Nome de chave inválido\n" #: reg.rc:41 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Erro: Parâmetros da linha de comandos inválidos\n" +msgstr "reg: Parâmetros da linha de comandos inválidos\n" #: reg.rc:42 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Erro: Não foi possível acessar a máquina remota\n" +msgstr "reg: Não foi possível acessar a máquina remota\n" #: reg.rc:43 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" msgstr "" -"Erro: O sistema foi incapaz de encontrar a chave de registo ou valor " +"reg: O sistema foi incapaz de encontrar a chave de registo ou valor " "especificado\n" #: reg.rc:44 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Erro: Tipo não suportado.\n" +msgstr "reg: Tipo de dado de registro não suportado [%1].\n" #: reg.rc:45 msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" +msgstr "reg: A opção [/d] precisa ser seguida de um inteiro válido\n" #: reg.rc:46 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: A opção [/d] precisa ser seguida de um valor hexadecimal válido\n" #: reg.rc:47 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: Tipo de dado de registro não suportado [/t 0x%1!x!, /d %2]\n" #: reg.rc:48 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "O arquivo especificado já existe. Deseja substituí-lo?" +msgstr "O valor do registro '%1' já existe. Deseja sobrescrevê-lo?" #: reg.rc:52 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "A operação de registro foi cancelada\n" #: reg.rc:53 regedit.rc:204 msgid "(Default)" msgstr "(Padrão)" #: reg.rc:54 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Tem certeza que deseja excluir estes valores?" +msgstr "Tem certeza que deseja excluir o valor do registro '%1'?" #: reg.rc:55 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Tem certeza que deseja excluir o valor '%s'?" +msgstr "Tem certeza que deseja excluir todos os valores em '%1'?" #: reg.rc:56 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Você tem certeza que deseja excluir '%1'?" +msgstr "Você tem certeza que deseja excluir a chave de registro '%1'?" #: reg.rc:57 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: A opção [/d] precisa ser seguida de uma string válida\n" #: reg.rc:58 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Não foi possível remover todos os valores de registro em '%1'. Um erro " +"inesperado aconteceu.\n" #: reg.rc:59 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: Não foi possível completar a operação especificada. Um erro inesperado " +"aconteceu.\n" #: reg.rc:60 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Busca terminada. Número de ocorrências encontradas: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "Erro: Nome de chave inválido\n" +msgstr "reg: Sintaxe inválida. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: Opção inválida [%1].\n" +msgstr "reg: Opção inválida [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Digite \"REG /?\" para ajuda.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Digite \"REG %1 /?\" para ajuda.\n" #: reg.rc:65 regedit.rc:205 msgid "(value not set)" @@ -13358,10 +13321,8 @@ msgstr "" "configurações globais ou por aplicativo também nessas abas." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." -msgstr "&Adicionar aplicativo..." +msgstr "Adicionar apli&cativo..." #: winecfg.rc:160 msgid "&Remove application" @@ -13596,10 +13557,8 @@ msgid "Select the Unix target directory, please." msgstr "Por favor, selecione o diretório Unix alvo." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "&Ocultar" +msgstr "&Ocultar Avançado" #: winecfg.rc:39 msgid "(No Theme)"

1 0

Alexandre Julliard : user32/tests: Add more tests for clipboard data storage.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 0b95237677fa66740258296d9a95bbb54eacb811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b95237677fa66740258296d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 20:41:03 2016 +0900 user32/tests: Add more tests for clipboard data storage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 154 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b95237677fa667402582…

1 0

Sebastian Lackner : joy.cpl: Use variable of correct type to store LSTATUS value.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 1224bfaa35a6f9e4fbb99cfe3ffd1deb6e1a8ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1224bfaa35a6f9e4fbb99cfe3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 09:03:17 2016 +0200 joy.cpl: Use variable of correct type to store LSTATUS value. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index b5a55fa..fbf6135 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -234,7 +234,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; DWORD values = 0; - HRESULT hr; + LSTATUS status; DWORD i; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -248,9 +248,9 @@ static void initialize_disabled_joysticks_list(HWND hwnd) DWORD name_len = MAX_PATH, data_len = MAX_PATH; WCHAR buf_name[MAX_PATH + 9], buf_data[MAX_PATH]; - hr = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); + status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (SUCCEEDED(hr) && !lstrcmpW(disabled_str, buf_data)) + if (status == ERROR_SUCCESS && !lstrcmpW(disabled_str, buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); }

1 0

Sebastian Lackner : wbemprox: Do not return error in HRESULT functions.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 9429c1a2ecd20b70185620d26057281daceef8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9429c1a2ecd20b70185620d26… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 09:03:57 2016 +0200 wbemprox: Do not return error in HRESULT functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 7544c3c..9232db7 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -115,7 +115,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT if (!(strings[i] = SysAllocString( buf ))) { for (i--; i >= 0; i--) SysFreeString( strings[i] ); - hr = ERROR_OUTOFMEMORY; + hr = E_OUTOFMEMORY; break; } i++; @@ -220,7 +220,7 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI if (!(value_names[i] = SysAllocString( buf ))) { for (i--; i >= 0; i--) SysFreeString( value_names[i] ); - hr = ERROR_OUTOFMEMORY; + hr = E_OUTOFMEMORY; break; } i++;

1 0