June 2010 - Wine-Commits - list.winehq.org

Michael Stefaniuc : start: One language specifier in the English resource is enough.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: b8489d5f33c049e6ea9523bbea26695e8a60b456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8489d5f33c049e6ea9523bbe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 27 22:51:06 2010 +0200 start: One language specifier in the English resource is enough. Also fix a strange indentation. --- programs/start/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/En.rc b/programs/start/En.rc index 463b6c2..3b9fa39 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -23,9 +23,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STRING_USAGE, "Start a program, or open a document in the program normally used for files with that suffix.\n\ +STRING_USAGE, "Start a program, or open a document in the program normally used for files with that suffix.\n\ Usage:\n\ start [options] program_filename [...]\n\ start [options] document_filename\n\

1 0

Igor Paliychuk : crypt32: Ukrainian translation update.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: e9c90a6fee097f7d6525c6e69307ecf402af9705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c90a6fee097f7d6525c6e69… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jun 27 21:54:02 2010 +0300 crypt32: Ukrainian translation update. --- dlls/crypt32/crypt32_Uk.rc | 80 ++++++++++++++++++++++---------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/crypt32/crypt32_Uk.rc b/dlls/crypt32/crypt32_Uk.rc index d26a456..c21d274 100644 --- a/dlls/crypt32/crypt32_Uk.rc +++ b/dlls/crypt32/crypt32_Uk.rc @@ -32,7 +32,7 @@ STRINGTABLE DISCARDABLE { IDS_AUTHORITY_KEY_ID "Authority Key Identifier" IDS_KEY_ATTRIBUTES "Властивості Ключа" - IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction" + IDS_KEY_USAGE_RESTRICTION "Обмеження використання ключа" IDS_SUBJECT_ALT_NAME "Subject Alternative Name" IDS_ISSUER_ALT_NAME "Issuer Alternative Name" IDS_BASIC_CONSTRAINTS "Основні Обмеження" @@ -47,13 +47,13 @@ STRINGTABLE DISCARDABLE IDS_NEXT_UPDATE_LOCATION "Next Update Location" IDS_YES_OR_NO_TRUST "Yes or No Trust" IDS_EMAIL_ADDRESS "Адреса Ел. Пошти" - IDS_UNSTRUCTURED_NAME "Unstructured Name" + IDS_UNSTRUCTURED_NAME "Неструктурована назва" IDS_CONTENT_TYPE "Тип Вмісту" IDS_MESSAGE_DIGEST "Message Digest" IDS_SIGNING_TIME "Час Входу" IDS_COUNTER_SIGN "Counter Sign" IDS_CHALLENGE_PASSWORD "Challenge Password" - IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" + IDS_UNSTRUCTURED_ADDRESS "Неструктурована адреса" IDS_SMIME_CAPABILITIES "SMIME Capabilities" IDS_PREFER_SIGNED_DATA "Prefer Signed Data" IDS_CPS "CPS" @@ -93,9 +93,9 @@ STRINGTABLE DISCARDABLE IDS_PRINCIPAL_NAME "Principal Name" IDS_WINDOWS_PRODUCT_UPDATE "Windows Product Update" IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair" - IDS_OS_VERSION "OS Version" + IDS_OS_VERSION "Версія OS" IDS_ENROLLMENT_CSP "Enrollment CSP" - IDS_CRL_NUMBER "CRL Number" + IDS_CRL_NUMBER "Номер CRL" IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator" IDS_ISSUING_DIST_POINT "Issuing Distribution Point" IDS_FRESHEST_CRL "Freshest CRL" @@ -106,13 +106,13 @@ STRINGTABLE DISCARDABLE IDS_APPLICATION_POLICIES "Application Policies" IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings" IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints" - IDS_CMC_DATA "CMC Data" + IDS_CMC_DATA "Дані CMC" IDS_CMC_RESPONSE "CMC Response" IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request" IDS_CMC_STATUS_INFO "CMC Status Info" - IDS_CMC_EXTENSIONS "CMC Extensions" - IDS_CMC_ATTRIBUTES "CMC Attributes" - IDS_PKCS_7_DATA "PKCS 7 Data" + IDS_CMC_EXTENSIONS "Розширення CMC" + IDS_CMC_ATTRIBUTES "Властивості CMC" + IDS_PKCS_7_DATA "PKCS 7 Дані" IDS_PKCS_7_SIGNED "PKCS 7 Signed" IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped" IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped" @@ -134,7 +134,7 @@ STRINGTABLE DISCARDABLE IDS_RECIPIENT_NONCE "Recipient Nonce" IDS_REG_INFO "Reg Info" IDS_GET_CERTIFICATE "Get Certificate" - IDS_GET_CRL "Get CRL" + IDS_GET_CRL "Отримати CRL" IDS_REVOKE_REQUEST "Revoke Request" IDS_QUERY_PENDING "Query Pending" IDS_SORTED_CTL "Certificate Trust List" @@ -185,17 +185,17 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDS_KEY_ID "KeyID=" + IDS_KEY_ID "ID Ключа=" IDS_CERT_ISSUER "Certificate Issuer" - IDS_CERT_SERIAL_NUMBER "Certificate Serial Number=" + IDS_CERT_SERIAL_NUMBER "Серійний номер сертифікату=" IDS_ALT_NAME_OTHER_NAME "Інше Ім'я=" IDS_ALT_NAME_RFC822_NAME "Адреса Ел. Пошти=" - IDS_ALT_NAME_DNS_NAME "DNS Name=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory Address" + IDS_ALT_NAME_DNS_NAME "Назва DNS=" + IDS_ALT_NAME_DIRECTORY_NAME "Адреса каталогу" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "IP Адреса=" IDS_ALT_NAME_MASK "Маска=" - IDS_ALT_NAME_REGISTERED_ID "Registered ID=" + IDS_ALT_NAME_REGISTERED_ID "Зареєстрований ID=" IDS_USAGE_UNKNOWN "Unknown Key Usage" IDS_SUBJECT_TYPE "Subject Type=" IDS_SUBJECT_TYPE_CA "CA" @@ -204,44 +204,44 @@ STRINGTABLE DISCARDABLE IDS_PATH_LENGTH_NONE "None" IDS_INFO_NOT_AVAILABLE "Information Not Available" IDS_AIA "Authority Info Access" - IDS_ACCESS_METHOD "Access Method=" + IDS_ACCESS_METHOD "Метод доступу=" IDS_ACCESS_METHOD_OCSP "OCSP" IDS_ACCESS_METHOD_CA_ISSUERS "CA Issuers" - IDS_ACCESS_METHOD_UNKNOWN "Unknown Access Method" - IDS_ACCESS_LOCATION "Alternative Name" + IDS_ACCESS_METHOD_UNKNOWN "Невідомий метод доступу" + IDS_ACCESS_LOCATION "Альтернативна назва" IDS_CRL_DIST_POINT "CRL Distribution Point" IDS_CRL_DIST_POINT_NAME "Distribution Point Name" - IDS_CRL_DIST_POINT_FULL_NAME "Full Name" - IDS_CRL_DIST_POINT_RDN_NAME "RDN Name" + IDS_CRL_DIST_POINT_FULL_NAME "Повна назва" + IDS_CRL_DIST_POINT_RDN_NAME "Назва RDN" IDS_CRL_DIST_POINT_REASON "CRL Reason=" IDS_CRL_DIST_POINT_ISSUER "CRL Issuer" IDS_REASON_KEY_COMPROMISE "Key Compromise" IDS_REASON_CA_COMPROMISE "CA Compromise" IDS_REASON_AFFILIATION_CHANGED "Affiliation Changed" - IDS_REASON_SUPERSEDED "Superseded" - IDS_REASON_CESSATION_OF_OPERATION "Operation Ceased" + IDS_REASON_SUPERSEDED "Замінено" + IDS_REASON_CESSATION_OF_OPERATION "Операція зупинена" IDS_REASON_CERTIFICATE_HOLD "Certificate Hold" IDS_FINANCIAL_CRITERIA "Фінансові Дані=" - IDS_FINANCIAL_CRITERIA_AVAILABLE "Available" - IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Not Available" - IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria=" - IDS_YES "Yes" - IDS_NO "No" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Доступно" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Недоступно" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Відповідає критеріям=" + IDS_YES "Так" + IDS_NO "Ні" IDS_DIGITAL_SIGNATURE "Цифровий Підпис" - IDS_NON_REPUDIATION "Non-Repudiation" - IDS_KEY_ENCIPHERMENT "Key Encipherment" - IDS_DATA_ENCIPHERMENT "Data Encipherment" - IDS_KEY_AGREEMENT "Key Agreement" - IDS_CERT_SIGN "Certificate Signing" - IDS_OFFLINE_CRL_SIGN "Off-line CRL Signing" - IDS_CRL_SIGN "CRL Signing" - IDS_ENCIPHER_ONLY "Encipher Only" - IDS_DECIPHER_ONLY "Decipher Only" - IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentication" - IDS_NETSCAPE_SSL_SERVER "SSL Server Authentication" + IDS_NON_REPUDIATION "Без відмови" + IDS_KEY_ENCIPHERMENT "Шифрування ключа" + IDS_DATA_ENCIPHERMENT "Шифрування даних" + IDS_KEY_AGREEMENT "Ключова угода" + IDS_CERT_SIGN "Підписання сертифікату" + IDS_OFFLINE_CRL_SIGN "Офлайн підписання CRL" + IDS_CRL_SIGN "Підписання CRL" + IDS_ENCIPHER_ONLY "Лише зашифр." + IDS_DECIPHER_ONLY "Лише розшифр." + IDS_NETSCAPE_SSL_CLIENT "Ідентифікація клієнта SSL" + IDS_NETSCAPE_SSL_SERVER "Ідентифікація сервера SSL" IDS_NETSCAPE_SMIME "S/MIME" - IDS_NETSCAPE_SIGN "Signature" + IDS_NETSCAPE_SIGN "Підпис" IDS_NETSCAPE_SSL_CA "SSL CA" IDS_NETSCAPE_SMIME_CA "S/MIME CA" - IDS_NETSCAPE_SIGN_CA "Signature CA" + IDS_NETSCAPE_SIGN_CA "Підпис CA" }

1 0

Igor Paliychuk : mshtml: Ukrainian translation update.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: 181d70ed4f927e5cc314b230d8132be4fafea6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181d70ed4f927e5cc314b230d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jun 27 21:21:42 2010 +0300 mshtml: Ukrainian translation update. --- dlls/mshtml/Uk.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/Uk.rc b/dlls/mshtml/Uk.rc index 5e11b4d..ef3a8fb 100644 --- a/dlls/mshtml/Uk.rc +++ b/dlls/mshtml/Uk.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "HTML rendering is currently disabled." + IDS_HTMLDISABLED "В даний момент відображення HTML вимкнено." IDS_HTMLDOCUMENT "Документ HTML" IDS_DOWNLOADING "Завантаження..." IDS_INSTALLING "Встановлення..." @@ -34,11 +34,11 @@ STRINGTABLE DISCARDABLE ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko Installer" +CAPTION "Встановлювач Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine не може знайти пакунок Gecko, який потрібний для додатків embedding HTML " \ - "для коректної роботи. Wine може автоматично завантажити та встановити його для Вас.\n\n" \ + LTEXT "Wine не може знайти пакунок Gecko, який потрібний для коректної роботи додатків " \ + "з підтримкою HTML. Wine може автоматично завантажити та встановити його для Вас.\n\n" \ "Зауважте: Рекомендується використати пакет з вашого дистрибутиву. Детальніше читайте http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Прогрес", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12

1 0

André Hentschel : kernel32: Add NERR_UserNotFound to german winerr.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: 74532c50096d518f1028a569d45d1bd6dcbfda6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74532c50096d518f1028a569d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 27 20:32:26 2010 +0200 kernel32: Add NERR_UserNotFound to german winerr. --- dlls/kernel32/nls/winerr_deu.mc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index 8b1d75a..478f29b 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -3729,3 +3729,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED Language=DEU RPC_S_GRP_ELT_NOT_REMOVED . +MessageId=2221 +SymbolicName=NERR_UserNotFound +Language=DEU +Der Benutzername konnte nicht gefunden werden +.

1 0

Eric Pouech : dbghelp: Test validity of COFF symbol table against file size (and not image size).
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: d97e6a47e59feae67f1e54654e24546d3f01fcc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97e6a47e59feae67f1e54654… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 26 22:54:01 2010 +0200 dbghelp: Test validity of COFF symbol table against file size (and not image size). --- dlls/dbghelp/pe_module.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 7f20ea8..a46193c 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -177,17 +177,17 @@ unsigned pe_get_map_size(const struct image_section_map* ism) * Checks whether the PointerToSymbolTable and NumberOfSymbols in file_header contain * valid information. */ -static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping) +static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping, DWORD64 sz) { DWORD64 offset; - /* is the iSym table inside file image ? */ + /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */ offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; - offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); - if (offset > (DWORD64)nthdr->OptionalHeader.SizeOfImage) return FALSE; - /* is string table (following iSym table) inside file image ? */ + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD); + if (offset > sz) return FALSE; + /* is string table (following iSym table) inside file size ? */ offset += *(DWORD*)((const char*)mapping + offset); - return offset <= (DWORD64)nthdr->OptionalHeader.SizeOfImage; + return offset <= sz; } /****************************************************************** @@ -228,7 +228,9 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) { - if (pe_is_valid_pointer_table(nthdr, mapping)) + LARGE_INTEGER li; + + if (GetFileSizeEx(file, &li) && pe_is_valid_pointer_table(nthdr, mapping, li.QuadPart)) { /* FIXME ugly: should rather map the relevant content instead of copying it */ const char* src = (const char*)mapping + @@ -243,6 +245,7 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } else { + WARN("Bad coff table... wipping out\n"); /* we have bad information here, wipe it out */ fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0;

1 0

Igor Paliychuk : cryptdlg: Ukrainian translation update.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: bbfbea77c717c4f21994c5df5f9e05d09365d60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfbea77c717c4f21994c5df5… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jun 27 14:51:50 2010 +0300 cryptdlg: Ukrainian translation update. --- dlls/cryptdlg/cryptdlg_Uk.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Uk.rc b/dlls/cryptdlg/cryptdlg_Uk.rc index d90226f..dc14749 100644 --- a/dlls/cryptdlg/cryptdlg_Uk.rc +++ b/dlls/cryptdlg/cryptdlg_Uk.rc @@ -28,15 +28,15 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_CERT_POLICY "Certificate Policy" - IDS_POLICY_ID "Policy Identifier: " - IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" - IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" + IDS_CERT_POLICY "Політика сертифікату" + IDS_POLICY_ID "Ідентифікатор політики: " + IDS_POLICY_QUALIFIER_INFO "Інформація про вказівник політики" + IDS_POLICY_QUALIFIER_ID "Id вказівника політики=" IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "User Notice" - IDS_QUALIFIER "Qualifier" - IDS_NOTICE_REF "Notice Reference" + IDS_USER_NOTICE "Повідомлення користувача" + IDS_QUALIFIER "Визначник" + IDS_NOTICE_REF "Посилання повідомлення" IDS_ORGANIZATION "Організація=" - IDS_NOTICE_NUM "Notice Number=" - IDS_NOTICE_TEXT "Notice Text=" + IDS_NOTICE_NUM "Номер повідомлення=" + IDS_NOTICE_TEXT "Текст повідомлення=" }

1 0

Eric Pouech : dbghelp: Fix the localization of section table while loading COFF information.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: 1f5ff75107e73e6432cddf83215dae79660b23d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5ff75107e73e6432cddf832… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 26 22:53:55 2010 +0200 dbghelp: Fix the localization of section table while loading COFF information. --- dlls/dbghelp/pe_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index cd2f248..7f20ea8 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -409,7 +409,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) isym = (const IMAGE_SYMBOL*)((const char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); /* FIXME: no way to get strtable size */ strtable = (const char*)&isym[numsym]; - sect = IMAGE_FIRST_SECTION(&fmap->u.pe.ntheader); + sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping)); for (i = 0; i < numsym; i+= naux, isym += naux) {

1 0

Austin English : ntoskrnl.exe: Add stub for MmAllocateContiguousMemorySpecifyCache:.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: 77f4c853f90e79935a5cf1e2b8b177ad70fafc6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f4c853f90e79935a5cf1e2b… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 27 03:45:48 2010 -0500 ntoskrnl.exe: Add stub for MmAllocateContiguousMemorySpecifyCache:. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c22b81a..7823f73 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1275,6 +1275,19 @@ PVOID WINAPI MmAllocateContiguousMemory( SIZE_T size, PHYSICAL_ADDRESS highest_v } /*********************************************************************** + * MmAllocateContiguousMemorySpecifyCache (NTOSKRNL.EXE.@) + */ +PVOID WINAPI MmAllocateContiguousMemorySpecifyCache( SIZE_T size, + PHYSICAL_ADDRESS lowest_valid_address, + PHYSICAL_ADDRESS highest_valid_address, + PHYSICAL_ADDRESS BoundaryAddressMultiple, + MEMORY_CACHING_TYPE CacheType ) +{ + FIXME(": stub\n"); + return NULL; +} + +/*********************************************************************** * MmAllocatePagesForMdl (NTOSKRNL.EXE.@) */ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS highaddress, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e6db4f7..0a816ab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -656,7 +656,7 @@ @ stub MmAdjustWorkingSetSize @ stub MmAdvanceMdl @ stdcall MmAllocateContiguousMemory(long double) -@ stub MmAllocateContiguousMemorySpecifyCache +@ stdcall MmAllocateContiguousMemorySpecifyCache(long double double double long) @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) @ stdcall MmAllocatePagesForMdl(double double double long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index baede35..3fa355f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1035,6 +1035,16 @@ typedef struct _KUSER_SHARED_DATA { } DUMMYUNIONNAME; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; +typedef enum _MEMORY_CACHING_TYPE { + MmNonCached = 0, + MmCached = 1, + MmWriteCombined = 2, + MmHardwareCoherentCached = 3, + MmNonCachedUnordered = 4, + MmUSWCCached = 5, + MmMaximumCacheType = 6 +} MEMORY_CACHING_TYPE; + typedef enum _MM_SYSTEM_SIZE { MmSmallSystem,

1 0

Piotr Caban : msxml3: Fix illegal memory access.
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: a42a0917cd47113b810165a7f1a4551211a56025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42a0917cd47113b810165a7f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 27 15:21:28 2010 +0200 msxml3: Fix illegal memory access. --- dlls/msxml3/saxreader.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a3de757..eca9f1d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1111,7 +1111,8 @@ static void libxmlEndElementNS( end = (xmlChar*)This->pParserCtxt->input->cur; if(*(end-1) != '>' || *(end-2) != '/') - while(*(end-2)!='<' && *(end-1)!='/') end--; + while(end-2>=This->pParserCtxt->input->base + && *(end-2)!='<' && *(end-1)!='/') end--; update_position(This, end); @@ -1268,7 +1269,8 @@ static void libxmlComment(void *ctx, const xmlChar *value) HRESULT hr; xmlChar *beg = (xmlChar*)This->pParserCtxt->input->cur; - while(memcmp(beg-4, "<!--", sizeof(char[4]))) beg--; + while(beg-4>=This->pParserCtxt->input->base + && memcmp(beg-4, "<!--", sizeof(char[4]))) beg--; update_position(This, beg); if(!This->vbInterface && !This->saxreader->lexicalHandler) return; @@ -1345,7 +1347,8 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) BSTR Chars; BOOL lastEvent = FALSE, change; - while(memcmp(beg-9, "<![CDATA[", sizeof(char[9]))) beg--; + while(beg-9>=This->pParserCtxt->input->base + && memcmp(beg-9, "<![CDATA[", sizeof(char[9]))) beg--; update_position(This, beg); if(This->vbInterface && This->saxreader->vblexicalHandler)

1 0

Eric Pouech : dbghelp: Ensure we can try to load COFF symbols if none is found in other debug formats .
by Alexandre Julliard June 28, 2010

June 28, 2010

Module: wine Branch: master Commit: 3ced7b8f40a767ebd4df3b2fce6bfe08b170004d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ced7b8f40a767ebd4df3b2fc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 26 22:54:07 2010 +0200 dbghelp: Ensure we can try to load COFF symbols if none is found in other debug formats. --- dlls/dbghelp/dwarf.c | 7 +++---- dlls/dbghelp/pe_module.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6daf7d7..4d7ec0d 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3077,10 +3077,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, struct module_format* dwarf2_modfmt; if (!dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect)) - { - /* no Dwarf debug info here, so there's no error */ - return TRUE; - } + /* no Dwarf debug info here */ + return FALSE; + dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index a46193c..18cec9a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -183,8 +183,8 @@ static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */ offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; - offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD); - if (offset > sz) return FALSE; + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + if (offset + sizeof(DWORD) > sz) return FALSE; /* is string table (following iSym table) inside file size ? */ offset += *(DWORD*)((const char*)mapping + offset); return offset <= sz;

1 0