Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 56171: [CRYPTUI] - Properly fix MSVC build...
by rharabien＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: rharabien Date: Fri Mar 16 11:18:42 2012 New Revision: 56171 URL: http://svn.reactos.org/svn/reactos?rev=56171&view=rev Log: [CRYPTUI] - Properly fix MSVC build... Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Fri Mar 16 11:18:42 2012 @@ -9,13 +9,9 @@ list(APPEND SOURCE main.c + cryptui.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptui_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) - -# FIXME: Fix your rc files, Rafal! -if(NOT MSVC) - list(APPEND SOURCE cryptui.rc) -endif() add_library(cryptui SHARED ${SOURCE}) set_module_type(cryptui win32dll) Modified: trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc [iso-8859-1] Fri Mar 16 11:18:42 2012 @@ -77,10 +77,7 @@ IDS_IMPORT_FILTER_CTL "Lista de Certificados ConfiÃ¡veis (*.stl)" IDS_IMPORT_FILTER_SERIALIZED_STORE "Conjunto de Certificados Serializados da Microsoft (*.sst)" IDS_IMPORT_FILTER_CMS "Mensagens CMS/PKCS #7 (*.spc; *.p7b)" - IDS_IMPORT_FILTER_ALL "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Todos os arquivos (*.*)\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Todos os ficheiros (*.*)" + IDS_IMPORT_FILTER_ALL "Todos os ficheiros (*.*)" IDS_IMPORT_EMPTY_FILE "Por favor seleccione um ficheiro." IDS_IMPORT_BAD_FORMAT "O formato do ficheiro nÃ£o Ã© reconhecido. Por favor seleccione outro ficheiro." IDS_IMPORT_OPEN_FAILED "NÃ£o consegui abrir " @@ -141,65 +138,23 @@ IDS_PURPOSE_CTL_USAGE_SIGNING "Permite que assine digitalmente uma lista de certificados confiÃ¡veis" IDS_PURPOSE_EFS "Permite que os dados em disco sejam cifrados" IDS_PURPOSE_EFS_RECOVERY "RecuperaÃ§Ã£o de Ficheiros" - IDS_PURPOSE_WHQL "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -VerificaÃ§Ã£o de Driver de Hardware Windows\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Windows Hardware Driver Verification" - IDS_PURPOSE_NT5 "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -VerificaÃ§Ã£o de Componentes de Sistema Windows\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Windows System Component Verification" - IDS_PURPOSE_OEM_WHQL "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -VerificaÃ§Ã£o de Componentes de Sistema OEM Windows\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -OEM Windows System Component Verification" - IDS_PURPOSE_EMBEDDED_NT "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -VerificaÃ§Ã£o de Componentes de Sistema Windows Embebida\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Embedded Windows System Component Verification" + IDS_PURPOSE_WHQL "Windows Hardware Driver Verification" + IDS_PURPOSE_NT5 "Windows System Component Verification" + IDS_PURPOSE_OEM_WHQL "OEM Windows System Component Verification" + IDS_PURPOSE_EMBEDDED_NT "Embedded Windows System Component Verification" IDS_PURPOSE_ROOT_LIST_SIGNER "Root List Signer" - IDS_PURPOSE_QUALIFIED_SUBORDINATION "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -SubordinaÃ§Ã£o Qualificada\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Qualified Subordination" - IDS_PURPOSE_KEY_RECOVERY "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -RecuperaÃ§Ã£o de chaves\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Key Recovery" - IDS_PURPOSE_DOCUMENT_SIGNING "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Assinatura de Documento\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Document Signing" - IDS_PURPOSE_LIFETIME_SIGNING "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Assinatura de tempo de vida\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Lifetime Signing" - IDS_PURPOSE_DRM "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Direitos Digitais\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Digital Rights" - IDS_PURPOSE_LICENSES "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -LicenÃ§as de Pacotes de Chaves\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Key Pack Licenses" - IDS_PURPOSE_LICENSE_SERVER "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -VerificaÃ§Ã£o de LicenÃ§a de Servidor\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -License Server Verification" - IDS_PURPOSE_ENROLLMENT_AGENT "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Agente de Pedido de Certificados\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Certificate Request Agent" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualified Subordination" + IDS_PURPOSE_KEY_RECOVERY "Key Recovery" + IDS_PURPOSE_DOCUMENT_SIGNING "Document Signing" + IDS_PURPOSE_LIFETIME_SIGNING "Lifetime Signing" + IDS_PURPOSE_DRM "Digital Rights" + IDS_PURPOSE_LICENSES "Key Pack Licenses" + IDS_PURPOSE_LICENSE_SERVER "License Server Verification" + IDS_PURPOSE_ENROLLMENT_AGENT "Certificate Request Agent" IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Logon" IDS_PURPOSE_CA_EXCHANGE "Private Key Archival" - IDS_PURPOSE_KEY_RECOVERY_AGENT "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Agente Recuperador de Chaves\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Key Recovery Agent" - IDS_PURPOSE_DS_EMAIL_REPLICATION "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -ReplicaÃ§Ã£o do DirectÃ³rio de ServiÃ§o Email\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Directory Service Email Replication" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Key Recovery Agent" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication" IDS_EXPORT_WIZARD "Assistente de ExportaÃ§Ã£o de Certificados" IDS_EXPORT_FORMAT_TITLE "Formato de ExportaÃ§Ã£o" IDS_EXPORT_FORMAT_SUBTITLE "Escolha o formato em que o conteÃºdo serÃ¡ guardado."

1 0

[akhaldi] 56170: [CRYPTUI] * Disregard the messed up rc files temporarily for msvc build. Arch, fix your s.it !
by akhaldi＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: akhaldi Date: Fri Mar 16 10:57:44 2012 New Revision: 56170 URL: http://svn.reactos.org/svn/reactos?rev=56170&view=rev Log: [CRYPTUI] * Disregard the messed up rc files temporarily for msvc build. Arch, fix your s.it ! Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Fri Mar 16 10:57:44 2012 @@ -5,15 +5,17 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c - cryptui.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptui_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) + +# FIXME: Fix your rc files, Rafal! +if(NOT MSVC) + list(APPEND SOURCE cryptui.rc) +endif() add_library(cryptui SHARED ${SOURCE}) set_module_type(cryptui win32dll) @@ -32,5 +34,4 @@ kernel32 ntdll) - add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 56169: [AVIFIL32] * Fix build. Really.
by akhaldi＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: akhaldi Date: Fri Mar 16 10:28:32 2012 New Revision: 56169 URL: http://svn.reactos.org/svn/reactos?rev=56169&view=rev Log: [AVIFIL32] * Fix build. Really. Modified: trunk/reactos/dll/win32/avifil32/avifile_Da.rc trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc Modified: trunk/reactos/dll/win32/avifil32/avifile_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Da.rc [iso-8859-1] Fri Mar 16 10:28:32 2012 @@ -27,10 +27,7 @@ IDS_WAVESTREAMFORMAT "Lydkurve: %s" IDS_WAVEFILETYPE "Lydkurve" IDS_ALLMULTIMEDIA "Alle multimedia filer" - IDS_ALLFILES "#-#-#-#-# da.po (Wine) #-#-#-#-#\n\ -Alle filer (*.*)\n\ -#-#-#-#-# da.po (Wine) #-#-#-#-#\n\ -Alle Filer (*.*)" + IDS_ALLFILES "Alle filer (*.*)" IDS_VIDEO "video" IDS_AUDIO "lyd" IDS_AVIFILETYPE "Wine AVI-standard-filehandler" Modified: trunk/reactos/dll/win32/avifil32/avifile_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Hu.rc [iso-8859-1] Fri Mar 16 10:28:32 2012 @@ -27,10 +27,7 @@ IDS_WAVESTREAMFORMAT "HullÃ¡mforma: %s" IDS_WAVEFILETYPE "HullÃ¡mforma" IDS_ALLMULTIMEDIA "Minden multimÃ©dia fÃ¡jl" - IDS_ALLFILES "#-#-#-#-# hu.po (Wine) #-#-#-#-#\n\ -Minden fÃ¡jl (*.*)\n\ -#-#-#-#-# hu.po (Wine) #-#-#-#-#\n\ -Ãsszes fÃ¡jl (*.*)" + IDS_ALLFILES "Minden fÃ¡jl (*.*)" IDS_VIDEO "" IDS_AUDIO "hang" IDS_AVIFILETYPE "Wine AVI-alapÃ©rtelmezett-fÃ¡jlkezelÅ" Modified: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pt.rc [iso-8859-1] Fri Mar 16 10:28:32 2012 @@ -27,10 +27,7 @@ IDS_WAVESTREAMFORMAT "Formato wave: %s" IDS_WAVEFILETYPE "Formato wave" IDS_ALLMULTIMEDIA "Todos os ficheiros multimÃ©dia" - IDS_ALLFILES "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Todos os arquivos (*.*)\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Todos os ficheiros (*.*)" + IDS_ALLFILES "Todos os ficheiros (*.*)" IDS_VIDEO "vÃdeo" IDS_AUDIO "Ã¡udio" IDS_AVIFILETYPE "Manipulador AVI Wine predefinido"

1 0

[pschweitzer] 56168: [SERVICES] Fix handles leaks
by pschweitzer＠svn.reactos.org 16 Mar '12

16 Mar '12

Author: pschweitzer Date: Fri Mar 16 10:27:50 2012 New Revision: 56168 URL: http://svn.reactos.org/svn/reactos?rev=56168&view=rev Log: [SERVICES] Fix handles leaks Modified: trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Fri Mar 16 10:27:50 2012 @@ -260,6 +260,8 @@ DPRINT("CreateNamedPipe() - returning FALSE\n"); return FALSE; } + + CloseHandle(hThread); } else { @@ -316,6 +318,8 @@ return FALSE; } + CloseHandle(hThread); + return TRUE; }

1 0

[rharabien] 56167: - Fix build
by rharabien＠svn.reactos.org 15 Mar '12

15 Mar '12

Author: rharabien Date: Thu Mar 15 22:12:03 2012 New Revision: 56167 URL: http://svn.reactos.org/svn/reactos?rev=56167&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/cryptui/cryptui.rc Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Thu Mar 15 22:12:03 2012 @@ -34,6 +34,9 @@ #include "wine/wine_common_ver.rc" #include "avifile_private.h" +/* UTF-8 */ +#pragma code_page(65001) + /* * Everything specific to any language goes * in one of the specific files. @@ -68,8 +71,6 @@ #ifdef LANGUAGE_TR_TR #include "avifile_Tr.rc" #endif - -/* UTF-8 */ #ifdef LANGUAGE_DA_DK #include "avifile_Da.rc" #endif Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Thu Mar 15 22:12:03 2012 @@ -46,6 +46,9 @@ /* @makedep: certheader.bmp */ IDB_CERT_HEADER BITMAP certheader.bmp +/* UTF-8 */ +#pragma code_page(65001) + #ifdef LANGUAGE_EN_US #include "cryptui_En.rc" #endif @@ -55,8 +58,6 @@ #ifdef LANGUAGE_PL_PL #include "cryptui_Pl.rc" #endif - -/* UTF-8 */ #ifdef LANGUAGE_DE_DE #include "cryptui_De.rc" #endif

1 0

[rharabien] 56166: [CRYPTUI] - Sync to Wine 1.3.37
by rharabien＠svn.reactos.org 15 Mar '12

15 Mar '12

Author: rharabien Date: Thu Mar 15 22:04:51 2012 New Revision: 56166 URL: http://svn.reactos.org/svn/reactos?rev=56166&view=rev Log: [CRYPTUI] - Sync to Wine 1.3.37 Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/cryptui/cryptui_De.rc trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/cryptui_It.rc trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/cryptui_No.rc trunk/reactos/dll/win32/cryptui/cryptui_Pl.rc trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc trunk/reactos/dll/win32/cryptui/cryptui_Uk.rc trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/cryptui/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[rharabien] 56165: [CRYPTUI_WINETEST] - Sync to Wine 1.3.37
by rharabien＠svn.reactos.org 15 Mar '12

15 Mar '12

Author: rharabien Date: Thu Mar 15 22:03:06 2012 New Revision: 56165 URL: http://svn.reactos.org/svn/reactos?rev=56165&view=rev Log: [CRYPTUI_WINETEST] - Sync to Wine 1.3.37 Modified: trunk/rostests/winetests/cryptui/cryptui.c Modified: trunk/rostests/winetests/cryptui/cryptui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/cryptui… ============================================================================== --- trunk/rostests/winetests/cryptui/cryptui.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptui/cryptui.c [iso-8859-1] Thu Mar 15 22:03:06 2012 @@ -344,7 +344,7 @@ /* Brings up UI. Cancelling yields ret = 1. */ if (0) { - ret = pCryptUIWizImport(0, 0, NULL, NULL, NULL); + pCryptUIWizImport(0, 0, NULL, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, NULL, NULL); @@ -528,17 +528,17 @@ store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE | CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); @@ -576,7 +576,7 @@ store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) @@ -599,7 +599,7 @@ ok(count == 0, "expected 0 CRLs, got %d\n", count); } SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -616,7 +616,7 @@ store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) @@ -639,7 +639,7 @@ ok(count == 1, "expected 1 CRL, got %d\n", count); } SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError());

1 0

[jimtabor] 56164: [IMM32_WINETEST] - Sync to Wine 1.4 or Head.
by jimtabor＠svn.reactos.org 15 Mar '12

15 Mar '12

Author: jimtabor Date: Thu Mar 15 21:45:07 2012 New Revision: 56164 URL: http://svn.reactos.org/svn/reactos?rev=56164&view=rev Log: [IMM32_WINETEST] - Sync to Wine 1.4 or Head. Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Thu Mar 15 21:45:07 2012 @@ -573,6 +573,51 @@ ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); } +static void test_ImmGetDescription(void) +{ + HKL hkl; + WCHAR japime[] = { 'E', '0', '0', '1', '0', '4', '1', '1', 0 }; + WCHAR descW[100]; + CHAR descA[100]; + UINT ret, lret; + + /* FIXME: invalid keyboard layouts should not pass */ + ret = ImmGetDescriptionW(NULL, NULL, 0); + todo_wine ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + + /* load a language with valid IMM descriptions */ + hkl = LoadKeyboardLayoutW(japime, KLF_ACTIVATE); + todo_wine ok(hkl != 0, "LoadKeyboardLayoutW failed, expected != 0.\n"); + + ret = ImmGetDescriptionW(hkl, NULL, 0); + if(!ret) + { + win_skip("ImmGetDescriptionW is not working for current loaded keyboard.\n"); + return; + } + + ret = ImmGetDescriptionW(hkl, descW, 0); + ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + + lret = ImmGetDescriptionW(hkl, descW, ret + 1); + ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + lret = ImmGetDescriptionA(hkl, descA, ret + 1); + ok(lret, "ImmGetDescriptionA failed, expected != 0 received 0.\n"); + todo_wine ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + ret /= 2; /* try to copy partially */ + lret = ImmGetDescriptionW(hkl, descW, ret + 1); + ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + ret = ImmGetDescriptionW(hkl, descW, 1); + ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + + UnloadKeyboardLayout(hkl); +} + START_TEST(imm32) { if (init()) { @@ -584,6 +629,7 @@ test_ImmThreads(); test_ImmIsUIMessage(); test_ImmGetContext(); + test_ImmGetDescription(); } cleanup(); }

1 0

[jimtabor] 56163: [IMM32] - Sync to Wine 1.3.37
by jimtabor＠svn.reactos.org 15 Mar '12

15 Mar '12

Author: jimtabor Date: Thu Mar 15 21:42:01 2012 New Revision: 56163 URL: http://svn.reactos.org/svn/reactos?rev=56163&view=rev Log: [IMM32] - Sync to Wine 1.3.37 Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.spec Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Thu Mar 15 21:42:01 2012 @@ -2845,3 +2845,13 @@ FIXME("Stub\n"); return FALSE; } + +/*********************************************************************** + * ImmGetHotKey(IMM32.@) + */ + +BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) +{ + FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); + return FALSE; +} Modified: trunk/reactos/dll/win32/imm32/imm32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm32.spec [iso-8859-1] Thu Mar 15 21:42:01 2012 @@ -39,7 +39,7 @@ @ stdcall ImmGetDescriptionW(long ptr long) @ stdcall ImmGetGuideLineA(long long ptr long) @ stdcall ImmGetGuideLineW(long long ptr long) -@ stub ImmGetHotKey +@ stdcall ImmGetHotKey(long ptr ptr ptr) @ stdcall ImmGetIMCCLockCount(long) @ stdcall ImmGetIMCCSize(long) @ stdcall ImmGetIMCLockCount(long)

1 0

[rharabien] 56162: [AVIFIL32] - Sync to Wine 1.3.37
by rharabien＠svn.reactos.org 15 Mar '12

15 Mar '12

Author: rharabien Date: Thu Mar 15 21:32:52 2012 New Revision: 56162 URL: http://svn.reactos.org/svn/reactos?rev=56162&view=rev Log: [AVIFIL32] - Sync to Wine 1.3.37 Added: trunk/reactos/dll/win32/avifil32/avifile.rgs Removed: trunk/reactos/dll/win32/avifil32/regsvr.c Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Bg.rc trunk/reactos/dll/win32/avifil32/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/avifile_Da.rc trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/avifile_Es.rc trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/avifile_It.rc trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/avifile_Ro.rc trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Sv.rc trunk/reactos/dll/win32/avifil32/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/avifile_Zh.rc trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/extrachunk.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Added: trunk/reactos/dll/win32/avifil32/avifile.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… Removed: trunk/reactos/dll/win32/avifil32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.… Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs