wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Michael Stefaniuc : dswave/tests: Use wide-char string literals.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 3d62a461d0cdd77ba82b1af9b01d18ba0868ce9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d62a461d0cdd77ba82b1af9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:41 2019 +0100 dswave/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/tests/dswave.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index d9bdc85ea7..62a76f1806 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -190,7 +190,6 @@ static void test_parsedescriptor(void) IStream *stream; DMUS_OBJECTDESC desc = {0}; HRESULT hr; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, mmioFOURCC('W','A','V','E'), DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -279,7 +278,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -291,7 +290,7 @@ static void test_parsedescriptor(void) ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Michael Stefaniuc : dmstyle/tests: Use wide-char string literals.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 7560f0c59d99c48f524573969e836d6f185cf914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7560f0c59d99c48f52457396… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:40 2019 +0100 dmstyle/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a63d1dbd1c..5130af773c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -475,8 +475,6 @@ static void test_parsedescriptor(void) 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, @@ -550,7 +548,7 @@ static void test_parsedescriptor(void) 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", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -562,7 +560,7 @@ static void test_parsedescriptor(void) 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", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -583,7 +581,7 @@ static void test_parsedescriptor(void) 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; 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", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Michael Stefaniuc : dmime/tests: Use wide-char string literals.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 604b874b20b625a9ee127d86e4a69b5725ed50e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=604b874b20b625a9ee127d86… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:39 2019 +0100 dmime/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 5bb3a8b5b3..99295f391b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -956,8 +956,6 @@ static void test_parsedescriptor(void) HRESULT hr; DWORD valid; unsigned int i; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; - const WCHAR s_inam[] = {'I','\0'}; /* fourcc ~0 will be replaced later on */ FOURCC alldesc[] = { @@ -1092,7 +1090,7 @@ static void test_parsedescriptor(void) "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -1130,7 +1128,7 @@ static void test_parsedescriptor(void) valid |= DMUS_OBJ_NAME; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", + ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Michael Stefaniuc : dmband/tests: Use wide-char string literals.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 9d03ce02b471566f80ee57dad2fd05ae7409b81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d03ce02b471566f80ee57da… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:37 2019 +0100 dmband/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index dce8a47ba4..4b8aaf6120 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -392,8 +392,6 @@ static void test_parsedescriptor(void) 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_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -477,7 +475,7 @@ static void test_parsedescriptor(void) 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", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, @@ -492,7 +490,7 @@ static void test_parsedescriptor(void) 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", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -513,7 +511,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; 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", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Jacek Caban : jscript/tests: Allow GetTypeInfo calls.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 5bcc65d330a50cada8e07b338dbfcf3209c01fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bcc65d330a50cada8e07b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 16 20:22:24 2019 +0100 jscript/tests: Allow GetTypeInfo calls. It's called by some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/activex.c | 4 +--- dlls/jscript/tests/caller.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 636dd81e19..161e1138ff 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -221,10 +221,8 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index dc97fb7268..336c397be9 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -275,10 +275,8 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Chip Davis : kernel32: Forward OpenProcessToken() to kernelbase.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 27b9f6f6093826683063c16b8fee6ec4db9d987a URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b9f6f6093826683063c16b… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 11:49:00 2019 -0600 kernel32: Forward OpenProcessToken() to kernelbase. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index 753b20bf90..edec3d8812 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -24,7 +24,7 @@ @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index bf78530f29..e4cfec2b64 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -35,7 +35,7 @@ @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 9a986966d7..45d52ff171 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -40,7 +40,7 @@ @ stub IsProcessCritical @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 371e6c5865..a87747bf61 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1127,7 +1127,7 @@ # @ stub OpenPrivateNamespaceA # @ stub OpenPrivateNamespaceW @ stdcall -import OpenProcess(long long long) -# @ stub OpenProcessToken +@ stdcall -import OpenProcessToken(long long ptr) @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr)

1 0

Chip Davis : kernel32: Forward OpenThreadToken() to kernelbase.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 8834f123290063b1e75d50bdc113498ef8af0d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8834f123290063b1e75d50bd… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 11:48:59 2019 -0600 kernel32: Forward OpenThreadToken() to kernelbase. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index eb2a4bdd6b..753b20bf90 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -26,7 +26,7 @@ @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 708a8eff09..bf78530f29 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -37,7 +37,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index a29ef43566..9a986966d7 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -42,7 +42,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1fcd0c1f61..371e6c5865 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1132,7 +1132,7 @@ @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall -import OpenThread(long long long) -# @ stub OpenThreadToken +@ stdcall -import OpenThreadToken(long long long ptr) @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr)

1 0

Akihiro Sagawa : kernelbase: Use translated Unicode default char to check invalid chars.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: a85bc781d380754a576db573959d4c76b5a32e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a85bc781d380754a576db573… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 16 22:39:41 2019 +0900 kernelbase: Use translated Unicode default char to check invalid chars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48288 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 3 +++ dlls/kernelbase/locale.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index dc25c55652..2c081586f2 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1005,12 +1005,15 @@ static void test_undefined_byte_char(void) LPCSTR str; BOOL is_error; } testset[] = { + { 37, "\x6f", FALSE }, { 874, "\xdd", TRUE }, { 932, "\xfe", TRUE }, { 932, "\x80", FALSE }, + { 932, "\x81\x45", FALSE }, { 936, "\xff", TRUE }, { 949, "\xff", TRUE }, { 950, "\xff", TRUE }, + { 1252, "?", FALSE }, { 1252, "\x90", FALSE }, { 1253, "\xaa", TRUE }, { 1255, "\xff", TRUE }, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index fba15555d2..c250c97968 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1044,12 +1044,12 @@ static int check_invalid_chars( const CPTABLEINFO *info, const unsigned char *sr { if (srclen == 1) break; /* partial char, error */ if (info->DBCSOffsets[off + src[1]] == info->UniDefaultChar && - ((src[0] << 8) | src[1]) != info->TransDefaultChar) break; + ((src[0] << 8) | src[1]) != info->TransUniDefaultChar) break; src++; srclen--; continue; } - if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransDefaultChar) + if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransUniDefaultChar) break; if (is_private_use_area_char( info->MultiByteTable[*src] )) break; } @@ -1058,7 +1058,7 @@ static int check_invalid_chars( const CPTABLEINFO *info, const unsigned char *sr { for ( ; srclen; src++, srclen-- ) { - if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransDefaultChar) + if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransUniDefaultChar) break; if (is_private_use_area_char( info->MultiByteTable[*src] )) break; }

1 0

Akihiro Sagawa : kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 3bb92d777385e229ed813397e2c7b57f7f5415bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb92d777385e229ed813397… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 16 22:39:39 2019 +0900 kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29..dc25c55652 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1001,7 +1001,7 @@ static void test_utf7_decoding(void) static void test_undefined_byte_char(void) { static const struct tag_testset { - INT codepage; + UINT codepage; LPCSTR str; BOOL is_error; } testset[] = { @@ -1017,6 +1017,7 @@ static void test_undefined_byte_char(void) { 1257, "\xa5", TRUE }, }; INT i, ret; + DWORD err; for (i = 0; i < ARRAY_SIZE(testset); i++) { if (! IsValidCodePage(testset[i].codepage)) @@ -1028,23 +1029,22 @@ static void test_undefined_byte_char(void) SetLastError(0xdeadbeef); ret = MultiByteToWideChar(testset[i].codepage, MB_ERR_INVALID_CHARS, testset[i].str, -1, NULL, 0); + err = GetLastError(); if (testset[i].is_error) { - ok(ret == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + ok(err == ERROR_NO_UNICODE_TRANSLATION, "Test %u: err is %u\n", i, err); + ok(ret == 0, "Test %u: ret is %d\n", i, ret); } else { - ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + ok(err == 0xdeadbeef, "Test %u: err is %u\n", i, err); + ok(ret == 2, "Test %u: ret is %d\n", i, ret); } SetLastError(0xdeadbeef); ret = MultiByteToWideChar(testset[i].codepage, 0, testset[i].str, -1, NULL, 0); - ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + err = GetLastError(); + ok(err == 0xdeadbeef, "Test %u: err is %u\n", i, err); + ok(ret == 2, "Test %u: ret is %d\n", i, ret); } }

1 0

André Hentschel : rpcrt4: Fix RpcNetworkIsProtseqValid[AW] spec file entries.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 6127c688eaa68b6adcc06f44bf41cb6f0c608d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6127c688eaa68b6adcc06f44… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 17:29:45 2019 +0100 rpcrt4: Fix RpcNetworkIsProtseqValid[AW] spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 6d7d0fbf7a..5d558bff75 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -413,8 +413,8 @@ @ stdcall RpcMgmtWaitServerListen() @ stdcall RpcNetworkInqProtseqsA(ptr) @ stdcall RpcNetworkInqProtseqsW(ptr) -@ stdcall RpcNetworkIsProtseqValidA(ptr) -@ stdcall RpcNetworkIsProtseqValidW(ptr) +@ stdcall RpcNetworkIsProtseqValidA(str) +@ stdcall RpcNetworkIsProtseqValidW(wstr) @ stub RpcNsBindingInqEntryNameA @ stub RpcNsBindingInqEntryNameW @ stub RpcObjectInqType

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019