winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1233 discussions
Start a n
N
ew thread
Alexandre Julliard : kernel32: Don' t store the current codepage in the thread data.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: 9ff8da5499130b8fe0abc74b23736f3e4ee5d3d7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9ff8da5499130b8fe0abc74b2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 17:24:50 2009 +0100 kernel32: Don't store the current codepage in the thread data. --- dlls/kernel32/kernel_private.h | 3 +-- dlls/kernel32/locale.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 9cd4d74..9ec20d6 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -27,12 +27,11 @@ struct tagSYSLEVEL; struct kernel_thread_data { - UINT code_page; /* thread code page */ WORD stack_sel; /* 16-bit stack selector */ WORD htask16; /* Win16 task handle */ DWORD sys_count[4]; /* syslevel mutex entry counters */ struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ - void *pad[44]; /* change this if you add fields! */ + void *pad[45]; /* change this if you add fields! */ }; static inline struct kernel_thread_data *kernel_get_thread_data(void) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 834d5b9..d6a8492 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -222,7 +222,8 @@ static const union cptable *get_codepage_table( unsigned int codepage ) case CP_UTF8: break; case CP_THREAD_ACP: - if (!(codepage = kernel_get_thread_data()->code_page)) return ansi_cptable; + if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return ansi_cptable; + codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale ); /* fall through */ default: if (codepage == ansi_cptable->info.codepage) return ansi_cptable; @@ -2057,7 +2058,6 @@ BOOL WINAPI SetThreadLocale( LCID lcid ) } NtCurrentTeb()->CurrentLocale = lcid; - kernel_get_thread_data()->code_page = get_lcid_codepage( lcid ); } return TRUE; }
1
0
0
0
Stefan Leichter : ntoskrnl.exe: Add stub for KeSetPriorityThread.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: 0190edee7e66167b7ef9db5ac486c3ad690a2519 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0190edee7e66167b7ef9db5ac…
Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 29 10:13:37 2009 +0100 ntoskrnl.exe: Add stub for KeSetPriorityThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e25fae3..e52de4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1110,6 +1110,16 @@ ULONG WINAPI KeQueryTimeIncrement(void) /*********************************************************************** + * KeSetPriorityThread (NTOSKRNL.EXE.@) + */ +KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) +{ + FIXME("(%p %d)\n", Thread, Priority); + return Priority; +} + + +/*********************************************************************** * KeWaitForSingleObject (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 546b150..b319e2e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -612,7 +612,7 @@ @ stub KeSetIdealProcessorThread @ stub KeSetImportanceDpc @ stub KeSetKernelStackSwapEnable -@ stub KeSetPriorityThread +@ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql @ stub KeSetSystemAffinityThread @ stub KeSetTargetProcessorDpc diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8f8a6e1..3a8af73 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1065,6 +1065,7 @@ void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); +KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);
1
0
0
0
Stefan Leichter : ntoskrnl.exe: Add stub for KeReleaseSemaphore.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: d8a12d837463d5de6534ba1591be0351ccdc6a44 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d8a12d837463d5de6534ba159…
Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 29 10:13:16 2009 +0100 ntoskrnl.exe: Add stub for KeReleaseSemaphore. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 03abe10..e25fae3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1090,6 +1090,17 @@ void WINAPI KeQueryTickCount( LARGE_INTEGER *count ) /*********************************************************************** + * KeReleaseSemaphore (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeReleaseSemaphore( PRKSEMAPHORE Semaphore, KPRIORITY Increment, + LONG Adjustment, BOOLEAN Wait ) +{ + FIXME("(%p %d %d %d) stub\n", Semaphore, Increment, Adjustment, Wait ); + return 0; +} + + +/*********************************************************************** * KeQueryTimeIncrement (NTOSKRNL.EXE.@) */ ULONG WINAPI KeQueryTimeIncrement(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f6d213f..546b150 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -588,7 +588,7 @@ @ stub KeReleaseInterruptSpinLock @ stub KeReleaseMutant @ stub KeReleaseMutex -@ stub KeReleaseSemaphore +@ stdcall KeReleaseSemaphore(ptr long long long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b8f5149..8f8a6e1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1064,6 +1064,7 @@ PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);
1
0
0
0
Matteo Bruni : wpp: Clean state on error path.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: e1328203300cd8f19524b55a9ae8d047ce4fba9f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e1328203300cd8f19524b55a9…
Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Dec 26 16:19:06 2009 +0100 wpp: Clean state on error path. --- libs/wpp/wpp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 935bd49..bce968a 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -180,6 +180,7 @@ int wpp_parse( const char *input, FILE *output ) else if (!(pp_status.file = wpp_callbacks->open(input, 1))) { ppy_error("Could not open %s\n", input); + pp_pop_define_state(); return 2; }
1
0
0
0
Matteo Bruni : d3d9: Add D3DSHADER_COMPARISON definition.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: e0d02dfcc8ccd52ba5096088231caa2a1c9aa580 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e0d02dfcc8ccd52ba50960882…
Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Dec 26 16:18:18 2009 +0100 d3d9: Add D3DSHADER_COMPARISON definition. --- include/d3d9types.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index b453525..ab9d4ce 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -1557,4 +1557,16 @@ typedef enum _D3DCOMPOSERECTSOP{ } D3DCOMPOSERECTSOP; #endif /* D3D_DISABLE_9EX */ +typedef enum _D3DSHADER_COMPARISON +{ + D3DSPC_RESERVED0 = 0, + D3DSPC_GT, + D3DSPC_EQ, + D3DSPC_GE, + D3DSPC_LT, + D3DSPC_NE, + D3DSPC_LE, + D3DSPC_RESERVED1, +} D3DSHADER_COMPARISON; + #endif /* __WINE_D3D9TYPES_H */
1
0
0
0
Andrew Eikum : hlink/tests: Repair test to work as intended.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: ff13146e92e2baa3b6f949143a9bc6ab625f9352 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ff13146e92e2baa3b6f949143…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 28 17:40:52 2009 -0600 hlink/tests: Repair test to work as intended. --- dlls/hlink/tests/browse_ctx.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index e9806b8..483f604 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -41,17 +41,23 @@ static void test_SetInitialHlink(void) IMoniker *dummy, *found_moniker; IBindCtx *bindctx; WCHAR one[] = {'1',0}; - WCHAR friend[] = {'f','r','i','e','n','d',0}; - WCHAR *found_name; + WCHAR five[] = {'5',0}; + WCHAR *found_name, *exp_name; HRESULT hres; - hres = CreateItemMoniker(one, one, &dummy); + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(one, five, &dummy); ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + hres = IMoniker_GetDisplayName(dummy, bindctx, NULL, &exp_name); + ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void**)&bc); ok(hres == S_OK, "HlinkCreateBrowseContext failed: 0x%08x\n", hres); - hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, friend); + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); ok(hres == S_OK, "SetInitialHlink failed: 0x%08x\n", hres); hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); @@ -60,12 +66,9 @@ static void test_SetInitialHlink(void) hres = IHlink_GetMonikerReference(found_hlink, HLINKGETREF_DEFAULT, &found_moniker, NULL); ok(hres == S_OK, "GetMonikerReference failed: 0x%08x\n", hres); - hres = CreateBindCtx(0, &bindctx); - ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); - hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(strcmp_ww(found_name, friend), "Found display name should not have been %s\n", wine_dbgstr_w(friend)); + ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); IBindCtx_Release(bindctx); IMoniker_Release(found_moniker);
1
0
0
0
Michael Stefaniuc : winapi: Remove the special handling of GDI_AllocObject( ).
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: 906c963947b7fdb9ba2519fd814710aa49f4e283 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=906c963947b7fdb9ba2519fd8…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 01:16:26 2009 +0100 winapi: Remove the special handling of GDI_AllocObject(). That function doesn't exist anymore in Wine. --- tools/winapi/make_parser.pm | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 885f77a..773c5f3 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -347,13 +347,7 @@ sub gcc_output($$) { } elsif(/^ordered comparison of pointer with integer zero$/) { $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') from incompatible pointer type$/) { - my $arg = $1; - my $name = $2; - if(defined($name) && $name =~ /^GDI_AllocObject$/) { - $suppress = 1; - } else { - $suppress = 0; - } + $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') makes integer from pointer without a cast$/) { $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') makes pointer from integer without a cast$/) {
1
0
0
0
Jacek Caban : wininet: Fixed tests on older IEs.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: e5574369ddebd8788c8710331581a02347a3261d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5574369ddebd8788c8710331…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 28 21:21:53 2009 +0100 wininet: Fixed tests on older IEs. --- dlls/wininet/tests/url.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index f811882..1f012f0 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -218,35 +218,40 @@ static void test_crack_url(const crack_url_test_t *test) ok(urlw.nScheme == test->scheme, "[%s] urlw.nScheme = %d, expected %d\n", test->url, urlw.nScheme, test->scheme); - if(test->host_off == -1) + if(test->host_off == -1) { ok(!urlw.lpszHostName, "[%s] urlw.lpszHostName = %p, expected NULL\n", test->url, urlw.lpszHostName); - else + ok(urlw.dwHostNameLength == 0 || broken(urlw.dwHostNameLength == 1), "[%s] urlw.lpszHostNameLength = %d, expected %d\n", + test->url, urlw.dwHostNameLength, test->host_len); + }else { ok(urlw.lpszHostName == buf+test->host_off, "[%s] urlw.lpszHostName = %p, expected %p\n", test->url, urlw.lpszHostName, test->url+test->host_off); - if(test->host_skip_broken != -1 && urlw.dwHostNameLength == test->host_skip_broken) { - win_skip("skipping broken dwHostNameLength result\n"); - return; + ok(urlw.dwHostNameLength == test->host_len, "[%s] urlw.lpszHostNameLength = %d, expected %d\n", + test->url, urlw.dwHostNameLength, test->host_len); } - ok(urlw.dwHostNameLength == test->host_len, "[%s] urlw.lpszHostNameLength = %d, expected %d\n", - test->url, urlw.dwHostNameLength, test->host_len); ok(urlw.nPort == test->port, "[%s] nPort = %d, expected %d\n", test->url, urlw.nPort, test->port); - if(test->user_off == -1) + if(test->user_off == -1) { ok(!urlw.lpszUserName, "[%s] urlw.lpszUserName = %p\n", test->url, urlw.lpszUserName); - else + ok(urlw.dwUserNameLength == 0 || broken(urlw.dwUserNameLength == 1), "[%s] urlw.lpszUserNameLength = %d, expected %d\n", + test->url, urlw.dwUserNameLength, test->user_len); + }else { ok(urlw.lpszUserName == buf+test->user_off, "[%s] urlw.lpszUserName = %p, expected %p\n", test->url, urlw.lpszUserName, buf+test->user_off); - ok(urlw.dwUserNameLength == test->user_len, "[%s] urlw.lpszUserNameLength = %d, expected %d\n", - test->url, urlw.dwUserNameLength, test->user_len); + ok(urlw.dwUserNameLength == test->user_len, "[%s] urlw.lpszUserNameLength = %d, expected %d\n", + test->url, urlw.dwUserNameLength, test->user_len); + } - if(test->pass_off == -1) + if(test->pass_off == -1) { ok(!urlw.lpszPassword, "[%s] urlw.lpszPassword = %p\n", test->url, urlw.lpszPassword); - else + ok(urlw.dwPasswordLength == 0 || broken(urlw.dwPasswordLength), "[%s] urlw.lpszPasswordLength = %d, expected %d\n", + test->url, urlw.dwPasswordLength, test->pass_len); + }else { ok(urlw.lpszPassword == buf+test->pass_off, "[%s] urlw.lpszPassword = %p, expected %p\n", test->url, urlw.lpszPassword, buf+test->pass_off); - ok(urlw.dwPasswordLength == test->pass_len, "[%s] urlw.lpszPasswordLength = %d, expected %d\n", - test->url, urlw.dwPasswordLength, test->pass_len); + ok(urlw.dwPasswordLength == test->pass_len, "[%s] urlw.lpszPasswordLength = %d, expected %d\n", + test->url, urlw.dwPasswordLength, test->pass_len); + } if(test->path_off == -1) ok(!urlw.lpszUrlPath, "[%s] urlw.lpszPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); @@ -256,13 +261,16 @@ static void test_crack_url(const crack_url_test_t *test) ok(urlw.dwUrlPathLength == test->path_len, "[%s] urlw.lpszUrlPathLength = %d, expected %d\n", test->url, urlw.dwUrlPathLength, test->path_len); - if(test->extra_off == -1) + if(test->extra_off == -1) { ok(!urlw.lpszExtraInfo, "[%s] url.lpszExtraInfo = %p, expected NULL\n", test->url, urlw.lpszExtraInfo); - else + ok(urlw.dwExtraInfoLength == 0 || broken(urlw.dwExtraInfoLength == 1), "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", + test->url, urlw.dwExtraInfoLength, test->extra_len); + }else { ok(urlw.lpszExtraInfo == buf+test->extra_off, "[%s] urlw.lpszExtraInfo = %p, expected %p\n", test->url, urlw.lpszExtraInfo, buf+test->extra_off); - ok(urlw.dwExtraInfoLength == test->extra_len, "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", - test->url, urlw.dwExtraInfoLength, test->extra_len); + ok(urlw.dwExtraInfoLength == test->extra_len, "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", + test->url, urlw.dwExtraInfoLength, test->extra_len); + } } static void InternetCrackUrl_test(void)
1
0
0
0
Jacek Caban : mshtml: Use FindMimeFromData to find MIME if moniker doesn' t report it.
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: c9e3c27f0d25fdd16b9c740dfd76785ad36a2938 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c9e3c27f0d25fdd16b9c740df…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 28 21:19:29 2009 +0100 mshtml: Use FindMimeFromData to find MIME if moniker doesn't report it. --- dlls/mshtml/navigate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e17d48d..7cfc10e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -952,6 +952,21 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) && (BYTE)This->nsstream->buf[1] == 0xfe) This->nschannel->charset = heap_strdupA(UTF16_STR); + if(!This->nschannel->content_type) { + WCHAR *mime; + + hres = FindMimeFromData(NULL, NULL, This->nsstream->buf, This->nsstream->buf_size, NULL, 0, &mime, 0); + if(FAILED(hres)) + return hres; + + TRACE("Found MIME %s\n", debugstr_w(mime)); + + This->nschannel->content_type = heap_strdupWtoA(mime); + CoTaskMemFree(mime); + if(!This->nschannel->content_type) + return E_OUTOFMEMORY; + } + on_start_nsrequest(This); if(This->window)
1
0
0
0
Marcus Meissner : dbghelp: Initialize ret (Coverity).
by Alexandre Julliard
29 Dec '09
29 Dec '09
Module: wine Branch: master Commit: c39cd4c0ce4266a09bb71fcc59d3583f1a55f919 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c39cd4c0ce4266a09bb71fcc5…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Dec 28 21:13:10 2009 +0100 dbghelp: Initialize ret (Coverity). --- dlls/dbghelp/pe_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 5cce6a3..2937013 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -122,7 +122,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, IMAGE_SECTION_HEADER* sect_stabs = NULL; IMAGE_SECTION_HEADER* sect_stabstr = NULL; int i; - BOOL ret; + BOOL ret = FALSE; section = (IMAGE_SECTION_HEADER*) ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); @@ -163,7 +163,7 @@ static BOOL pe_load_dwarf(const struct process* pcs, struct module* module, int i; const char* strtable; const char* sectname; - BOOL ret; + BOOL ret = FALSE; if (nth->FileHeader.PointerToSymbolTable && nth->FileHeader.NumberOfSymbols) /* FIXME: no way to get strtable size */
1
0
0
0
← Newer
1
...
7
8
9
10
11
12
13
...
124
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
Results per page:
10
25
50
100
200