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
July 2008
----- 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
1114 discussions
Start a n
N
ew thread
Detlef Riekenberg : advapi32/tests: Handle the results from Win9x in the registry tests.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: 24b02960173d8a60a4d1903a754c7f422c729e84 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=24b02960173d8a60a4d1903a7…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 29 23:58:04 2008 +0200 advapi32/tests: Handle the results from Win9x in the registry tests. --- dlls/advapi32/tests/registry.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 94ce15a..95608c6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -159,9 +159,8 @@ static const char *wine_debugstr_wn( const WCHAR *str, int n ) #define ADVAPI32_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hadvapi32, #func); \ - if(!p ## func) \ - trace("GetProcAddress(%s) failed\n", #func); + p ## func = (void*)GetProcAddress(hadvapi32, #func); + static void InitFunctionPtrs(void) { @@ -332,13 +331,21 @@ static void test_set_value(void) test_hkey_main_Value_A(NULL, substring2A, sizeof(substring2A)); test_hkey_main_Value_W(NULL, substring2W, sizeof(substring2W)); - /* only REG_SZ is supported */ + /* only REG_SZ is supported on NT*/ ret = RegSetValueA(hkey_main, NULL, REG_BINARY, string2A, sizeof(string2A)); - ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_SUCCESS */ + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), + "got %d (expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS)\n", ret); + ret = RegSetValueA(hkey_main, NULL, REG_EXPAND_SZ, string2A, sizeof(string2A)); - ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_SUCCESS */ + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), + "got %d (expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS)\n", ret); + ret = RegSetValueA(hkey_main, NULL, REG_MULTI_SZ, string2A, sizeof(string2A)); - ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_SUCCESS */ + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), + "got %d (expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS)\n", ret); /* Test RegSetValueExA with a 'zero-byte' string (as Office 2003 does). * Surprisingly enough we're supposed to get zero bytes out of it.
1
0
0
0
Dan Hipschman : kernel32/tests: Add tests for undocumented default timer queue "features".
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: 54752c4f873e0ef940ede8767cabb9f7445fcb05 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=54752c4f873e0ef940ede8767…
Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 29 14:38:23 2008 -0700 kernel32/tests: Add tests for undocumented default timer queue "features". --- dlls/kernel32/tests/sync.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2a686ca..02904f7 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -894,6 +894,47 @@ static void test_timer_queue(void) ret = pDeleteTimerQueueTimer(NULL, t1, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueTimer, default queue\n"); + + /* Try mixing default and non-default queues. Apparently this works. */ + q = pCreateTimerQueue(); + ok(q != NULL, "CreateTimerQueue\n"); + + t1 = NULL; + n1 = 0; + ret = pCreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 1000, + 1000, 0); + ok(ret, "CreateTimerQueueTimer\n"); + ok(t1 != NULL, "CreateTimerQueueTimer\n"); + + t2 = NULL; + n2 = 0; + ret = pCreateTimerQueueTimer(&t2, NULL, timer_queue_cb1, &n2, 1000, + 1000, 0); + ok(ret, "CreateTimerQueueTimer\n"); + ok(t2 != NULL, "CreateTimerQueueTimer\n"); + + ret = pChangeTimerQueueTimer(NULL, t1, 2000, 2000); + ok(ret, "ChangeTimerQueueTimer\n"); + + ret = pChangeTimerQueueTimer(q, t2, 2000, 2000); + ok(ret, "ChangeTimerQueueTimer\n"); + + ret = pDeleteTimerQueueTimer(NULL, t1, INVALID_HANDLE_VALUE); + ok(ret, "DeleteTimerQueueTimer\n"); + + ret = pDeleteTimerQueueTimer(q, t2, INVALID_HANDLE_VALUE); + ok(ret, "DeleteTimerQueueTimer\n"); + + /* Try to delete the default queue? In any case: not allowed. */ + SetLastError(0xdeadbeef); + ret = pDeleteTimerQueueEx(NULL, NULL); + ok(!ret, "DeleteTimerQueueEx\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "DeleteTimerQueueEx\n"); + + SetLastError(0xdeadbeef); + ret = pDeleteTimerQueueEx(q, NULL); + ok(!ret, "DeleteTimerQueueEx\n"); + ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); } START_TEST(sync)
1
0
0
0
Dan Hipschman : ntdll: Add support for a default timer queue.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: a148e190af1ad0c62190e8eb1299b78abc9a9cbf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a148e190af1ad0c62190e8eb1…
Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 29 14:36:41 2008 -0700 ntdll: Add support for a default timer queue. --- dlls/kernel32/tests/sync.c | 14 ++++++++++++++ dlls/ntdll/threadpool.c | 44 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index dcf2b62..2a686ca 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -880,6 +880,20 @@ static void test_timer_queue(void) ok(!ret, "DeleteTimerQueueEx\n"); ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); ok(d1.num_calls == 1, "DeleteTimerQueueTimer\n"); + + /* Test functions on the default timer queue. */ + t1 = NULL; + n1 = 0; + ret = pCreateTimerQueueTimer(&t1, NULL, timer_queue_cb1, &n1, 1000, + 1000, 0); + ok(ret, "CreateTimerQueueTimer, default queue\n"); + ok(t1 != NULL, "CreateTimerQueueTimer, default queue\n"); + + ret = pChangeTimerQueueTimer(NULL, t1, 2000, 2000); + ok(ret, "ChangeTimerQueueTimer, default queue\n"); + + ret = pDeleteTimerQueueTimer(NULL, t1, INVALID_HANDLE_VALUE); + ok(ret, "DeleteTimerQueueTimer, default queue\n"); } START_TEST(sync) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index e468cbe..18baeee 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -816,9 +816,14 @@ NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) { struct timer_queue *q = TimerQueue; struct queue_timer *t, *temp; - HANDLE thread = q->thread; + HANDLE thread; NTSTATUS status; + if (!q) + return STATUS_INVALID_HANDLE; + + thread = q->thread; + RtlEnterCriticalSection(&q->cs); q->quit = TRUE; if (list_head(&q->timers)) @@ -851,6 +856,31 @@ NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) return status; } +static struct timer_queue *default_timer_queue; + +static struct timer_queue *get_timer_queue(HANDLE TimerQueue) +{ + if (TimerQueue) + return TimerQueue; + else + { + if (!default_timer_queue) + { + HANDLE q; + NTSTATUS status = RtlCreateTimerQueue(&q); + if (status == STATUS_SUCCESS) + { + PVOID p = interlocked_cmpxchg_ptr( + (void **) &default_timer_queue, q, NULL); + if (p) + /* Got beat to the punch. */ + RtlDeleteTimerQueueEx(p, NULL); + } + } + return default_timer_queue; + } +} + /*********************************************************************** * RtlCreateTimer (NTDLL.@) * @@ -882,8 +912,12 @@ NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, ULONG Flags) { NTSTATUS status; - struct timer_queue *q = TimerQueue; - struct queue_timer *t = RtlAllocateHeap(GetProcessHeap(), 0, sizeof *t); + struct queue_timer *t; + struct timer_queue *q = get_timer_queue(TimerQueue); + if (!q) + return STATUS_NO_MEMORY; + + t = RtlAllocateHeap(GetProcessHeap(), 0, sizeof *t); if (!t) return STATUS_NO_MEMORY; @@ -933,8 +967,8 @@ NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, NTSTATUS WINAPI RtlUpdateTimer(HANDLE TimerQueue, HANDLE Timer, DWORD DueTime, DWORD Period) { - struct timer_queue *q = TimerQueue; struct queue_timer *t = Timer; + struct timer_queue *q = t->q; RtlEnterCriticalSection(&q->cs); /* Can't change a timer if it was once-only or destroyed. */ @@ -969,8 +1003,8 @@ NTSTATUS WINAPI RtlUpdateTimer(HANDLE TimerQueue, HANDLE Timer, NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, HANDLE CompletionEvent) { - struct timer_queue *q = TimerQueue; struct queue_timer *t = Timer; + struct timer_queue *q = t->q; NTSTATUS status = STATUS_PENDING; HANDLE event = NULL;
1
0
0
0
H. Verbeet : wined3d: FBO texture == drawable handling is already handled in LoadLocation().
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: c7da79ded332e46f20cc97ce37ce8b8fbddf7583 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c7da79ded332e46f20cc97ce3…
Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 29 23:14:51 2008 +0200 wined3d: FBO texture == drawable handling is already handled in LoadLocation(). --- dlls/wined3d/drawprim.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fb1f705..fddf365 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -922,7 +922,6 @@ void drawPrimitive(IWineD3DDevice *iface, int minIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSwapChain *swapchain; IWineD3DSurfaceImpl *target; int i; @@ -934,27 +933,13 @@ void drawPrimitive(IWineD3DDevice *iface, /* TODO: Only do all that if we're going to change anything */ if(target /*&& target->Flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)*/) { - swapchain = NULL; - if(i == 0) { - IWineD3DSurface_GetContainer((IWineD3DSurface *) target, &IID_IWineD3DSwapChain, (void **)&swapchain); - /* Need the surface in the drawable! */ IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - - /* TODO: Move fbo logic to ModifyLocation */ IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE); - if(swapchain) { - /* Onscreen target. Invalidate system memory copy and texture copy */ - IWineD3DSwapChain_Release(swapchain); - } else if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - /* FBO offscreen target. Texture == Drawable */ - target->Flags |= SFLAG_INTEXTURE; - } } else { /* Must be an fbo render target */ IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE); - target->Flags |= SFLAG_INTEXTURE; } } }
1
0
0
0
H. Verbeet : wined3d: Container dirtification is already handled in ModifyLocation().
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: 9b47996b41c186d6417c63ad662e73a5909efe7d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9b47996b41c186d6417c63ad6…
Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 29 23:14:44 2008 +0200 wined3d: Container dirtification is already handled in ModifyLocation(). --- dlls/wined3d/drawprim.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9a47f8b..fb1f705 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -923,7 +923,6 @@ void drawPrimitive(IWineD3DDevice *iface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSwapChain *swapchain; - IWineD3DBaseTexture *texture = NULL; IWineD3DSurfaceImpl *target; int i; @@ -933,12 +932,9 @@ void drawPrimitive(IWineD3DDevice *iface, for(i = 0; i < GL_LIMITS(buffers); i++) { target = (IWineD3DSurfaceImpl *) This->render_targets[i]; - /* TODO: Only do all that if we're going to change anything - * Texture container dirtification does not work quite right yet - */ + /* TODO: Only do all that if we're going to change anything */ if(target /*&& target->Flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)*/) { swapchain = NULL; - texture = NULL; if(i == 0) { IWineD3DSurface_GetContainer((IWineD3DSurface *) target, &IID_IWineD3DSwapChain, (void **)&swapchain); @@ -951,16 +947,7 @@ void drawPrimitive(IWineD3DDevice *iface, if(swapchain) { /* Onscreen target. Invalidate system memory copy and texture copy */ IWineD3DSwapChain_Release(swapchain); - } else if(wined3d_settings.offscreen_rendering_mode != ORM_FBO) { - /* Non-FBO target: Invalidate system copy, texture copy and dirtify the container */ - /* TODO: Move container dirtification to ModifyLocation */ - IWineD3DSurface_GetContainer((IWineD3DSurface *) target, &IID_IWineD3DBaseTexture, (void **)&texture); - - if(texture) { - IWineD3DBaseTexture_SetDirty(texture, TRUE); - IWineD3DTexture_Release(texture); - } - } else { + } else if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* FBO offscreen target. Texture == Drawable */ target->Flags |= SFLAG_INTEXTURE; }
1
0
0
0
Andrew Talbot : dmband: Sign-compare warning fix.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: 164e732ba19dce0aaf4ff9b5502fb6e0dcb9a31f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=164e732ba19dce0aaf4ff9b55…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jul 29 21:57:48 2008 +0100 dmband: Sign-compare warning fix. --- dlls/dmband/dmutils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index bfec1f1..19cba2b 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -63,7 +63,8 @@ BOOL IS_VALID_DMFORM (FOURCC chunkID) { /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) { if ((flags & names[i].val)) {
1
0
0
0
Mikołaj Zalewski : shell32: autocomplete: There is no need for separate IAutoComplete and IAutoComplete2 vtbls.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: 8525f6950f5f2f817d1b3f4b1a8452b5aac72e1d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8525f6950f5f2f817d1b3f4b1…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 29 17:23:09 2008 +0200 shell32: autocomplete: There is no need for separate IAutoComplete and IAutoComplete2 vtbls. --- dlls/shell32/autocomplete.c | 152 ++++++++----------------------------------- 1 files changed, 27 insertions(+), 125 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5eb76f7..a026e8b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -61,8 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - const IAutoCompleteVtbl *lpVtbl; - const IAutoComplete2Vtbl *lpvtblAutoComplete2; + const IAutoComplete2Vtbl *lpVtbl; LONG ref; BOOL enabled; HWND hwndEdit; @@ -75,20 +74,14 @@ typedef struct AUTOCOMPLETEOPTIONS options; } IAutoCompleteImpl; -static const IAutoCompleteVtbl acvt; -static const IAutoComplete2Vtbl ac2vt; - -static inline IAutoCompleteImpl *impl_from_IAutoComplete2( IAutoComplete2 *iface ) -{ - return (IAutoCompleteImpl *)((char*)iface - FIELD_OFFSET(IAutoCompleteImpl, lpvtblAutoComplete2)); -} +static const IAutoComplete2Vtbl acvt; /* converts This to an interface pointer */ #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpvtblAutoComplete2) +#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpvtbl) static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -109,7 +102,6 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO lpac->ref = 1; lpac->lpVtbl = &acvt; - lpac->lpvtblAutoComplete2 = &ac2vt; lpac->enabled = TRUE; lpac->enumstr = NULL; lpac->options = ACO_AUTOAPPEND; @@ -131,8 +123,8 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO /************************************************************************** * AutoComplete_QueryInterface */ -static HRESULT WINAPI IAutoComplete_fnQueryInterface( - IAutoComplete * iface, +static HRESULT WINAPI IAutoComplete2_fnQueryInterface( + IAutoComplete2 * iface, REFIID riid, LPVOID *ppvObj) { @@ -141,22 +133,16 @@ static HRESULT WINAPI IAutoComplete_fnQueryInterface( TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IAutoComplete)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAutoComplete) || + IsEqualIID(riid, &IID_IAutoComplete2)) { - *ppvObj = (IAutoComplete*)This; - } - else if(IsEqualIID(riid, &IID_IAutoComplete2)) - { - *ppvObj = _IAutoComplete2_ (This); + *ppvObj = (IAutoComplete2*)This; } if (*ppvObj) { - IAutoComplete_AddRef((IAutoComplete*)*ppvObj); + IUnknown_AddRef((IUnknown*)*ppvObj); TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); return S_OK; } @@ -165,10 +151,10 @@ static HRESULT WINAPI IAutoComplete_fnQueryInterface( } /****************************************************************************** - * IAutoComplete_fnAddRef + * IAutoComplete2_fnAddRef */ -static ULONG WINAPI IAutoComplete_fnAddRef( - IAutoComplete * iface) +static ULONG WINAPI IAutoComplete2_fnAddRef( + IAutoComplete2 * iface) { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); @@ -179,10 +165,10 @@ static ULONG WINAPI IAutoComplete_fnAddRef( } /****************************************************************************** - * IAutoComplete_fnRelease + * IAutoComplete2_fnRelease */ -static ULONG WINAPI IAutoComplete_fnRelease( - IAutoComplete * iface) +static ULONG WINAPI IAutoComplete2_fnRelease( + IAutoComplete2 * iface) { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); @@ -203,10 +189,10 @@ static ULONG WINAPI IAutoComplete_fnRelease( } /****************************************************************************** - * IAutoComplete_fnEnable + * IAutoComplete2_fnEnable */ -static HRESULT WINAPI IAutoComplete_fnEnable( - IAutoComplete * iface, +static HRESULT WINAPI IAutoComplete2_fnEnable( + IAutoComplete2 * iface, BOOL fEnable) { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; @@ -221,10 +207,10 @@ static HRESULT WINAPI IAutoComplete_fnEnable( } /****************************************************************************** - * IAutoComplete_fnInit + * IAutoComplete2_fnInit */ -static HRESULT WINAPI IAutoComplete_fnInit( - IAutoComplete * iface, +static HRESULT WINAPI IAutoComplete2_fnInit( + IAutoComplete2 * iface, HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, @@ -312,91 +298,7 @@ static HRESULT WINAPI IAutoComplete_fnInit( } /************************************************************************** - * IAutoComplete_fnVTable - */ -static const IAutoCompleteVtbl acvt = -{ - IAutoComplete_fnQueryInterface, - IAutoComplete_fnAddRef, - IAutoComplete_fnRelease, - IAutoComplete_fnInit, - IAutoComplete_fnEnable, -}; - -/************************************************************************** - * AutoComplete2_QueryInterface - */ -static HRESULT WINAPI IAutoComplete2_fnQueryInterface( - IAutoComplete2 * iface, - REFIID riid, - LPVOID *ppvObj) -{ - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - - return IAutoComplete_QueryInterface((IAutoComplete*)This, riid, ppvObj); -} - -/****************************************************************************** - * IAutoComplete2_fnAddRef - */ -static ULONG WINAPI IAutoComplete2_fnAddRef( - IAutoComplete2 * iface) -{ - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - - TRACE ("(%p)->(count=%u)\n", This, This->ref); - - return IAutoComplete2_AddRef((IAutoComplete*)This); -} - -/****************************************************************************** - * IAutoComplete2_fnRelease - */ -static ULONG WINAPI IAutoComplete2_fnRelease( - IAutoComplete2 * iface) -{ - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - - TRACE ("(%p)->(count=%u)\n", This, This->ref); - - return IAutoComplete_Release((IAutoComplete*)This); -} - -/****************************************************************************** - * IAutoComplete2_fnEnable - */ -static HRESULT WINAPI IAutoComplete2_fnEnable( - IAutoComplete2 * iface, - BOOL fEnable) -{ - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - - TRACE ("(%p)->(%s)\n", This, (fEnable)?"true":"false"); - - return IAutoComplete_Enable((IAutoComplete*)This, fEnable); -} - -/****************************************************************************** - * IAutoComplete2_fnInit - */ -static HRESULT WINAPI IAutoComplete2_fnInit( - IAutoComplete2 * iface, - HWND hwndEdit, - IUnknown *punkACL, - LPCOLESTR pwzsRegKeyPath, - LPCOLESTR pwszQuickComplete) -{ - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - - TRACE("(%p)\n", This); - - return IAutoComplete_Init((IAutoComplete*)This, hwndEdit, punkACL, pwzsRegKeyPath, pwszQuickComplete); -} - -/************************************************************************** - * IAutoComplete_fnGetOptions + * IAutoComplete2_fnGetOptions */ static HRESULT WINAPI IAutoComplete2_fnGetOptions( IAutoComplete2 * iface, @@ -404,7 +306,7 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( { HRESULT hr = S_OK; - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; TRACE("(%p) -> (%p)\n", This, pdwFlag); @@ -414,7 +316,7 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( } /************************************************************************** - * IAutoComplete_fnSetOptions + * IAutoComplete2_fnSetOptions */ static HRESULT WINAPI IAutoComplete2_fnSetOptions( IAutoComplete2 * iface, @@ -422,7 +324,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( { HRESULT hr = S_OK; - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; TRACE("(%p) -> (0x%x)\n", This, dwFlag); @@ -434,7 +336,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( /************************************************************************** * IAutoComplete2_fnVTable */ -static const IAutoComplete2Vtbl ac2vt = +static const IAutoComplete2Vtbl acvt = { IAutoComplete2_fnQueryInterface, IAutoComplete2_fnAddRef,
1
0
0
0
Tony Wasserka : d3dx9: Add stubs for the ID3DXSprite functions.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: 112effb160394e0b07054eae06e632339eb3917d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=112effb160394e0b07054eae0…
Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 23 16:50:01 2008 +0200 d3dx9: Add stubs for the ID3DXSprite functions. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 17 +++- dlls/d3dx9_36/sprite.c | 176 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 78cfd97..0b5a3d3 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ d3dx9_36_main.c \ font.c \ math.c \ - shader.c + shader.c \ + sprite.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 3193033..bf9c8f8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -88,7 +88,7 @@ @ stub D3DXCreateSkinInfoFromBlendedMesh @ stub D3DXCreateSkinInfoFVF @ stub D3DXCreateSphere -@ stub D3DXCreateSprite +@ stdcall D3DXCreateSprite(ptr ptr) @ stub D3DXCreateTeapot @ stub D3DXCreateTextA @ stub D3DXCreateTextW diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 33d83b2..e1c266d 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -29,12 +29,21 @@ typedef struct ID3DXFontImpl { - /* IUnknown fields */ - const ID3DXFontVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + const ID3DXFontVtbl *lpVtbl; + LONG ref; - /* ID3DXFont fields */ + /* ID3DXFont fields */ } ID3DXFontImpl; +typedef struct ID3DXSpriteImpl +{ + /* IUnknown fields */ + const ID3DXSpriteVtbl *lpVtbl; + LONG ref; + + /* ID3DXSprite fields */ +} ID3DXSpriteImpl; + #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c new file mode 100644 index 0000000..db97761 --- /dev/null +++ b/dlls/d3dx9_36/sprite.c @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2008 Tony Wasserka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +static HRESULT WINAPI ID3DXSpriteImpl_QueryInterface(LPD3DXSPRITE iface, REFIID riid, LPVOID *object) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + + TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXSprite)) { + IUnknown_AddRef(iface); + *object=This; + return S_OK; + } + WARN("(%p)->(%s, %p): not found\n", iface, debugstr_guid(riid), *object); + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXSpriteImpl_AddRef(LPD3DXSPRITE iface) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + ULONG ref=InterlockedIncrement(&This->ref); + TRACE("(%p): AddRef from %d\n", This, ref-1); + return ref; +} + +static ULONG WINAPI ID3DXSpriteImpl_Release(LPD3DXSPRITE iface) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + ULONG ref=InterlockedDecrement(&This->ref); + TRACE("(%p): ReleaseRef to %d\n", This, ref); + + if(ref==0) { + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(LPD3DXSPRITE iface, LPDIRECT3DDEVICE9 *device) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_GetTransform(LPD3DXSPRITE iface, D3DXMATRIX *transform) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_SetTransform(LPD3DXSPRITE iface, CONST D3DXMATRIX *transform) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_SetWorldViewRH(LPD3DXSPRITE iface, CONST D3DXMATRIX *world, CONST D3DXMATRIX *view) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_SetWorldViewLH(LPD3DXSPRITE iface, CONST D3DXMATRIX *world, CONST D3DXMATRIX *view) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_Begin(LPD3DXSPRITE iface, DWORD flags) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_Draw(LPD3DXSPRITE iface, LPDIRECT3DTEXTURE9 texture, CONST RECT *rect, CONST D3DXVECTOR3 *center, + CONST D3DXVECTOR3 *position, D3DCOLOR color) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_Flush(LPD3DXSPRITE iface) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_End(LPD3DXSPRITE iface) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_OnLostDevice(LPD3DXSPRITE iface) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ID3DXSpriteImpl_OnResetDevice(LPD3DXSPRITE iface) +{ + ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const ID3DXSpriteVtbl D3DXSprite_Vtbl = +{ + /*** IUnknown methods ***/ + ID3DXSpriteImpl_QueryInterface, + ID3DXSpriteImpl_AddRef, + ID3DXSpriteImpl_Release, + /*** ID3DXSprite methods ***/ + ID3DXSpriteImpl_GetDevice, + ID3DXSpriteImpl_GetTransform, + ID3DXSpriteImpl_SetTransform, + ID3DXSpriteImpl_SetWorldViewRH, + ID3DXSpriteImpl_SetWorldViewLH, + ID3DXSpriteImpl_Begin, + ID3DXSpriteImpl_Draw, + ID3DXSpriteImpl_Flush, + ID3DXSpriteImpl_End, + ID3DXSpriteImpl_OnLostDevice, + ID3DXSpriteImpl_OnResetDevice +}; + +HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite) +{ + ID3DXSpriteImpl *object; + + FIXME("stub\n"); + + if(device==NULL || sprite==NULL) return D3DERR_INVALIDCALL; + + object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXSpriteImpl)); + if(object==NULL) { + *sprite=NULL; + return E_OUTOFMEMORY; + } + object->lpVtbl=&D3DXSprite_Vtbl; + object->ref=1; + + *sprite=(ID3DXSprite*)object; + + return D3D_OK; +}
1
0
0
0
Vladimir Pankratov : taskmgr: Update Russian translation.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: b822886c70e7311f9c225f25a78a169f372366ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b822886c70e7311f9c225f25a…
Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 29 20:32:17 2008 +0500 taskmgr: Update Russian translation. --- programs/taskmgr/Ru.rc | 64 ++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index 0630b1f..e9d657b 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -188,9 +188,9 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&����� ������...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "�&������������",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "����� &������",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "&����� ������...",IDC_NEWTASK,177,189,63,14 + PUSHBUTTON "�&������������",IDC_SWITCHTO,111,189,63,14,WS_DISABLED + PUSHBUTTON "����� &������",IDC_ENDTASK,45,189,63,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 @@ -350,65 +350,65 @@ BEGIN WS_DISABLED | WS_TABSTOP,175,119,41,10 END -IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 20, 20, 244, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "����� ��������" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "������",IDCANCEL,138,178,50,14 + DEFPUSHBUTTON "OK",IDOK,132,176,50,14 + PUSHBUTTON "������",IDCANCEL,186,176,50,14 LTEXT "�������� �������, ������� �������� �� �������� ��������� ���������� �����.", - IDC_STATIC,7,7,181,17 + IDC_STATIC,7,4,227,19 CONTROL "&��� ������",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,7,28,56,10 + WS_DISABLED | WS_TABSTOP,7,26,105,10 CONTROL "������&�. �������� (PID)",IDC_PID,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,37,105,10 CONTROL "&�������� ��",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,50,53,10 + WS_TABSTOP,7,48,105,10 CONTROL "&����� ��",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,61,48,10 + WS_TABSTOP,7,59,105,10 CONTROL "&������ - �������������",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,72,63,10 + WS_TABSTOP,7,70,105,10 CONTROL "������ - ����&�����",IDC_MEMORYUSAGEDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,81,105,10 CONTROL "������ - &��������",IDC_PEAKMEMORYUSAGE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,92,105,10 CONTROL "&������ ��������",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,105,53,10 + WS_TABSTOP,7,103,105,10 CONTROL "��&����� USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,116,62,10 + WS_TABSTOP,7,114,105,10 CONTROL "����� ������",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,127,49,10 + WS_TABSTOP,7,125,105,10 CONTROL "��������� ����",IDC_IOREADBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,136,105,10 CONTROL "��� ��&����",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,149,50,10 + WS_TABSTOP,7,147,105,10 CONTROL "��&� ������������",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,160,51,10 + WS_TABSTOP,7,158,105,10 CONTROL "������ &�������� - ���������",IDC_PAGEFAULTSDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + BS_AUTOCHECKBOX | WS_TABSTOP,118,26,120,10 CONTROL "����� �����&������ ������",IDC_VIRTUALMEMORYSIZE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + BS_AUTOCHECKBOX | WS_TABSTOP,118,37,120,10 CONTROL "��&��������� ���",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,50,53,10 + WS_TABSTOP,118,48,120,10 CONTROL "������������� �&��",IDC_NONPAGEDPOOL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + BS_AUTOCHECKBOX | WS_TABSTOP,118,59,120,10 CONTROL "&������� ���������",IDC_BASEPRIORITY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + BS_AUTOCHECKBOX | WS_TABSTOP,118,70,120,10 CONTROL "������� &������������",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,83,59,10 + WS_TABSTOP,118,81,120,10 CONTROL "�&������ �������",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,94,59,10 + WS_TABSTOP,118,92,120,10 CONTROL "���&���� GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,105,55,10 + WS_TABSTOP,118,103,120,10 CONTROL "����� �������",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,116,49,10 + WS_TABSTOP,118,114,120,10 CONTROL "�������� ����",IDC_IOWRITEBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,118,125,120,10 CONTROL "������ ����-�����",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,138,46,10 + WS_TABSTOP,118,136,120,10 CONTROL "������ ���� ��� �����-������",IDC_IOOTHERBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,118,147,120,10 END /*
1
0
0
0
Alexandre Julliard : ntdll: Use the generic int 0x91 syscall on Solaris so that it works on all CPUs.
by Alexandre Julliard
30 Jul '08
30 Jul '08
Module: wine Branch: master Commit: eac613f60416b1610f7b57fd51dd8096ff7eccaf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eac613f60416b1610f7b57fd5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 29 20:41:30 2008 +0200 ntdll: Use the generic int 0x91 syscall on Solaris so that it works on all CPUs. --- dlls/ntdll/signal_i386.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 92e3819..fb2c0fd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -586,13 +586,9 @@ static void merge_vm86_pending_flags( EXCEPTION_RECORD *rec ) extern int sigaction_syscall( int sig, const struct sigaction *new, struct sigaction *old ); __ASM_GLOBAL_FUNC( sigaction_syscall, - "call 1f\n" - "1:\tpopl %edx\n\t" "movl $0x62,%eax\n\t" - "add $[2f-1b],%edx\n\t" - "movl %esp,%ecx\n\t" - "sysenter\n" - "2:\tret" ) + "int $0x91\n\t" + "ret" ) /* assume the same libc handler is used for all signals */ static void (*libc_sigacthandler)( int signal, siginfo_t *siginfo, void *context );
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
112
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
Results per page:
10
25
50
100
200