February 2018 - Wine-Commits

Michael Stefaniuc : dmstyle/tests: Add IDirectMusicObject::ParseDescriptor () tests.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: ff4a81b47a19aaa32f828d5a7ac1ba6acb730651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4a81b47a19aaa32f828d5a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 26 01:02:58 2018 +0100 dmstyle/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 200 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 664b208..a9a89a7 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -22,10 +22,14 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static BOOL missing_dmstyle(void) { IDirectMusicStyle *dms; @@ -339,6 +343,201 @@ static void test_track(void) } } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + LARGE_INTEGER zero = {0}; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + DWORD valid; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || + broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ + "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, DMUS_OBJ_CATEGORY not supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -354,6 +553,7 @@ START_TEST(dmstyle) test_COM_track(); test_dmstyle(); test_track(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Nikolay Sivov : avifil32: Remove some redundant statements.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 7675ce7550f20a5f6b2150b0c20211e2092be528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7675ce7550f20a5f6b2150b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:33:25 2018 +0300 avifil32: Remove some redundant statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 1 - dlls/avifil32/getframe.c | 1 - dlls/avifil32/tmpfile.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 2e0fa2f..a4df628 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -282,7 +282,6 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; } diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c8580a8..be4a2a9 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -134,7 +134,6 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) } HeapFree(GetProcessHeap(), 0, iface); - return 0; } return ref; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index ee7e772..6d199c7 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -94,7 +94,6 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref;

1 0

Nikolay Sivov : explorerframe: Use global memory allocation helpers.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 9e8f152dc9adf6bacd961c507da908c1aa184105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8f152dc9adf6bacd961c50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:34:08 2018 +0300 explorerframe: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 15d2f26..37e1a55 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,6 +33,7 @@ #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorerframe_main.h" @@ -861,9 +862,8 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); EFRAME_UnlockModule(); - return 0; } return ref; @@ -1001,7 +1001,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = HeapAlloc(GetProcessHeap(), 0, sizeof(nstc_root)); + new_root = heap_alloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1025,7 +1025,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - HeapFree(GetProcessHeap(), 0, new_root); + heap_free(new_root); return E_FAIL; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - HeapFree(GetProcessHeap(), 0, root); + heap_free(root); return S_OK; } else @@ -1135,7 +1135,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST)*count); + array = heap_alloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1149,7 +1149,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return hr; } @@ -1610,7 +1610,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + nstc = heap_alloc_zero(sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : kernel32/tests: Remove workarounds for older versions.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: e01909755689dc91c02a353d4ecc3f853bc5d11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01909755689dc91c02a353d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:37:49 2018 +0300 kernel32/tests: Remove workarounds for older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 8360994..49a9357 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -26,8 +26,6 @@ #include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); -static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); -static ULONGLONG (WINAPI * pVerSetConditionMask)(ULONGLONG, DWORD, BYTE); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); #define GET_PROC(func) \ @@ -40,8 +38,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("kernel32.dll"); GET_PROC(GetProductInfo); - GET_PROC(VerifyVersionInfoA); - GET_PROC(VerSetConditionMask); hmod = GetModuleHandleA("ntdll.dll"); @@ -153,9 +149,7 @@ static void test_GetVersionEx(void) SetLastError(0xdeadbeef); infoExA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); ret = GetVersionExA((OSVERSIONINFOA *)&infoExA); - ok(ret || - broken(ret == 0), /* win95 */ - "Expected GetVersionExA to succeed\n"); + ok(ret, "GetVersionExA failed.\n"); if (!infoExA.wServicePackMajor && !infoExA.wServicePackMinor) ok(!infoExA.szCSDVersion[0], "got '%s'\n", infoExA.szCSDVersion); @@ -689,22 +683,22 @@ static void test_VerifyVersionInfo(void) * if the minor version is tested */ info.dwMajorVersion = 3; info.dwMinorVersion = 10; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + ret = VerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); info.dwMinorVersion = 0; info.wServicePackMajor = 10; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + ret = VerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); info.wServicePackMajor = 0; info.wServicePackMinor = 10; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + ret = VerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); @@ -712,8 +706,8 @@ static void test_VerifyVersionInfo(void) info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); info.dwOSVersionInfoSize = 0; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); + ret = VerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); }

1 0

Nikolay Sivov : kernel32/tests: Add more tests for VerifyVersionInfo().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 60a5ee6560a2048d31e694dee147465bd89a366f URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a5ee6560a2048d31e694de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:37:48 2018 +0300 kernel32/tests: Add more tests for VerifyVersionInfo(). New tests cases by Sebastian Lackner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 634 ++++++++++++++++++++++++++++++++---------- 1 file changed, 493 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60a5ee6560a2048d31e6…

1 0

Nikolay Sivov : kernel32: Add GetEnabledXStateFeatures() stub.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: cb05be7bff142b0ee7b3b070a452d2b7bf04b55a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb05be7bff142b0ee7b3b070… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:36:42 2018 +0300 kernel32: Add GetEnabledXStateFeatures() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/cpu.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec index 0f9438d..f051097 100644 --- a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec @@ -1,5 +1,5 @@ @ stub CopyContext -@ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() kernel32.GetEnabledXStateFeatures @ stub GetXStateFeaturesMask @ stub InitializeContext @ stub LocateXStateFeature diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 2e0e79f..ec1fd0f 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -327,3 +327,12 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) FIXME("semi-stub, returning %u\n", cpus); return cpus; } + +/*********************************************************************** + * GetEnabledXStateFeatures (KERNEL32.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + FIXME("\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1137920..c431ecb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -657,7 +657,7 @@ # @ stub GetDurationFormat # @ stub GetDurationFormatEx @ stdcall GetDynamicTimeZoneInformation(ptr) -# @ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() @ stdcall GetEnvironmentStrings() GetEnvironmentStringsA @ stdcall GetEnvironmentStringsA() @ stdcall GetEnvironmentStringsW() diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index eb6edbe..a834bbe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -491,7 +491,7 @@ # @ stub GetEffectivePackageStatusForUser # @ stub GetEightBitStringToUnicodeSizeRoutine # @ stub GetEightBitStringToUnicodeStringRoutine -# @ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() kernel32.GetEnabledXStateFeatures @ stdcall GetEnvironmentStrings() kernel32.GetEnvironmentStrings @ stdcall GetEnvironmentStringsA() kernel32.GetEnvironmentStringsA @ stdcall GetEnvironmentStringsW() kernel32.GetEnvironmentStringsW

1 0

김건우 : Add Korean translation of News in 2016
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: ecefe7842e5c1363e26e5ecd38f7711f9c392399 URL: https://source.winehq.org/git/website.git/?a=commit;h=ecefe7842e5c1363e26e5… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:46:24 2018 +0900 Add Korean translation of News in 2016 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2016010901.xml | 16 ++++++++++++++++ news/ko/2016012201.xml | 17 +++++++++++++++++ news/ko/2016020301.xml | 13 +++++++++++++ news/ko/2016020501.xml | 17 +++++++++++++++++ news/ko/2016021901.xml | 16 ++++++++++++++++ news/ko/2016030501.xml | 16 ++++++++++++++++ news/ko/2016031801.xml | 15 +++++++++++++++ news/ko/2016040201.xml | 17 +++++++++++++++++ news/ko/2016041201.xml | 13 +++++++++++++ news/ko/2016041601.xml | 18 ++++++++++++++++++ news/ko/2016043001.xml | 16 ++++++++++++++++ news/ko/2016051701.xml | 16 ++++++++++++++++ news/ko/2016052701.xml | 16 ++++++++++++++++ news/ko/2016061001.xml | 17 +++++++++++++++++ news/ko/2016061601.xml | 14 ++++++++++++++ news/ko/2016062401.xml | 18 ++++++++++++++++++ news/ko/2016070901.xml | 16 ++++++++++++++++ news/ko/2016072201.xml | 17 +++++++++++++++++ news/ko/2016080501.xml | 17 +++++++++++++++++ news/ko/2016081901.xml | 17 +++++++++++++++++ news/ko/2016082201.xml | 13 +++++++++++++ news/ko/2016090301.xml | 19 +++++++++++++++++++ news/ko/2016091701.xml | 16 ++++++++++++++++ news/ko/2016100101.xml | 15 +++++++++++++++ news/ko/2016100701.xml | 12 ++++++++++++ news/ko/2016101401.xml | 15 +++++++++++++++ news/ko/2016102801.xml | 16 ++++++++++++++++ news/ko/2016111101.xml | 16 ++++++++++++++++ news/ko/2016112501.xml | 15 +++++++++++++++ news/ko/2016120201.xml | 11 +++++++++++ news/ko/2016120901.xml | 17 +++++++++++++++++ news/ko/2016121201.xml | 16 ++++++++++++++++ news/ko/2016121601.xml | 12 ++++++++++++ news/ko/2016121901.xml | 14 ++++++++++++++ news/ko/2016122301.xml | 12 ++++++++++++ 35 files changed, 541 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=ecefe7842e5c1363e…

1 0

김건우 : Add Korean translation of News in 2018
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: 82566a3919d9cd49a3548b4a95376819dc567f90 URL: https://source.winehq.org/git/website.git/?a=commit;h=82566a3919d9cd49a3548… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:45:09 2018 +0900 Add Korean translation of News in 2018 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2018010201.xml | 14 ++++++++++++++ news/ko/2018010501.xml | 12 ++++++++++++ news/ko/2018011201.xml | 12 ++++++++++++ news/ko/2018011801.xml | 16 ++++++++++++++++ news/ko/2018020201.xml | 16 ++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/news/ko/2018010201.xml b/news/ko/2018010201.xml new file mode 100644 index 0000000..8fa8d72 --- /dev/null +++ b/news/ko/2018010201.xml @@ -0,0 +1,14 @@ +<news> +<date>1월 2일 2018</date> +<title>와인 2.0.4 배포</title> +<body> + The Wine maintenance release 2.0.4(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/2.0.4">이 판</a>의 변경 및 개선점: +<ul> + <li>여러 오류 고침</li> + <li>Updates to the National Language Support files</li> + <li>Documentation updates</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.4.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018010501.xml b/news/ko/2018010501.xml new file mode 100644 index 0000000..b85c6f7 --- /dev/null +++ b/news/ko/2018010501.xml @@ -0,0 +1,12 @@ +<news> +<date>1월 5일 2018</date> +<title>와인 3.0-rc5 배포</title> +<body> + 와인 개발자판 3.0-rc5(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/3.0-rc5">이 판</a>의 변경 및 개선점: +<ul> + <li>오류만 고쳐졌으며, 원시 부호는 변하지 않았습니다..</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018011201.xml b/news/ko/2018011201.xml new file mode 100644 index 0000000..b854991 --- /dev/null +++ b/news/ko/2018011201.xml @@ -0,0 +1,12 @@ +<news> +<date>1월 12일 2018</date> +<title>와인 3.0-rc6 배포</title> +<body> + 와인 개발자판 3.0-rc6(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/3.0-rc6">이 판</a>의 변경 및 개선점: +<ul> + <li>오류만 고쳐졌으며, 원시 부호는 변하지 않았습니다..</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc6.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018011801.xml b/news/ko/2018011801.xml new file mode 100644 index 0000000..bc97b4f --- /dev/null +++ b/news/ko/2018011801.xml @@ -0,0 +1,16 @@ +<news> +<date>1월 18일 2018</date> +<title>와인 3.0 배포</title> +<body> + 와인 제작진이 자랑스럽게 공개하는 새 안정판인 와인 3.0(을)를 내려받을 수 있습니다. + This release represents a year of development effort and over 6,000 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/3.0">release notes</a>. The main highlights are: +<ul> + <li>Direct3D 10 and 11 support.</li> + <li>The Direct3D command stream.</li> + <li>The Android graphics driver.</li> + <li>Improved DirectWrite and Direct2D support.</li> +</ul> + Once again, because of the annual release schedule, a number of features that are being worked on have been deferred to the next development cycle. This includes in particular Direct3D 12 and Vulkan support, as well as OpenGL ES support to enable Direct3D on Android. +원시 부호는 <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018020201.xml b/news/ko/2018020201.xml new file mode 100644 index 0000000..91db858 --- /dev/null +++ b/news/ko/2018020201.xml @@ -0,0 +1,16 @@ +<news> +<date>February 2일 2018</date> +<title>와인 3.1 배포</title> +<body> + 와인 개발자판 3.1(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/3.1">이 판</a>의 변경 및 개선점: +<ul> + <li>Kerberos authentication support.</li> + <li>Window class redirection for Common Controls 6.</li> + <li>다이렉트X11 ARGB 지원.</li> + <li>도스 파일을 실행시키기 위해서는 도스박스가 필요합니다.</li> + <li>여러 오류 고침.</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/3.x/wine-3.1.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news>

1 0

김건우 : Add Korean translation of News in 2017
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: 74883a4abb6d4675ce4e576a07ff1de8bb75f8ef URL: https://source.winehq.org/git/website.git/?a=commit;h=74883a4abb6d4675ce4e5… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:45:56 2018 +0900 Add Korean translation of News in 2017 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2017010601.xml | 12 ++++++++++++ news/ko/2017010801.xml | 12 ++++++++++++ news/ko/2017011301.xml | 12 ++++++++++++ news/ko/2017012001.xml | 13 +++++++++++++ news/ko/2017012401.xml | 11 +++++++++++ news/ko/2017020301.xml | 19 +++++++++++++++++++ news/ko/2017021701.xml | 16 ++++++++++++++++ news/ko/2017022801.xml | 14 ++++++++++++++ news/ko/2017030301.xml | 17 +++++++++++++++++ news/ko/2017031701.xml | 17 +++++++++++++++++ news/ko/2017033101.xml | 18 ++++++++++++++++++ news/ko/2017041301.xml | 16 ++++++++++++++++ news/ko/2017042001.xml | 13 +++++++++++++ news/ko/2017042801.xml | 18 ++++++++++++++++++ news/ko/2017051201.xml | 16 ++++++++++++++++ news/ko/2017052601.xml | 16 ++++++++++++++++ news/ko/2017060901.xml | 17 +++++++++++++++++ news/ko/2017062301.xml | 17 +++++++++++++++++ news/ko/2017070701.xml | 16 ++++++++++++++++ news/ko/2017072001.xml | 12 ++++++++++++ news/ko/2017072101.xml | 19 +++++++++++++++++++ news/ko/2017080301.xml | 16 ++++++++++++++++ news/ko/2017082001.xml | 15 +++++++++++++++ news/ko/2017090101.xml | 17 +++++++++++++++++ news/ko/2017091501.xml | 17 +++++++++++++++++ news/ko/2017092901.xml | 16 ++++++++++++++++ news/ko/2017101401.xml | 17 +++++++++++++++++ news/ko/2017102001.xml | 13 +++++++++++++ news/ko/2017103101.xml | 18 ++++++++++++++++++ news/ko/2017111101.xml | 18 ++++++++++++++++++ news/ko/2017112401.xml | 17 +++++++++++++++++ news/ko/2017120801.xml | 21 +++++++++++++++++++++ news/ko/2017121501.xml | 12 ++++++++++++ news/ko/2017122201.xml | 12 ++++++++++++ news/ko/2017122901.xml | 12 ++++++++++++ 35 files changed, 542 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=74883a4abb6d4675c…

1 0

김건우 : Add Korean translation of News in 2015
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: 41d2176638ac0c675c0be2d833a16dc4b31b1353 URL: https://source.winehq.org/git/website.git/?a=commit;h=41d2176638ac0c675c0be… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:46:54 2018 +0900 Add Korean translation of News in 2015 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2015010901.xml | 17 +++++++++++++++++ news/ko/2015011601.xml | 12 ++++++++++++ news/ko/2015012301.xml | 15 +++++++++++++++ news/ko/2015013001.xml | 11 +++++++++++ news/ko/2015020701.xml | 16 ++++++++++++++++ news/ko/2015021301.xml | 10 ++++++++++ news/ko/2015022001.xml | 16 ++++++++++++++++ news/ko/2015022701.xml | 10 ++++++++++ news/ko/2015030601.xml | 18 ++++++++++++++++++ news/ko/2015031401.xml | 11 +++++++++++ news/ko/2015032001.xml | 17 +++++++++++++++++ news/ko/2015032701.xml | 10 ++++++++++ news/ko/2015040301.xml | 18 ++++++++++++++++++ news/ko/2015041701.xml | 16 ++++++++++++++++ news/ko/2015042501.xml | 10 ++++++++++ news/ko/2015050101.xml | 15 +++++++++++++++ news/ko/2015050901.xml | 11 +++++++++++ news/ko/2015051501.xml | 17 +++++++++++++++++ news/ko/2015052201.xml | 10 ++++++++++ news/ko/2015052901.xml | 16 ++++++++++++++++ news/ko/2015060701.xml | 15 +++++++++++++++ news/ko/2015061201.xml | 16 ++++++++++++++++ news/ko/2015062301.xml | 10 ++++++++++ news/ko/2015062601.xml | 17 +++++++++++++++++ news/ko/2015070301.xml | 10 ++++++++++ news/ko/2015071001.xml | 17 +++++++++++++++++ news/ko/2015071701.xml | 10 ++++++++++ news/ko/2015072801.xml | 16 ++++++++++++++++ news/ko/2015073101.xml | 10 ++++++++++ news/ko/2015080801.xml | 16 ++++++++++++++++ news/ko/2015082101.xml | 16 ++++++++++++++++ news/ko/2015082801.xml | 10 ++++++++++ news/ko/2015090401.xml | 16 ++++++++++++++++ news/ko/2015091401.xml | 12 ++++++++++++ news/ko/2015092401.xml | 11 +++++++++++ news/ko/2015100201.xml | 17 +++++++++++++++++ news/ko/2015100401.xml | 12 ++++++++++++ news/ko/2015101401.xml | 10 ++++++++++ news/ko/2015101601.xml | 17 +++++++++++++++++ news/ko/2015103001.xml | 17 +++++++++++++++++ news/ko/2015111301.xml | 17 +++++++++++++++++ news/ko/2015111801.xml | 11 +++++++++++ news/ko/2015112001.xml | 13 +++++++++++++ news/ko/2015112701.xml | 12 ++++++++++++ news/ko/2015112901.xml | 18 ++++++++++++++++++ news/ko/2015120401.xml | 12 ++++++++++++ news/ko/2015121201.xml | 12 ++++++++++++ news/ko/2015121901.xml | 10 ++++++++++ news/ko/2015122501.xml | 16 ++++++++++++++++ 49 files changed, 672 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=41d2176638ac0c675…

1 0