December 2010 - Wine-commits

Andrew Nguyen : winex11.drv: Enhance the wrapper functions for WGL_EXT_swap_control.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: a7346e9fc85ae6bb27ebda494fa67bc5929d817f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7346e9fc85ae6bb27ebda494… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:44:11 2010 -0600 winex11.drv: Enhance the wrapper functions for WGL_EXT_swap_control. --- dlls/winex11.drv/opengl.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8ea7ddb..792bc13 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -505,9 +505,11 @@ static BOOL has_opengl(void) /* It doesn't matter if these fail. They'll only be used if the driver reports the associated extension is available (and if a driver reports the extension is available but fails to provide the functions, it's quite broken) */ -#define LOAD_FUNCPTR(f) p##f = (void*)pglXGetProcAddressARB((const unsigned char*)#f) +#define LOAD_FUNCPTR(f) p##f = pglXGetProcAddressARB((const GLubyte *)#f) /* ARB GLX Extension */ LOAD_FUNCPTR(glXCreateContextAttribsARB); + /* SGI GLX Extension */ + LOAD_FUNCPTR(glXSwapIntervalSGI); /* NV GLX Extension */ LOAD_FUNCPTR(glXAllocateMemoryNV); LOAD_FUNCPTR(glXFreeMemoryNV); @@ -3400,7 +3402,9 @@ static const char * WINAPI X11DRV_wglGetExtensionsStringEXT(void) { * WGL_EXT_swap_control: wglGetSwapIntervalEXT */ static int WINAPI X11DRV_wglGetSwapIntervalEXT(VOID) { - FIXME("(),stub!\n"); + /* GLX_SGI_swap_control doesn't have any provisions for getting the swap + * interval, so the swap interval has to be tracked. */ + TRACE("()\n"); return swap_interval; } @@ -3413,13 +3417,37 @@ static BOOL WINAPI X11DRV_wglSwapIntervalEXT(int interval) { BOOL ret = TRUE; TRACE("(%d)\n", interval); - swap_interval = interval; - if (NULL != pglXSwapIntervalSGI) { - wine_tsx11_lock(); - ret = !pglXSwapIntervalSGI(interval); - wine_tsx11_unlock(); + + if (interval < 0) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + else if (interval == 0) + { + /* wglSwapIntervalEXT considers an interval value of zero to mean that + * vsync should be disabled, but glXSwapIntervalSGI considers such a + * value to be an error. Just silently ignore the request for now. */ + WARN("Request to disable vertical sync is not handled\n"); + swap_interval = 0; + } + else + { + if (pglXSwapIntervalSGI) + { + wine_tsx11_lock(); + ret = !pglXSwapIntervalSGI(interval); + wine_tsx11_unlock(); + } + else + WARN("GLX_SGI_swap_control extension is not available\n"); + + if (ret) + swap_interval = interval; + else + SetLastError(ERROR_DC_NOT_FOUND); } - else WARN("(): GLX_SGI_swap_control extension seems not supported\n"); + return ret; }

1 0

André Hentschel : setupapi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 57aa778e2d4105ac10774aa686a695a286f8565e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57aa778e2d4105ac10774aa68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 25 00:07:01 2010 +0100 setupapi/tests: Don't test function directly when reporting GetLastError(). --- dlls/setupapi/tests/misc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 35b21d1..59a8d6b 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -328,7 +328,8 @@ static void test_SetupCopyOEMInf(void) { /* Win9x/WinMe */ SetLastError(0xdeadbeef); - ok(DeleteFileA(dest), "Failed to delete file '%s' : %d\n", dest, GetLastError()); + res = DeleteFileA(dest); + ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); /* On WinMe we also need to remove the .pnf file */ *(strrchr(dest, '.') + 1) = 'p';

1 0

Greg Geldorp : spoolss/tests: Skip tests on Win7.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: c1dc5f887989544ae22eb4ce48b066f61c8d617e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dc5f887989544ae22eb4ce4… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Dec 27 12:35:49 2010 +0100 spoolss/tests: Skip tests on Win7. --- dlls/spoolss/tests/spoolss.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index 6a2711e..b7d71d6 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -62,6 +62,16 @@ static LPCSTR load_functions(void) if (!pSplInitializeWinSpoolDrv) return ptr; + /* Calling BuildOtherNamesFromMachineName or SplInitializeWinSpoolDrv on + * Win7 results in a breakpoint exception. If you continue after hitting + * the breakpoint, the functions fail with ERROR_NOT_SUPPORTED. So we + * just skip the tests on Win7, since they won't provide any useful info. + * To detect Win7, we check whether UnloadDriver exists (it doesn't on + * Win7, but does exist on earlier Windows versions) */ + ptr = "UnloadDriver"; + if (GetProcAddress(hspl, ptr) == NULL) return ptr; + + ptr = "winspool.drv"; hwinspool = LoadLibraryA(ptr); if (!hwinspool) return ptr;

1 0

Hwang YunSong : msi: Update Korean resource.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: a0639d004d79ae1feb75355b8811fc2b16ed55cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0639d004d79ae1feb75355b8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 27 11:21:27 2010 +0900 msi: Update Korean resource. --- dlls/msi/msi_Ko.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 346e9be..7212892 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/msi/msi_Ko.rc @@ -22,43 +22,45 @@ #include "windef.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - 4 " �� ġ ��Ű�� ϴ�. �� θ� Ȯ��ϰ� �ٽ� �õ��Ͻʽÿ�." - 5 "%s ��θ� ã�� ϴ�" - 9 "��ũ %s ��" + 4 " 지정한 설치 패키지를 열 수 없습니다. 파일 경로를 확인하고 다시 시도하십시오." + 5 "%s 경로를 찾을수 없습니다" + 9 "디스크 %s 삽입" 10 "Windows Installer %s\n\n" \ - "��:\n" \ - "msiexec �� {�ʼ� �Ű��} [�� Ű��]\n\n" \ - "��ǰ ��ġ:\n" \ + "사용법:\n" \ + "msiexec 명령 {필수 매개변수} [선택적 매개변수]\n\n" \ + "제품 설치:\n" \ "\t/i {package|productcode} [property]\n" \ "\t/package {package|productcode} [property]\n" \ "\t/a package [property]\n" \ - "��ġ ��:\n" \ + "설치 복구:\n" \ "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "��ǰ ��:\n" \ + "제품 제거:\n" \ "\t/uninstall {package|productcode} [property]\n" \ "\t/x {package|productcode} [property]\n" \ - "��ǰ �˸��:\n" \ + "제품 알리기:\n" \ "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "��ġ �߰�:\n" \ + "패치 추가:\n" \ "\t/p patchpackage [property]\n" \ "\t/p patchpackage /a package [property]\n" \ - "�� ɾ �� Log �� UI �� :\n" \ + "위의 명령어를 위한 Log 와 UI 한정자 :\n" \ "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "MSI �� :\n" \ + "MSI 서비스 등록:\n" \ "\t/y\n" \ - "MSI �� :\n" \ + "MSI 서비스 등록 해제:\n" \ "\t/z\n" \ - "�� :\n" \ + "도움말 보기:\n" \ "\t/help\n" \ "\t/?\n" - 11 "%s�� ϴ� �� Է��ϼ��" - 12 "�� κ�(feature)�� ġ ��" - 13 "�� κ�(feature)�� Ʈ��ũ ��̺�" - 14 "�κ�(feature)��:" - 15 " %s�� ϴ� �� " + 11 "%s를 포함하는 폴더를 입력하세여" + 12 "빠진 부분(feature)을 위한 설치 원본" + 13 "빠진 부분(feature)을 위한 네트워크 드라이브" + 14 "부분(feature)에서:" + 15 " %s를 포함하는 폴더 선택" }

1 0

Hwang YunSong : msrle32: Update Korean resource.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 8dceb07620fa53cb6a70da1edf44244b6b27f3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dceb07620fa53cb6a70da1ed… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 27 11:24:11 2010 +0900 msrle32: Update Korean resource. --- dlls/msrle32/msrle_Ko.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msrle32/msrle_Ko.rc b/dlls/msrle32/msrle_Ko.rc index b804e32..8a170b3 100644 --- a/dlls/msrle32/msrle_Ko.rc +++ b/dlls/msrle32/msrle_Ko.rc @@ -1,7 +1,7 @@ /* * Korean resource file for MS-RLE * - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,13 @@ #include "msrle_private.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE �� ڵ�" - IDS_ABOUT "Wine MS-RLE �� ڵ�\nCopyright 2002 by Michael Gunnewig" + IDS_DESCRIPTION "Wine MS-RLE 비디오 코덱" + IDS_ABOUT "Wine MS-RLE 비디오 코덱\nCopyright 2002 by Michael Gunnewig" }

1 0

Timo Teräs : iphlpapi: Fix GetAdaptersAddresses return values.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: bfc8832ccb633ea1e8dbdcd31c24d7fbae3c5315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc8832ccb633ea1e8dbdcd31… Author: Timo Teräs <timo.teras(a)iki.fi> Date: Mon Dec 27 09:56:21 2010 +0200 iphlpapi: Fix GetAdaptersAddresses return values. --- dlls/iphlpapi/iphlpapi_main.c | 5 ++++- dlls/iphlpapi/tests/iphlpapi.c | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d734c39..3995a17 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1115,10 +1115,13 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, { if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) aa->DnsSuffix = dnsSuffix; + else + aa->DnsSuffix = (WCHAR *)((BYTE*)dnsSuffix + dns_suffix_size - 2); } ret = ERROR_SUCCESS; } - if (*buflen < total_size) ret = ERROR_BUFFER_OVERFLOW; + else + ret = ERROR_BUFFER_OVERFLOW; *buflen = total_size; TRACE("num adapters %u\n", table->numIndexes); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 823e596..a747423 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -819,7 +819,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { ULONG ret, size; - IP_ADAPTER_ADDRESSES *aa; + IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; if (!gGetAdaptersAddresses) @@ -831,17 +831,25 @@ static void test_GetAdaptersAddresses(void) ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); - size = 0; + /* size should be ignored and overwritten if buffer is NULL */ + size = 0x7fffffff; ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; - aa = HeapAlloc(GetProcessHeap(), 0, size); - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, aa, &size); + ptr = HeapAlloc(GetProcessHeap(), 0, size); + ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); - while (!ret && winetest_debug > 1 && aa) + for (aa = ptr; !ret && aa; aa = aa->Next) { + ok(aa->DnsSuffix != NULL, "DnsSuffix is not a valid pointer\n"); + ok(aa->Description != NULL, "Description is not a valid pointer\n"); + ok(aa->FriendlyName != NULL, "FriendlyName is not a valid pointer\n"); + + if (winetest_debug <= 1) + continue; + trace("Length: %u\n", S(U(*aa)).Length); trace("IfIndex: %u\n", S(U(*aa)).IfIndex); trace("Next: %p\n", aa->Next); @@ -877,9 +885,8 @@ static void test_GetAdaptersAddresses(void) trace("IfType: %u\n", aa->IfType); trace("OperStatus: %u\n", aa->OperStatus); trace("\n"); - aa = aa->Next; } - HeapFree(GetProcessHeap(), 0, aa); + HeapFree(GetProcessHeap(), 0, ptr); } START_TEST(iphlpapi)

1 0

Jacek Caban : jscript: Added ScriptEngine() implementation.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 36fe9472c26f21cd1c4b2ce4a343a64746e3aae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fe9472c26f21cd1c4b2ce4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 27 13:37:54 2010 +0100 jscript: Added ScriptEngine() implementation. --- dlls/jscript/global.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 81aee50..0d922c8 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -706,8 +706,22 @@ static HRESULT JSGlobal_GetObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR JScriptW[] = {'J','S','c','r','i','p','t',0}; + + TRACE("\n"); + + if(retv) { + BSTR ret; + + ret = SysAllocString(JScriptW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; } static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ba5235d..aed6c84 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -18,6 +18,9 @@ var tmp, i; +ok(ScriptEngine() === "JScript", "ScriptEngine() = " + ScriptEngine()); +ok(ScriptEngine(3) === "JScript", "ScriptEngine(3) = " + ScriptEngine(3)); + i = parseInt("0"); ok(i === 0, "parseInt('0') = " + i); i = parseInt("123");

1 0

Jacek Caban : jscript: Added ScriptEngine*Version functions implementation.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: f8afae75b5727462081e15b662f9bdf809229f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8afae75b5727462081e15b66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 27 13:38:08 2010 +0100 jscript: Added ScriptEngine*Version functions implementation. --- dlls/jscript/global.c | 27 +++++++++++++++++++++------ dlls/jscript/resource.h | 4 ++++ dlls/jscript/tests/api.js | 3 +++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 0d922c8..f959577 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -727,22 +727,37 @@ static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = JSCRIPT_MAJOR_VERSION; + } + return S_OK; } static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = JSCRIPT_MINOR_VERSION; + } + return S_OK; } static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = JSCRIPT_BUILD_VERSION; + } + return S_OK; } static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index be569e0..c4153a4 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,6 +18,10 @@ #include <windef.h> +#define JSCRIPT_MAJOR_VERSION 5 +#define JSCRIPT_MINOR_VERSION 8 +#define JSCRIPT_BUILD_VERSION 16475 + #define IDS_TO_PRIMITIVE 0x0001 #define IDS_INVALID_CALL_ARG 0x0005 #define IDS_SUBSCRIPT_OUT_OF_RANGE 0x0009 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index aed6c84..e4dc7c4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -20,6 +20,9 @@ var tmp, i; ok(ScriptEngine() === "JScript", "ScriptEngine() = " + ScriptEngine()); ok(ScriptEngine(3) === "JScript", "ScriptEngine(3) = " + ScriptEngine(3)); +ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajorVersion() !== ScriptEngineMajorVersion(2)"); +ok(ScriptEngineMinorVersion() === ScriptEngineMinorVersion(2), "ScriptEngineMinorVersion() !== ScriptEngineMinorVersion(2)"); +ok(ScriptEngineBuildVersion() === ScriptEngineBuildVersion(2), "ScriptEngineBuildVersion() !== ScriptEngineBuildVersion(2)"); i = parseInt("0"); ok(i === 0, "parseInt('0') = " + i);

1 0

Andrew Nguyen : wineboot: Set the FeatureSet value in the volatile CPU registry keys.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 0c8820563c8df325c6ab8c54fbbbdcb49491bf7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8820563c8df325c6ab8c54f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:54:14 2010 -0600 wineboot: Set the FeatureSet value in the volatile CPU registry keys. --- programs/wineboot/wineboot.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 28292ad..1793a68 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -173,6 +173,7 @@ static void create_hardware_registry_keys(void) 'S','y','s','t','e','m',0}; static const WCHAR fpuW[] = {'F','l','o','a','t','i','n','g','P','o','i','n','t','P','r','o','c','e','s','s','o','r',0}; static const WCHAR cpuW[] = {'C','e','n','t','r','a','l','P','r','o','c','e','s','s','o','r',0}; + static const WCHAR FeatureSetW[] = {'F','e','a','t','u','r','e','S','e','t',0}; static const WCHAR IdentifierW[] = {'I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; @@ -216,6 +217,7 @@ static void create_hardware_registry_keys(void) if (!RegCreateKeyExW( cpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { + RegSetValueExW( hkey, FeatureSetW, 0, REG_DWORD, (BYTE *)&sci.FeatureSet, sizeof(DWORD) ); set_reg_value( hkey, IdentifierW, idW ); /*TODO; report amd's properly*/ set_reg_value( hkey, VendorIdentifierW, VenidIntelW );

1 0

Alexandre Julliard : configure: Get rid of the replacement function for gettid.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 13eafa047de1cd87dd81f0b3de19134d803e8eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=13eafa047de1cd87dd81f0b3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 12:08:37 2010 +0100 configure: Get rid of the replacement function for gettid. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ---- libs/port/Makefile.in | 1 - libs/port/gettid.c | 38 -------------------------------------- loader/main.c | 5 ++++- 7 files changed, 4 insertions(+), 49 deletions(-) diff --git a/configure b/configure index f8aa35e..0fde42b 100755 --- a/configure +++ b/configure @@ -12753,7 +12753,6 @@ for ac_func in \ getopt_long \ getpagesize \ getpwuid \ - gettid \ gettimeofday \ getuid \ kqueue \ diff --git a/configure.ac b/configure.ac index 5e1810f..5fdcd18 100644 --- a/configure.ac +++ b/configure.ac @@ -1904,7 +1904,6 @@ AC_CHECK_FUNCS(\ getopt_long \ getpagesize \ getpwuid \ - gettid \ gettimeofday \ getuid \ kqueue \ diff --git a/include/config.h.in b/include/config.h.in index 4fa566d..c7bf082 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -226,9 +226,6 @@ /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT -/* Define to 1 if you have the `gettid' function. */ -#undef HAVE_GETTID - /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY diff --git a/include/wine/port.h b/include/wine/port.h index 180a6d8..8281653 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -248,10 +248,6 @@ int futimes(int fd, const struct timeval *tv); size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ -#ifndef HAVE_GETTID -pid_t gettid(void); -#endif /* HAVE_GETTID */ - #ifndef HAVE_ISINF int isinf(double x); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 1609aca..f2f6db0 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ getopt.c \ getopt1.c \ getpagesize.c \ - gettid.c \ interlocked.c \ isinf.c \ isnan.c \ diff --git a/libs/port/gettid.c b/libs/port/gettid.c deleted file mode 100644 index fd7a353..0000000 --- a/libs/port/gettid.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * gettid function - * - * Copyright 2003 Alexandre Julliard - * - * 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 "config.h" -#include "wine/port.h" - -#ifndef HAVE_GETTID - -pid_t gettid(void) -{ -#if defined(__linux__) && defined(__i386__) - pid_t ret; - __asm__("int $0x80" : "=a" (ret) : "0" (224) /* SYS_gettid */); - if (ret < 0) ret = -1; - return ret; -#else - return -1; /* FIXME */ -#endif -} - -#endif /* HAVE_GETTID */ diff --git a/loader/main.c b/loader/main.c index 9fe5e59..e19b1bb 100644 --- a/loader/main.c +++ b/loader/main.c @@ -30,6 +30,9 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -104,7 +107,7 @@ static void check_command_line( int argc, char *argv[] ) /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { - pid_t tid = gettid(); + pid_t tid = syscall( SYS_gettid ); /* check for NPTL */ if (tid != -1 && tid != getpid()) return (void *)1; /* check for TLS glibc */

1 0