wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

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

26 Jan '17

Module: wine Branch: master Commit: 1791b7d6ad7a9a08ef702c4b6676ab779f3b5b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791b7d6ad7a9a08ef702c4b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:49 2017 +0100 compstui: Fix SetCPSUIUserData spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/compstui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/compstui/compstui.spec b/dlls/compstui/compstui.spec index 08fdb47..7ba72a5 100644 --- a/dlls/compstui/compstui.spec +++ b/dlls/compstui/compstui.spec @@ -1,4 +1,4 @@ @ stdcall CommonPropertySheetUIA(long ptr long ptr) @ stdcall CommonPropertySheetUIW(long ptr long ptr) @ stdcall GetCPSUIUserData(long) -@ stdcall SetCPSUIUserData(long ptr) +@ stdcall SetCPSUIUserData(long long)

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

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 : 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 : 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 : 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 : 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

Bruno Jesus : iphlpapi/tests: Avoid ntoa() twice in function call as it returns same pointer.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 76644a7c26f2c2b3a5968665c349b45bdb294387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76644a7c26f2c2b3a5968665c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 15:33:00 2017 -0200 iphlpapi/tests: Avoid ntoa() twice in function call as it returns same pointer. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index cb73a9d..64d03cf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1598,9 +1598,12 @@ static void test_AllocateAndGetTcpExTableFromStack(void) trace( "AllocateAndGetTcpExTableFromStack table: %u entries\n", table_ex->dwNumEntries ); for (i = 0; i < table_ex->dwNumEntries; i++) { + char remote_ip[16]; + + strcpy(remote_ip, ntoa(table_ex->table[i].dwRemoteAddr)); trace( "%u: local %s:%u remote %s:%u state %u pid %u\n", i, ntoa(table_ex->table[i].dwLocalAddr), ntohs(table_ex->table[i].dwLocalPort), - ntoa( table_ex->table[i].dwRemoteAddr ), ntohs(table_ex->table[i].dwRemotePort), + remote_ip, ntohs(table_ex->table[i].dwRemotePort), U(table_ex->table[i]).dwState, table_ex->table[i].dwOwningPid ); } }

1 0

Vincent Povirk : hhctrl.ocx: Don't skip a tag in next_node.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 89ca96d06cf7ef063664a36069000341dfdc39c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ca96d06cf7ef063664a3606… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 11:23:02 2017 -0600 hhctrl.ocx: Don't skip a tag in next_node. At the time this function is called, we're already past the '<' that begins the current tag. Calling find_end_node twice here means we were skipping every other tag. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/stream.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 84ed317..b4239ca 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -139,17 +139,6 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) BOOL next_node(stream_t *stream, strbuf_t *buf) { - strbuf_t tmpbuf; - - /* search through the end of the current node */ - strbuf_init(&tmpbuf); - if(!find_node_end(stream, &tmpbuf)) - { - strbuf_free(&tmpbuf); - return FALSE; - } - strbuf_free(&tmpbuf); - /* find the beginning of the next node */ if(!stream_chr(stream, NULL, '<')) return FALSE;

1 0

Vincent Povirk : hhctrl.ocx: Also take basename of folders when searching.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: a16344ca1936254b021d82c4dfe6e2f6657010d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16344ca1936254b021d82c4d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 11:23:01 2017 -0600 hhctrl.ocx: Also take basename of folders when searching. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/search.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index 287e6d0..d758a1b 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -167,14 +167,14 @@ static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, } while (IEnumSTATSTG_Next(elem, 1, &entries, &retr) == NOERROR) { + filename = entries.pwcsName; + while(strchrW(filename, '/')) + filename = strchrW(filename, '/')+1; switch(entries.type) { case STGTY_STORAGE: - item = SearchCHM_Folder(item, pStorage, entries.pwcsName, needle); + item = SearchCHM_Folder(item, pStorage, filename, needle); break; case STGTY_STREAM: - filename = entries.pwcsName; - while(strchrW(filename, '/')) - filename = strchrW(filename, '/')+1; if(strstrW(filename, szHTMext)) { WCHAR *title = SearchCHM_File(pStorage, filename, needle);

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
50
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 January 2017