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

Michael Stefaniuc : start: Add the Romanian translation.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 1f244ce0c59ddb0d3018a7cc5d666dca0a20f053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f244ce0c59ddb0d3018a7cc5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 27 22:50:47 2010 +0200 start: Add the Romanian translation. Translation by Claudia Cotună, reviewed by Alexandru Băluț. --- programs/start/Makefile.in | 1 + programs/start/Ro.rc | 73 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index d8848a1..ae92b04 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Tr.rc diff --git a/programs/start/Ro.rc b/programs/start/Ro.rc new file mode 100644 index 0000000..6f058fd --- /dev/null +++ b/programs/start/Ro.rc @@ -0,0 +1,73 @@ +/* + * Start + * + * Copyright 2003 Dan Kegel + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ +STRING_USAGE, "Lansați un program sau deschideți un document în programul utilizat\n\ +de obicei pentru fișierele cu acel sufix.\n\ +Utilizare:\n\ +start [opțiuni] cale_program [...]\n\ +start [opțiuni] cale_document\n\ +\n\ +Opțiuni:\n\ +/M[inimizat] Pornește programul minimizat.\n\ +/MAX[imizat] Pornește programul maximizat.\n\ +/R[estaurat] Pornește programul normal (nici minimizat, nici maximizat).\n\ +/W Așteaptă ca programul pornit să termine, apoi ieși din el\n\ +\ cu codul său de ieșire.\n\ +/Unix Utilizează un nume de fișier Unix și pornește fișierul ca\n\ +\ windows explorer.\n\ +/ProgIDOpen Deschide un document utilizând următorul progID.\n\ +/L Afișează licența utilizatorului final.\n\ +\n\ +start.exe versiunea 0.2 Drepturi de autor (C) 2003, Dan Kegel\n\ +Start nu implică ABSOLUT NICIO GARANȚIE; pentru detalii, alegeți opțiunea /L.\n\ +Acesta este un software liber și îl puteți redistribui în anumite condiții;\n\ +executați „start /L” pentru detalii.\n" + +STRING_LICENSE, "start.exe versiunea 0.2 Drepturi de autor (C) 2003, Dan Kegel\n\ +Acest program este un software liber; îl puteți redistribui și/sau\n\ +modifica respectând termenii GNU Lesser Public License așa cum este\n\ +publicată de către Free Software Foundation; fie versiunea 2.1\n\ +a Licenței, fie (la alegere) orice versiune mai recentă.\n\ +\n\ +Acest program este distribuit cu speranța că va fi util,\n\ +dar FĂRĂ NICIO GARANȚIE; nici măcar cu garanția implicită de\n\ +VANDABILITATE sau POTRIVIRE PENTRU UN ANUMIT SCOP. Consultați\n\ +GNU Lesser Public License pentru mai multe detalii.\n\ +\n\ +Ar fi trebuit să primiți o copie a GNU Lesser Public License\n\ +împreună cu acest program; dacă nu, scrieți la Free Software\n\ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ +\n\ +Consultați fișierul COPYING.LIB pentru informații despre licență.\n" + +STRING_EXECFAIL, "Aplicația nu a putut fi pornită sau nu există nici o aplicație asociată\ncu fișierul specificat. ShellExecuteEx a eșuat" + +STRING_UNIXFAIL "Nu a putut fi tradus numele de fișier Unix specificat într-un nume de fișier DOS." +}

1 0

Michael Stefaniuc : start: One language specifier in the English resource is enough.
by Alexandre Julliard 28 Jun '10

28 Jun '10

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

Alexandre Julliard : atl: Fix off-by-one buffer allocation.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: f71c4113bc33fd738ce493d021694f166d2ed27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71c4113bc33fd738ce493d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 11:44:40 2010 +0200 atl: Fix off-by-one buffer allocation. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 70c1384..7076e35 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -549,7 +549,7 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, new_rep = HeapAlloc(GetProcessHeap(), 0, sizeof(rep_list)); new_rep->key_len = lstrlenW(Key); - new_rep->key = HeapAlloc(GetProcessHeap(), 0, new_rep->key_len*sizeof(OLECHAR)+1); + new_rep->key = HeapAlloc(GetProcessHeap(), 0, (new_rep->key_len + 1) * sizeof(OLECHAR)); memcpy(new_rep->key, Key, (new_rep->key_len+1)*sizeof(OLECHAR)); len = lstrlenW(item)+1;

1 0

Alexandre Julliard : msvcrt: Use the correct strdup function for locale data.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: c5e88a3a69adf6b2bcd32b070dbf168bc83707d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e88a3a69adf6b2bcd32b070… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 11:45:01 2010 +0200 msvcrt: Use the correct strdup function for locale data. --- dlls/msvcrt/locale.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 393a23d..06c8da1 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -741,7 +741,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) return NULL; } } else - loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = _strdup("C"); if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp; @@ -783,7 +783,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lc_clike = 1; loc->locinfo->mb_cur_max = 1; loc->locinfo->pctype = MSVCRT__ctype+1; - loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = _strdup("C"); } for(i=0; i<256; i++) @@ -988,7 +988,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lconv->p_sign_posn = 127; loc->locinfo->lconv->n_sign_posn = 127; - loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = _strdup("C"); } if(lcid[MSVCRT_LC_NUMERIC] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) { @@ -1055,7 +1055,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lconv->thousands_sep[0] = '\0'; loc->locinfo->lconv->grouping[0] = '\0'; - loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = _strdup("C"); } if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { @@ -1064,7 +1064,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) return NULL; } } else - loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = _strdup("C"); return loc; }

1 0

Eric Pouech : dbghelp: Fix the localization of section table while loading COFF information.
by Alexandre Julliard 28 Jun '10

28 Jun '10

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

Eric Pouech : dbghelp: Test validity of COFF symbol table against file size (and not image size).
by Alexandre Julliard 28 Jun '10

28 Jun '10

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

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

28 Jun '10

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

Jaroslav Šmíd : hhctrl.ocx: Make sure pszCaption and pszFile are never 0.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 5b7bd76086e94ca3fb9cfb7c308d334ae35ee9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7bd76086e94ca3fb9cfb7c3… Author: Jaroslav Šmíd <jardasmid(a)gmail.com> Date: Sat Jun 26 22:24:04 2010 +0200 hhctrl.ocx: Make sure pszCaption and pszFile are never 0. --- dlls/hhctrl.ocx/chm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 4c85bd9..f0452fa 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) info->WinType.pszIndex = strdupW(null); info->WinType.fsValidMembers=0; info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; - info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); + info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); info->WinType.dwStyles=WS_POPUP; info->WinType.dwExStyles=0; info->WinType.nShowState=SW_SHOW; - info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic); + info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); info->WinType.curNavType=HHWIN_NAVTYPE_TOC; return TRUE; }

1 0

Austin English : setupapi: Add stubs for SetupDiBuildDriverInfoList and SetupDiDeleteDeviceInfo:.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: dab1bbef29c84d11d07b80f5262d70689c216366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab1bbef29c84d11d07b80f52… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 27 03:44:44 2010 -0500 setupapi: Add stubs for SetupDiBuildDriverInfoList and SetupDiDeleteDeviceInfo:. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 7695c89..6de75b1 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -273,7 +273,7 @@ @ stdcall SetupDiBuildClassInfoList(long ptr long ptr) @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr) @ stdcall SetupDiBuildClassInfoListExW(long ptr long ptr wstr ptr) -@ stub SetupDiBuildDriverInfoList +@ stdcall SetupDiBuildDriverInfoList(ptr ptr long) @ stdcall SetupDiCallClassInstaller(long ptr ptr) @ stub SetupDiCancelDriverInfoSearch @ stub SetupDiChangeState @@ -297,7 +297,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr) @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) -@ stub SetupDiDeleteDeviceInfo +@ stdcall SetupDiDeleteDeviceInfo(ptr ptr) @ stub SetupDiDeleteDeviceInterfaceData @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f8e99e0..264a890 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -393,3 +393,27 @@ BOOL WINAPI SetupLogFileA( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiBuildDriverInfoList (SETUPAPI.@) + */ + +BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) + { + FIXME(": stub %p, %p, %d\n", DeviceInfoSet, DeviceInfoData, DriverType); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + +/*********************************************************************** + * SetupDiDeleteDeviceInfo (SETUPAPI.@) + */ + +BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) + { + FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + }

1 0

Austin English : ntoskrnl.exe: Add stub for MmAllocateContiguousMemorySpecifyCache:.
by Alexandre Julliard 28 Jun '10

28 Jun '10

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