January 2017 - Wine-commits

Nikolay Sivov : dwrite: Restructure line wrapping logic, fix the way breaking position is selected.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 82d73733182a489f31508d9f2a97056c84661a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d73733182a489f31508d9f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:49 2017 +0300 dwrite: Restructure line wrapping logic, fix the way breaking position is selected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 301 ++++++++++++++++++++++++--------------------- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 161 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82d73733182a489f31508…

1 0

André Hentschel : krnl386.exe16: Fix some spec file entries.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: c005d8944135c5fda2c459954fac6327c22d7506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c005d8944135c5fda2c459954… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:10 2017 +0100 krnl386.exe16: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index f80cfcc..a06ba8c 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -587,12 +587,12 @@ @ stdcall -arch=win32 -register AllocMappedBuffer() @ stdcall -arch=win32 -register FreeMappedBuffer() @ stdcall -arch=win32 -register OT_32ThkLSF() -@ stdcall -arch=win32 ThunkInitLSF(long str long str str) +@ stdcall -arch=win32 ThunkInitLSF(ptr str long str str) @ stdcall -arch=win32 -register LogApiThkLSF(str) -@ stdcall -arch=win32 ThunkInitLS(long str long str str) +@ stdcall -arch=win32 ThunkInitLS(ptr str long str str) @ stdcall -arch=win32 -register LogApiThkSL(str) @ stdcall -arch=win32 -register Common32ThkLS() -@ stdcall -arch=win32 ThunkInitSL(long str long str str) +@ stdcall -arch=win32 ThunkInitSL(ptr str long str str) @ stdcall -arch=win32 -register LogCBThkSL(str) @ stdcall -arch=win32 ReleaseThunkLock(ptr) @ stdcall -arch=win32 RestoreThunkLock(long) @@ -600,7 +600,7 @@ @ stdcall -arch=win32 GetThunkBuff() @ stdcall -arch=win32 GetThunkStuff(str str) @ stdcall -arch=win32 K32WOWCallback16(long long) -@ stdcall -arch=win32 K32WOWCallback16Ex(ptr long long ptr ptr) +@ stdcall -arch=win32 K32WOWCallback16Ex(long long long ptr ptr) @ stdcall -arch=win32 K32WOWGetVDMPointer(long long long) @ stdcall -arch=win32 K32WOWHandle32(long long) @ stdcall -arch=win32 K32WOWHandle16(long long) @@ -615,7 +615,7 @@ @ stdcall -arch=win32 K32WOWDirectedYield16(long) @ stdcall -arch=win32 K32WOWGetVDMPointerFix(long long long) @ stdcall -arch=win32 K32WOWGetVDMPointerUnfix(long) -@ stdcall -arch=win32 K32WOWGetDescriptor(long long) +@ stdcall -arch=win32 K32WOWGetDescriptor(long ptr) @ stdcall -arch=win32 _KERNEL32_86(ptr) @ stdcall -arch=win32 SSOnBigStack() @ varargs -arch=win32 SSCall(long long ptr) @@ -686,7 +686,7 @@ @ stdcall -arch=win32 -norelay SUnMapLS_IP_EBP_36() @ stdcall -arch=win32 -norelay SUnMapLS_IP_EBP_40() @ stdcall -arch=win32 -norelay SUnMapLS_IP_EBP_8() -@ stdcall -arch=win32 ThunkConnect32(ptr str str str ptr ptr) +@ stdcall -arch=win32 ThunkConnect32(ptr str str str ptr long) @ stdcall -arch=win32 UTRegister(long str str str ptr ptr ptr) @ stdcall -arch=win32 UTUnRegister(long) @ stdcall -arch=win32 UnMapLS(long) @@ -712,7 +712,7 @@ @ stdcall -arch=win32 InitTask16(ptr) @ stdcall -arch=win32 IsBadReadPtr16(long long) @ stdcall -arch=win32 IsTask16(long) -@ stdcall -arch=win32 LoadModule16(str long) +@ stdcall -arch=win32 LoadModule16(str ptr) @ stdcall -arch=win32 LoadResource16(long long) @ stdcall -arch=win32 LocalAlloc16(long long) @ stdcall -arch=win32 LocalInit16(long long long)

1 0

André Hentschel : ntdll: Fix some more spec file entries.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 726698a1bfb33319be0f6daf641867443e57a37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=726698a1bfb33319be0f6daf6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 13:51:48 2017 +0100 ntdll: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 86 ++++++++++++++++++------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 56 ++++++++++++------------ 2 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=726698a1bfb33319be0f6…

1 0

André Hentschel : advapi32: Fix some spec file entries.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 7efd984f281e280ee5a9242a0ba332e12efccb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efd984f281e280ee5a9242a0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:03 2017 +0100 advapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 6 +++--- .../api-ms-win-security-lsapolicy-l1-1-0.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0ecd4e9..8e2911c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -452,7 +452,7 @@ # @ stub LsaManageSidNameMapping @ stdcall LsaNtStatusToWinError(long) @ stub LsaOpenAccount -@ stdcall LsaOpenPolicy(long long long long) +@ stdcall LsaOpenPolicy(long ptr long long) # @ stub LsaOpenPolicySce @ stub LsaOpenSecret @ stub LsaOpenTrustedDomain @@ -698,10 +698,10 @@ # @ stub SetInformationCodeAuthzLevelW # @ stub SetInformationCodeAuthzPolicyW @ stdcall SetKernelObjectSecurity(long long ptr) -@ stdcall SetNamedSecurityInfoA(str long ptr ptr ptr ptr ptr) +@ stdcall SetNamedSecurityInfoA(str long long ptr ptr ptr ptr) # @ stub SetNamedSecurityInfoExA # @ stub SetNamedSecurityInfoExW -@ stdcall SetNamedSecurityInfoW(wstr long ptr ptr ptr ptr ptr) +@ stdcall SetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr) @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) # @ stub SetPrivateObjectSecurityEx # @ stub SetSecurityAccessMask diff --git a/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec b/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec index 311ae94..4dd2973 100644 --- a/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec @@ -11,7 +11,7 @@ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) advapi32.LsaLookupNames2 @ stdcall LsaLookupSids(ptr long ptr ptr ptr) advapi32.LsaLookupSids @ stub LsaLookupSids2 -@ stdcall LsaOpenPolicy(long long long long) advapi32.LsaOpenPolicy +@ stdcall LsaOpenPolicy(long ptr long long) advapi32.LsaOpenPolicy @ stub LsaOpenSecret @ stdcall LsaQueryInformationPolicy(ptr long ptr) advapi32.LsaQueryInformationPolicy @ stub LsaQuerySecret

1 0

André Hentschel : odbc32: Fix some spec file entries.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 0c785e593be33a7debcc8bfd5e432b4d9f6a1be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c785e593be33a7debcc8bfd5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:18 2017 +0100 odbc32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/odbc32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index 766eec0..ccb540b 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec @@ -38,7 +38,7 @@ 38 stdcall SQLGetStmtAttr(long long ptr long ptr) 39 stdcall SQLSetConnectAttr(long long ptr long) 40 stdcall SQLColumns(long str long str long str long str long) - 41 stdcall SQLDriverConnect(long long str long str long str long) + 41 stdcall SQLDriverConnect(long long str long str long ptr long) 42 stdcall SQLGetConnectOption(long long ptr) 43 stdcall SQLGetData(long long long ptr long ptr) 44 stdcall SQLGetFunctions(long long ptr) @@ -103,7 +103,7 @@ 138 stdcall SQLGetStmtAttrW(long long ptr long ptr) 139 stdcall SQLSetConnectAttrW(long long ptr long) 140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) -141 stdcall SQLDriverConnectW(long long wstr long wstr long wstr long) +141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long) 142 stdcall SQLGetConnectOptionW(long long ptr) 145 stdcall SQLGetInfoW(long long ptr long ptr) 147 stdcall SQLGetTypeInfoW(long long)

1 0

André Hentschel : comctl32: Fix some spec file entries.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 99913e883b1cbb55b230e103d8f39f3824d0fba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99913e883b1cbb55b230e103d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:13 2017 +0100 comctl32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 1a5ab57..c3e9167 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -10,8 +10,8 @@ 6 stdcall CreateStatusWindowA(long str long long) 7 stdcall CreateToolbar(long long long long long long ptr long) 8 stdcall CreateMappedBitmap(long long long ptr long) - 9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) - 10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) + 9 stdcall -noname DPA_LoadStream(ptr ptr ptr ptr) + 10 stdcall -noname DPA_SaveStream(ptr ptr ptr ptr) 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) #12 stub Cctl1632_ThunkData32 13 stdcall MakeDragList(long) @@ -40,10 +40,10 @@ 236 stdcall -noname Str_SetPtrW(wstr wstr) 320 stdcall -ordinal DSA_Create(long long) 321 stdcall -ordinal DSA_Destroy(ptr) -322 stdcall -ordinal DSA_GetItem(ptr long long) +322 stdcall -ordinal DSA_GetItem(ptr long ptr) 323 stdcall -ordinal DSA_GetItemPtr(ptr long) -324 stdcall -ordinal DSA_InsertItem(ptr long long) -325 stdcall -ordinal DSA_SetItem (ptr long long) +324 stdcall -ordinal DSA_InsertItem(ptr long ptr) +325 stdcall -ordinal DSA_SetItem (ptr long ptr) 326 stdcall -ordinal DSA_DeleteItem(ptr long) 327 stdcall -ordinal DSA_DeleteAllItems(ptr) 328 stdcall -ordinal DPA_Create(long) @@ -62,7 +62,7 @@ 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) -350 stdcall -noname -private StrChrA(str str) +350 stdcall -noname -private StrChrA(str long) 351 stdcall -noname -private StrRChrA(str str long) 352 stdcall -noname -private StrCmpNA(str str long) 353 stdcall -noname -private StrCmpNIA(str str long) @@ -93,10 +93,10 @@ 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -ordinal DPA_EnumCallback(long long long) -386 stdcall -ordinal DPA_DestroyCallback(ptr ptr long) -387 stdcall -ordinal DSA_EnumCallback(ptr ptr long) -388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) +385 stdcall -ordinal DPA_EnumCallback(long long ptr) +386 stdcall -ordinal DPA_DestroyCallback(ptr ptr ptr) +387 stdcall -ordinal DSA_EnumCallback(ptr ptr ptr) +388 stdcall -ordinal DSA_DestroyCallback(ptr ptr ptr) 389 stub -noname SHGetProcessDword 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) 400 stdcall -ordinal CreateMRUListW(ptr)

1 0

André Hentschel : atl: Fix AtlModuleInit spec file entry.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 26e8873f734ae23ed853aca60d416d2fa089402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e8873f734ae23ed853aca60… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:48 2017 +0100 atl: Fix AtlModuleInit spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index da12228..9624253 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -8,7 +8,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) -16 stdcall AtlModuleInit(ptr long long) +16 stdcall AtlModuleInit(ptr ptr long) 17 stdcall AtlModuleRegisterClassObjects(ptr long long) 18 stdcall AtlModuleRegisterServer(ptr long ptr) 19 stdcall AtlModuleRegisterTypeLib(ptr wstr)

1 0

Gerald Pfeifer : server: Remove dead check in is_cpu_supported().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 4598d32ab418269a6aca3afd2207f0837211f2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4598d32ab418269a6aca3afd2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 16:25:08 2017 +0100 server: Remove dead check in is_cpu_supported(). Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index e18c208..67f976d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1220,7 +1220,7 @@ int is_cpu_supported( enum cpu_type cpu ) { unsigned int prefix_cpu_mask = get_prefix_cpu_mask(); - if (CPU_FLAG(cpu) && (supported_cpus & prefix_cpu_mask & CPU_FLAG(cpu))) return 1; + if (supported_cpus & prefix_cpu_mask & CPU_FLAG(cpu)) return 1; if (!(supported_cpus & prefix_cpu_mask)) set_error( STATUS_NOT_SUPPORTED ); else if (supported_cpus & CPU_FLAG(cpu))

1 0

Gerald Pfeifer : winedump: Increase buffer size and potential string length inoutput_spec_symbol.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 3d258b0fd7df2744c35a9b7ee5d8653fb6653aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d258b0fd7df2744c35a9b7ee… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 17:26:42 2017 +0100 winedump: Increase buffer size and potential string length inoutput_spec_symbol. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 6c2bfae..bbbb1ac 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -62,13 +62,13 @@ void output_spec_preamble (void) */ void output_spec_symbol (const parsed_symbol *sym) { - char ord_spec[16]; + char ord_spec[20]; assert (specfile); assert (sym && sym->symbol); if (sym->ordinal >= 0) - snprintf(ord_spec, 8, "%d", sym->ordinal); + snprintf(ord_spec, 12, "%d", sym->ordinal); else { ord_spec[0] = '@';

1 0

Francois Gouget : iphlpapi/tests: Remove an unnecessary NULL cast.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 77f78ddbf92bd5b5785c88a041b9aedae0a50d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f78ddbf92bd5b5785c88a04… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 15:52:02 2017 +0100 iphlpapi/tests: Remove an unnecessary NULL cast. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6991a39..cb73a9d 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1582,7 +1582,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, INVALID_HANDLE_VALUE, 0, AF_INET ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pAllocateAndGetTcpExTableFromStack( (void **)NULL, FALSE, GetProcessHeap(), 0, AF_INET ); + ret = pAllocateAndGetTcpExTableFromStack( NULL, FALSE, GetProcessHeap(), 0, AF_INET ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); }

1 0