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

Michael Stefaniuc : riched20: Print the debug string and not the pointer to it.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: b05cc8c0a6bfd1da6ac535bd0ab395044b1baa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05cc8c0a6bfd1da6ac535bd0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:30:26 2015 +0200 riched20: Print the debug string and not the pointer to it. --- dlls/riched20/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 907e55e..be35521 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2368,7 +2368,7 @@ static HRESULT WINAPI ITextRange_fnCanPaste(ITextRange *me, VARIANT *v, LONG for { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%p %x %p): stub\n", This, debugstr_variant(v), format, ret); + FIXME("(%p)->(%s %x %p): stub\n", This, debugstr_variant(v), format, ret); if (!This->child.reole) return CO_E_RELEASED;

1 0

Aaryaman Vasishta : d3drm/tests: Add test for IDirect3DRM*:: CreateDeviceFromClipper.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: c20e016eb23214f5d42132836927559824d2bd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20e016eb23214f5d42132836… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 29 20:34:06 2015 +0530 d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper. --- dlls/d3drm/tests/d3drm.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c20e016eb23214f5d4213…

1 0

Hugh McMaster : wineconsole: Add HKCU registry entries for Insert Mode.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: ef0f0ad1d06bc7cdc05b92eb97d92d258247048e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0f0ad1d06bc7cdc05b92eb9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 30 20:05:35 2015 +1000 wineconsole: Add HKCU registry entries for Insert Mode. --- programs/wineconsole/registry.c | 13 +++++++++++-- programs/wineconsole/winecon_private.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 2805f2a..c1d04c1 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -40,6 +40,7 @@ static const WCHAR wszFontSize[] = {'F','o','n','t','S','i','z','e',0}; static const WCHAR wszFontWeight[] = {'F','o','n','t','W','e','i','g','h','t',0}; static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u','f','f','e','r','S','i','z','e',0}; static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0}; +static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0}; static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0}; static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0}; static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0}; @@ -48,10 +49,10 @@ static const WCHAR wszWindowSize[] = {'W','i','n','d','o','w','S','i','z' void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, - cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', + cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, wine_dbgstr_w(cfg->registry)); @@ -126,6 +127,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) cfg->history_nodup = val; count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszInsertMode, 0, &type, (LPBYTE)&val, &count)) + cfg->insert_mode = val; + + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszMenuMask, 0, &type, (LPBYTE)&val, &count)) cfg->menu_mask = val; @@ -175,6 +180,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->font_weight = 0; cfg->history_size = 50; cfg->history_nodup = 0; + cfg->insert_mode = 1; cfg->menu_mask = 0; cfg->quick_edit = 0; cfg->sb_height = 25; @@ -245,6 +251,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) val = cfg->history_nodup; RegSetValueExW(hConKey, wszHistoryNoDup, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->insert_mode; + RegSetValueExW(hConKey, wszInsertMode, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->menu_mask; RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index eec4171..2178dd0 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -36,6 +36,7 @@ struct config_data { DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ DWORD history_nodup; /* TRUE if commands are not stored twice in buffer */ + DWORD insert_mode; /* TRUE to insert text at the cursor location; FALSE to overwrite it */ DWORD menu_mask; /* MK_CONTROL MK_SHIFT mask to drive submenu opening */ DWORD quick_edit; /* whether mouse ops are sent to app (false) or used for content selection (true) */ unsigned sb_width; /* active screen buffer width */

1 0

Jacek Caban : msscript.ocx: Added IScriptControl stub implementation.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 6b205e41cf0798fd6dff7c37e9b250fc885cf792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b205e41cf0798fd6dff7c37e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 30 14:09:03 2015 +0200 msscript.ocx: Added IScriptControl stub implementation. --- dlls/msscript.ocx/msscript.c | 311 ++++++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/msscript.idl | 2 +- 2 files changed, 309 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b205e41cf0798fd6dff7…

1 0

André Hentschel : Improve WWN 392
by Jeremy Newman 29 Jun '15

29 Jun '15

Module: website Branch: master Commit: 6200bb142ff0a8fa69cad3b6e051c932c0a0a0c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=6200bb142ff0a8fa69cad3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 29 19:24:34 2015 +0200 Improve WWN 392 --- wwn/en/wn20150607_392.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 495e69a..3741114 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -79,7 +79,7 @@ We have four projects which are already in the coding period: At the moment wine's implementation of this API is mostly full of stubs, and there's quite a bit of work left before something can be drawn on the screen. My role here mainly focuses on implementing object Creation/Initialization functions for some of the main interfaces, mainly devices, textures and viewports, all of which are COM based. If time permits, I will also work on implementing some frequently used frames and lighting functions. The API is quite old (it has been removed since DX 8 SDK, and the dll doesn't come included with vista onwards) but there are a few popular games that used it. Namely, Lego Rock Raiders and Steel Beasts, and applications as well, like FMS (Flying Model Simulator). So there is some merit in working on this. Implementing these functions will help accelerate further development of this API to get some long-awaited apps to run on wine (I can see quite a few threads on google of people trying to get FMS running, and a couple for LRR too, so there is some demand for it). As an added bonus, I also get to interact with wine's ddraw implementation for this one, which could potentially help ddraw's implementation via possible bug detection/fixes and implementing any ddraw functionality that d3drm requires. TL;DR: I'm implementing a main chunk of a graphics API called Direct3D Retained Mode, which is based on Direct3D Immediate Mode. The API is mostly a stub in wine and this project should help get things going. -[1] - https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575… +[1] - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…">https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…</a> </blockquote> Implement the Visual C++ iostream library - @@ -95,10 +95,10 @@ We have four projects which are already in the coding period: <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> <blockquote> -My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. +My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. -[1]: //bugs.winehq.org/show_bug.cgi?id=35774 +[1]: <a href="//bugs.winehq.org/show_bug.cgi?id=35774">bugs.winehq.org/show_bug.cgi?id=35774</a> </blockquote> Improve mshtml.dll - @@ -119,9 +119,9 @@ I can't tell how many applications' status on appdb will change from "garbage" to "silver/gold", but IMHO, implementing XMLHttpRequest is necessary to make wine IE more usable. -[0]: http://en.wikipedia.org/wiki/XMLHttpRequest -[1]: https://getfirebug.com/firebuglite -[2]: https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest +[0]: <a href="http://en.wikipedia.org/wiki/XMLHttpRequest">http://en.wikipedia.org/wiki/XMLHttpRequest</a> +[1]: <a href="https://getfirebug.com/firebuglite">https://getfirebug.com/firebuglite</a> +[2]: <a href="https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest">https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest</a> </blockquote> ]]> </section> @@ -180,7 +180,8 @@ SourceForge. The main uses for SourceForge is for mirroring tarballs, wine-gecko/wine-mono installers, and the wine-gecko git repository. -[1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… +[1] <a href="http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin…"> +http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijacking-gimp-photo-editor-company-claims-project-was-abandoned</a> </blockquote>

1 0

Julian Rüger : German translation for release 1.7.46
by Jeremy Newman 29 Jun '15

29 Jun '15

Module: website Branch: master Commit: 100c8bc59b466bde451e2f85acc3ed81aea6a351 URL: http://source.winehq.org/git/website.git/?a=commit;h=100c8bc59b466bde451e2f… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jun 29 17:10:14 2015 +0200 German translation for release 1.7.46 --- news/de/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015062601.xml b/news/de/2015062601.xml new file mode 100644 index 0000000..2f4a77e --- /dev/null +++ b/news/de/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>26. Juni 2015</date> +<title>Wine 1.7.46 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.46 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.46">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserungen am BITS-Dateitransferdienst.</li> + <li>Weitere Fortschritte der DirectWrite-Implementierung.</li> + <li>Unterstützung für gemeinsam verwendete Benutzerdaten unter 64-Bit.</li> + <li>Diverse Verbesserungen der C++-Laufzeit.</li> + <li>Ein wenig mehr Unterstützung der 64-Bit ARM-Plattform.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.46
by Jeremy Newman 29 Jun '15

29 Jun '15

Module: website Branch: master Commit: 46458045a2b872dd29a73f99ca221f9e2dea8096 URL: http://source.winehq.org/git/website.git/?a=commit;h=46458045a2b872dd29a73f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 27 07:14:35 2015 +0200 Polish translation for release 1.7.46 --- news/pl/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015062601.xml b/news/pl/2015062601.xml new file mode 100644 index 0000000..a92c078 --- /dev/null +++ b/news/pl/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>Czerwiec 26, 2015</date> +<title>Wydano Wine 1.7.46</title> +<body> + Wydanie rozwojowe Wine 1.7.46 jest już dostępne. + <a href="{$root}/announce/1.7.46">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszenia w usłudze przesyłania plików BITS.</li> + <li>Postęp w implementacji DirectWrite.</li> + <li>Wsparcie dla współdzielonych danych użytkownika na 64-bitach.</li> + <li>Rozmaite ulepszenia w bibliotece uruchomieniowej C++.</li> + <li>Większe wsparcie na platformie 64-bitowej ARM.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Sebastian Lackner : msvcrt: Set *end to NULL when strtod is called with NULL pointer string.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: abbb361733f8d266132144f391d2d3d7a6a65d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbb361733f8d266132144f39… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 29 03:42:34 2015 +0200 msvcrt: Set *end to NULL when strtod is called with NULL pointer string. --- dlls/msvcrt/string.c | 7 +++++-- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fdeb4e0..980d492 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -317,8 +317,11 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(err) *err = 0; - else - if(!MSVCRT_CHECK_PMT(str != NULL)) return 0; + else if(!MSVCRT_CHECK_PMT(str != NULL)) { + if (end) + *end = NULL; + return 0; + } if(!locale) locinfo = get_locinfo(); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e8cafc8..5768c0f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1694,7 +1694,7 @@ static void test__strtod(void) d = strtod(NULL, &end); ok(almost_equal(d, 0.0), "d = %lf\n", d); ok(errno == EINVAL, "errno = %x\n", errno); - todo_wine ok(!end, "incorrect end ptr %p\n", end); + ok(!end, "incorrect end ptr %p\n", end); errno = EBADF; d = p__strtod_l(NULL, NULL, NULL);

1 0

Michael Müller : kernel32/tests: Add tests for GetNumaProcessorNode.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 81142c9985b3102f3cf116e694b4feb0963a7e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81142c9985b3102f3cf116e69… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 29 06:27:26 2015 +0200 kernel32/tests: Add tests for GetNumaProcessorNode. --- dlls/kernel32/tests/process.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6660af4..b4a435b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3,6 +3,7 @@ * * Copyright 2002 Eric Pouech * Copyright 2006 Dmitry Timoshkov + * Copyright 2014 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -74,6 +75,7 @@ static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); static BOOL (WINAPI *pQueryInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS class, LPVOID info, DWORD len, LPDWORD ret_len); static BOOL (WINAPI *pSetInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS class, LPVOID info, DWORD len); static HANDLE (WINAPI *pCreateIoCompletionPort)(HANDLE file, HANDLE existing_port, ULONG_PTR key, DWORD threads); +static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); /* ############################### */ static char base[MAX_PATH]; @@ -227,6 +229,7 @@ static BOOL init(void) pQueryInformationJobObject = (void *)GetProcAddress(hkernel32, "QueryInformationJobObject"); pSetInformationJobObject = (void *)GetProcAddress(hkernel32, "SetInformationJobObject"); pCreateIoCompletionPort = (void *)GetProcAddress(hkernel32, "CreateIoCompletionPort"); + pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); return TRUE; } @@ -2692,6 +2695,39 @@ static void test_StartupNoConsole(void) #endif } +static void test_GetNumaProcessorNode(void) +{ + SYSTEM_INFO si; + UCHAR node; + BOOL ret; + int i; + + if (!pGetNumaProcessorNode) + { + skip("GetNumaProcessorNode is missing\n"); + return; + } + + GetSystemInfo(&si); + for (i = 0; i < 256; i++) + { + SetLastError(0xdeadbeef); + node = (i < si.dwNumberOfProcessors) ? 0xFF : 0xAA; + ret = pGetNumaProcessorNode(i, &node); + if (i < si.dwNumberOfProcessors) + { + ok(ret, "GetNumaProcessorNode returned FALSE for processor %d\n", i); + ok(node != 0xFF, "expected node != 0xFF, but got 0xFF\n"); + } + else + { + ok(!ret, "GetNumaProcessorNode returned TRUE for processor %d\n", i); + ok(node == 0xFF || broken(node == 0xAA) /* WinXP */, "expected node 0xFF, got %x\n", node); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + } +} + START_TEST(process) { HANDLE job; @@ -2741,6 +2777,7 @@ START_TEST(process) test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole(); + test_GetNumaProcessorNode(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Michael Müller : kernel32: Implement GetNumaProcessorNode.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: d0ae2b0d3d9689b682a76821bf3737eb934ec131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ae2b0d3d9689b682a76821b… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 29 06:27:34 2015 +0200 kernel32: Implement GetNumaProcessorNode. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 21 +++++++++++++++++++++ dlls/kernel32/tests/process.c | 2 +- include/winbase.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0070c98..3c40975 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -746,7 +746,7 @@ @ stdcall GetNumaNodeProcessorMask(long ptr) # @ stub GetNumaNodeProcessorMaskEx # @ stub GetNumaProcessorMap -# @ stub GetNumaProcessorNode +@ stdcall GetNumaProcessorNode(long ptr) # @ stub GetNumaProcessorNodeEx # @ stub GetNumaProximityNode # @ stub GetNumaProximityNodeEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2c8074b..1cd6e47 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3957,6 +3957,27 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) return FALSE; } +/*********************************************************************** + * GetNumaProcessorNode (KERNEL32.@) + */ +BOOL WINAPI GetNumaProcessorNode(UCHAR processor, PUCHAR node) +{ + SYSTEM_INFO si; + + TRACE("(%d, %p)\n", processor, node); + + GetSystemInfo( &si ); + if (processor < si.dwNumberOfProcessors) + { + *node = 0; + return TRUE; + } + + *node = 0xFF; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + /********************************************************************** * GetProcessDEPPolicy (KERNEL32.@) */ diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b4a435b..4145dce 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2704,7 +2704,7 @@ static void test_GetNumaProcessorNode(void) if (!pGetNumaProcessorNode) { - skip("GetNumaProcessorNode is missing\n"); + win_skip("GetNumaProcessorNode is missing\n"); return; } diff --git a/include/winbase.h b/include/winbase.h index cc1081e..a1859b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2052,6 +2052,7 @@ WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LP #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState) WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); +WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL);

1 0