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
July
June
May
April
March
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
November 2011
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
2 participants
852 discussions
Start a n
N
ew thread
Alexandre Julliard : gdi32: Pass the full brush contents in the SelectBrush driver entry point.
by Alexandre Julliard
03 Nov '11
03 Nov '11
Module: wine Branch: master Commit: 24ac8c66bb494a11dca121fa31ddd3e9bd52d3a1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=24ac8c66bb494a11dca121fa3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 21:17:15 2011 +0100 gdi32: Pass the full brush contents in the SelectBrush driver entry point. --- dlls/gdi32/brush.c | 6 +++++- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/objects.c | 5 +++-- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 ++- dlls/gdi32/enhmfdrv/objects.c | 3 ++- dlls/gdi32/mfdrv/metafiledrv.h | 3 ++- dlls/gdi32/mfdrv/objects.c | 3 ++- dlls/wineps.drv/brush.c | 3 ++- dlls/wineps.drv/psdrv.h | 4 ++-- dlls/winex11.drv/brush.c | 3 ++- dlls/winex11.drv/x11drv.h | 3 ++- include/wine/gdi_driver.h | 4 ++-- 13 files changed, 30 insertions(+), 16 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=24ac8c66bb494a11dca12…
1
0
0
0
Alexandre Julliard : gdi32: Store internal brush data in separate fields in the brush object.
by Alexandre Julliard
03 Nov '11
03 Nov '11
Module: wine Branch: master Commit: 20ecd97bee647febca40ab51d96f1847753107ef URL:
http://source.winehq.org/git/wine.git/?a=commit;h=20ecd97bee647febca40ab51d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 20:58:36 2011 +0100 gdi32: Store internal brush data in separate fields in the brush object. --- dlls/gdi32/brush.c | 67 +++++++++++++++++++++------------------------------- 1 files changed, 27 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 45874af..5e811cb 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -34,8 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical brush object */ typedef struct { - GDIOBJHDR header; - LOGBRUSH logbrush; + GDIOBJHDR header; + LOGBRUSH logbrush; + HBITMAP bitmap; /* bitmap handle for DDB pattern brushes */ + BITMAPINFO *info; /* DIB info for pattern brushes */ + struct gdi_image_bits bits; /* DIB bits for pattern brushes */ + UINT usage; /* color usage for DIB info */ } BRUSHOBJ; #define NB_HATCH_STYLES 6 @@ -77,12 +81,11 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; + HGLOBAL hmem = 0; - if (!(ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(*ptr) ))) return 0; + if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) return 0; - ptr->logbrush.lbStyle = brush->lbStyle; - ptr->logbrush.lbColor = brush->lbColor; - ptr->logbrush.lbHatch = brush->lbHatch; + ptr->logbrush = *brush; switch (ptr->logbrush.lbStyle) { @@ -95,31 +98,26 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: - ptr->logbrush.lbHatch = (ULONG_PTR)BITMAP_CopyBitmap( (HBITMAP) ptr->logbrush.lbHatch ); + ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); + if (!ptr->bitmap) goto error; + ptr->logbrush.lbHatch = (ULONG_PTR)ptr->bitmap; ptr->logbrush.lbColor = 0; - if (!ptr->logbrush.lbHatch) goto error; break; + case BS_DIBPATTERN: + hmem = (HGLOBAL)ptr->logbrush.lbHatch; + if (!(ptr->logbrush.lbHatch = (ULONG_PTR)GlobalLock( hmem ))) goto error; + /* fall through */ case BS_DIBPATTERNPT: + ptr->usage = ptr->logbrush.lbColor; + ptr->info = copy_packed_dib( (BITMAPINFO *)ptr->logbrush.lbHatch, ptr->usage ); + if (hmem) GlobalUnlock( hmem ); + if (!ptr->info) goto error; + ptr->bits.ptr = (char *)ptr->info + bitmap_info_size( ptr->info, ptr->usage ); ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( (BITMAPINFO *) ptr->logbrush.lbHatch, - ptr->logbrush.lbColor ); - if (!ptr->logbrush.lbHatch) goto error; + ptr->logbrush.lbHatch = (ULONG_PTR)ptr->info; break; - case BS_DIBPATTERN: - { - BITMAPINFO* bmi; - HGLOBAL h = (HGLOBAL)ptr->logbrush.lbHatch; - - ptr->logbrush.lbStyle = BS_DIBPATTERN; - if (!(bmi = GlobalLock( h ))) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( bmi, ptr->logbrush.lbColor ); - GlobalUnlock( h ); - if (!ptr->logbrush.lbHatch) goto error; - break; - } - case BS_DIBPATTERN8X8: case BS_MONOPATTERN: case BS_INDEXED: @@ -135,13 +133,8 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) } error: - if (ptr->logbrush.lbHatch) - { - if (ptr->logbrush.lbStyle == BS_PATTERN) - DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); - else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) - HeapFree( GetProcessHeap(), 0, (void *)ptr->logbrush.lbHatch ); - } + if (ptr->bitmap) DeleteObject( ptr->bitmap ); + HeapFree( GetProcessHeap(), 0, ptr->info ); HeapFree( GetProcessHeap(), 0, ptr ); return 0; } @@ -411,15 +404,9 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) BRUSHOBJ *brush = free_gdi_handle( handle ); if (!brush) return FALSE; - switch(brush->logbrush.lbStyle) - { - case BS_PATTERN: - DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch ); - break; - case BS_DIBPATTERN: - HeapFree( GetProcessHeap(), 0, (void *)brush->logbrush.lbHatch ); - break; - } + if (brush->bits.free) brush->bits.free( &brush->bits ); + if (brush->bitmap) DeleteObject( brush->bitmap ); + HeapFree( GetProcessHeap(), 0, brush->info ); return HeapFree( GetProcessHeap(), 0, brush ); }
1
0
0
0
Nikolay Sivov : jscript: Use specified expression length to trace it.
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: b4987d095f2ec5dcf75411a9d9a0c130041e380f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b4987d095f2ec5dcf75411a9d…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 21:43:20 2011 +0300 jscript: Use specified expression length to trace it. --- dlls/jscript/regexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e38e6ea..baef45b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3846,7 +3846,7 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, RegExpInstance *regexp; HRESULT hres; - TRACE("%s %x\n", debugstr_w(exp), flags); + TRACE("%s %x\n", debugstr_wn(exp, len), flags); hres = alloc_regexp(ctx, NULL, ®exp); if(FAILED(hres))
1
0
0
0
Grazvydas Ignotas : ntdll: Fix restart size calculation.
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: edd4356dba407612fe06483a7a6e54f3d23e8def URL:
http://source.winehq.org/git/wine.git/?a=commit;h=edd4356dba407612fe06483a7…
Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Nov 2 19:27:51 2011 +0200 ntdll: Fix restart size calculation. --- dlls/ntdll/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e62cc82..65c8b8f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1812,7 +1812,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff if (res > 0 && (single_entry || io->Information + max_dir_info_size(class) > length)) { lseek( fd, (unsigned long)restart_pos, SEEK_SET ); - size = (char *)de - data; + size = (char *)de + de->d_reclen - data; io->Information = restart_info_pos; last_info = restart_last_info; goto restart;
1
0
0
0
Dmitry Timoshkov : kernel32: Use PAGE_READWRITE access when enabling write access to resource data.
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: 3daa153b297440ca9fe9503430f7ad2188687cc7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3daa153b297440ca9fe950343…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 31 13:48:08 2011 +0800 kernel32: Use PAGE_READWRITE access when enabling write access to resource data. --- dlls/kernel32/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 6b68057..54be105 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -412,7 +412,7 @@ static inline BOOL check_resource_write( void *addr ) return FALSE; if (addr < rsrc || (char *)addr >= (char *)rsrc + size) return FALSE; TRACE( "Broken app is writing to the resource data, enabling work-around\n" ); - VirtualProtect( rsrc, size, PAGE_WRITECOPY, NULL ); + VirtualProtect( rsrc, size, PAGE_READWRITE, NULL ); return TRUE; }
1
0
0
0
Louis Lenders : opengl32: Use wrappers for wglCreateContext and wglMakeCurrent instead of directly forwarding to gdi32 .
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: 8a2e38cc45aef0d064e3af53b347d7f84aec4ea7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8a2e38cc45aef0d064e3af53b…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 30 22:13:34 2011 +0100 opengl32: Use wrappers for wglCreateContext and wglMakeCurrent instead of directly forwarding to gdi32. --- dlls/opengl32/opengl32.spec | 4 ++-- dlls/opengl32/wgl.c | 37 +++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 9bd232f..3fcaa3c 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -336,7 +336,7 @@ @ stdcall glViewport( long long long long ) wine_glViewport @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext -@ stdcall wglCreateContext(long) gdi32.wglCreateContext +@ stdcall wglCreateContext(long) @ stdcall wglCreateLayerContext(long long) @ stdcall wglDeleteContext(long) gdi32.wglDeleteContext @ stdcall wglDescribeLayerPlane(long long long long ptr) @@ -347,7 +347,7 @@ @ stdcall wglGetLayerPaletteEntries(long long long long ptr) @ stdcall wglGetPixelFormat(long) gdi32.GetPixelFormat @ stdcall wglGetProcAddress(str) -@ stdcall wglMakeCurrent(long long) gdi32.wglMakeCurrent +@ stdcall wglMakeCurrent(long long) @ stdcall wglRealizeLayerPalette(long long long) @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cd60eb2..74f3d88 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -45,16 +45,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); -typedef struct wine_wgl_s { - PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); - - void WINAPI (*p_wglGetIntegerv)(GLenum pname, GLint* params); - void WINAPI (*p_wglFinish)(void); - void WINAPI (*p_wglFlush)(void); -} wine_wgl_t; - -/** global wgl object */ -static wine_wgl_t wine_wgl; +static struct +{ + PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); + BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); + HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); + void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); + void (WINAPI *p_wglFinish)(void); + void (WINAPI *p_wglFlush)(void); +} wine_wgl; #ifdef SONAME_LIBGLU #define MAKE_FUNCPTR(f) static typeof(f) * p##f; @@ -117,6 +116,22 @@ void enter_gl(void) const GLubyte * WINAPI wine_glGetString( GLenum name ); /*********************************************************************** + * wglMakeCurrent (OPENGL32.@) + */ +BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) +{ + return wine_wgl.p_wglMakeCurrent(hdc, hglrc); +} + +/*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wine_wgl.p_wglCreateContext(hdc); +} + +/*********************************************************************** * wglCreateLayerContext (OPENGL32.@) */ HGLRC WINAPI wglCreateLayerContext(HDC hdc, @@ -720,6 +735,8 @@ static BOOL process_attach(void) wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod_x11, "wine_tsx11_unlock" ); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); + wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); + wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); /* Interal WGL function */ wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv");
1
0
0
0
André Hentschel : apphelp: New dll stub.
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: e14e83837fcf6b30599c19d6e85c5cf50517a8ec URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e14e83837fcf6b30599c19d6e…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 31 20:05:49 2011 +0100 apphelp: New dll stub. --- configure | 1 + configure.ac | 1 + dlls/apphelp/Makefile.in | 5 ++ dlls/apphelp/apphelp.c | 41 +++++++++++ dlls/apphelp/apphelp.spec | 167 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 215 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e2f43ff..4c3cd84 100755 --- a/configure +++ b/configure @@ -14755,6 +14755,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll apphelp enable_apphelp wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test diff --git a/configure.ac b/configure.ac index 4ca2493..1340757 100644 --- a/configure.ac +++ b/configure.ac @@ -2373,6 +2373,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(apphelp) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in new file mode 100644 index 0000000..ce5de56 --- /dev/null +++ b/dlls/apphelp/Makefile.in @@ -0,0 +1,5 @@ +MODULE = apphelp.dll + +C_SRCS = apphelp.c + +@MAKE_DLL_RULES@ diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c new file mode 100644 index 0000000..bed3f5c --- /dev/null +++ b/dlls/apphelp/apphelp.c @@ -0,0 +1,41 @@ +/* + * Copyright 2011 André Hentschel + * + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(apphelp); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec new file mode 100644 index 0000000..a6ecf7f --- /dev/null +++ b/dlls/apphelp/apphelp.spec @@ -0,0 +1,167 @@ +@ stub AllowPermLayer +@ stub ApphelpCheckExe +@ stub ApphelpCheckInstallShieldPackage +@ stub ApphelpCheckMsiPackage +@ stub ApphelpCheckRunApp +@ stub ApphelpCheckRunAppEx +@ stub ApphelpCheckShellObject +@ stub ApphelpCreateAppcompatData +@ stub ApphelpFixMsiPackage +@ stub ApphelpFixMsiPackageExe +@ stub ApphelpFreeFileAttributes +@ stub ApphelpGetFileAttributes +@ stub ApphelpGetMsiProperties +@ stub ApphelpGetNTVDMInfo +@ stub ApphelpParseModuleData +@ stub ApphelpQueryModuleData +@ stub ApphelpQueryModuleDataEx +@ stub ApphelpUpdateCacheEntry +@ stub GetPermLayers +@ stub SdbAddLayerTagRefToQuery +@ stub SdbApphelpNotify +@ stub SdbApphelpNotifyExSdbApphelpNotifyEx +@ stub SdbBuildCompatEnvVariables +@ stub SdbCloseApphelpInformation +@ stub SdbCloseDatabase +@ stub SdbCloseDatabaseWrite +@ stub SdbCloseLocalDatabase +@ stub SdbCommitIndexes +@ stub SdbCreateDatabase +@ stub SdbCreateHelpCenterURL +@ stub SdbCreateMsiTransformFile +@ stub SdbDeclareIndex +@ stub SdbDumpSearchPathPartCaches +@ stub SdbEnumMsiTransforms +@ stub SdbEscapeApphelpURL +@ stub SdbFindFirstDWORDIndexedTag +@ stub SdbFindFirstMsiPackage +@ stub SdbFindFirstMsiPackage_Str +@ stub SdbFindFirstNamedTag +@ stub SdbFindFirstStringIndexedTag +@ stub SdbFindFirstTag +@ stub SdbFindFirstTagRef +@ stub SdbFindNextDWORDIndexedTag +@ stub SdbFindNextMsiPackage +@ stub SdbFindNextStringIndexedTag +@ stub SdbFindNextTag +@ stub SdbFindNextTagRef +@ stub SdbFreeDatabaseInformation +@ stub SdbFreeFileInfo +@ stub SdbFreeFlagInfo +@ stub SdbGetAppCompatDataSize +@ stub SdbGetAppPatchDir +@ stub SdbGetBinaryTagData +@ stub SdbGetDatabaseID +@ stub SdbGetDatabaseInformation +@ stub SdbGetDatabaseInformationByName +@ stub SdbGetDatabaseMatch +@ stub SdbGetDatabaseVersion +@ stub SdbGetDllPath +@ stub SdbGetEntryFlags +@ stub SdbGetFileAttributes +@ stub SdbGetFileImageType +@ stub SdbGetFileImageTypeEx +@ stub SdbGetFileInfo +@ stub SdbGetFirstChild +@ stub SdbGetIndex +@ stub SdbGetItemFromItemRef +@ stub SdbGetLayerName +@ stub SdbGetLayerTagRef +@ stub SdbGetLocalPDB +@ stub SdbGetMatchingExe +@ stub SdbGetMsiPackageInformation +@ stub SdbGetNamedLayer +@ stub SdbGetNextChild +@ stub SdbGetNthUserSdb +@ stub SdbGetPermLayerKeys +@ stub SdbGetShowDebugInfoOption +@ stub SdbGetShowDebugInfoOptionValue +@ stub SdbGetStandardDatabaseGUID +@ stub SdbGetStringTagPtr +@ stub SdbGetTagFromTagID +@ stub SdbGrabMatchingInfo +@ stub SdbGrabMatchingInfoEx +@ stub SdbGUIDFromString +@ stub SdbGUIDToString +@ stub SdbInitDatabase +@ stub SdbInitDatabaseEx +@ stub SdbIsNullGUID +@ stub SdbIsStandardDatabase +@ stub SdbIsTagrefFromLocalDB +@ stub SdbIsTagrefFromMainDB +@ stub SdbLoadString +@ stub SdbMakeIndexKeyFromString +@ stub SdbOpenApphelpDetailsDatabase +@ stub SdbOpenApphelpDetailsDatabaseSP +@ stub SdbOpenApphelpInformation +@ stub SdbOpenApphelpInformationByID +@ stub SdbOpenApphelpResourceFile +@ stub SdbOpenDatabase +@ stub SdbOpenDbFromGuid +@ stub SdbOpenLocalDatabase +@ stub SdbPackAppCompatData +@ stub SdbQueryApphelpInformation +@ stub SdbQueryBlockUpgrade +@ stub SdbQueryContext +@ stub SdbQueryData +@ stub SdbQueryDataEx +@ stub SdbQueryDataExTagID +@ stub SdbQueryFlagInfo +@ stub SdbQueryName +@ stub SdbQueryReinstallUpgrade +@ stub SdbReadApphelpData +@ stub SdbReadApphelpDetailsData +@ stub SdbReadBinaryTag +@ stub SdbReadBYTETag +@ stub SdbReadDWORDTagRef +@ stub SdbReadEntryInformation +@ stub SdbReadMsiTransformInfo +@ stub SdbReadPatchBits +@ stub SdbReadQWORDTag +@ stub SdbReadQWORDTagRef +@ stub SdbReadStringTag +@ stub SdbReadStringTagRef +@ stub SdbReadWORDTagRef +@ stub SdbRegisterDatabase +@ stub SdbReleaseDatabase +@ stub SdbReleaseMatchingExe +@ stub SdbResolveDatabase +@ stub SdbSetApphelpDebugParameters +@ stub SdbSetEntryFlags +@ stub SdbSetImageType +@ stub SdbSetPermLayerKeys +@ stub SdbShowApphelpDialog +@ stub SdbShowApphelpFromQuery +@ stub SdbStartIndexing +@ stub SdbStopIndexing +@ stub SdbStringDuplicate +@ stub SdbStringReplace +@ stub SdbStringReplaceArray +@ stub SdbTagIDToTagRef +@ stub SdbTagToString +@ stub SdbUnregisterDatabase +@ stub SdbWriteBinaryTag +@ stub SdbWriteBinaryTagFromFile +@ stub SdbWriteBYTETag +@ stub SdbWriteDWORDTag +@ stub SdbWriteNULLTag +@ stub SdbWriteQWORDTag +@ stub SdbWriteStringRefTag +@ stub SdbWriteStringTag +@ stub SdbWriteStringTagDirect +@ stub SdbWriteWORDTag +@ stub SE_DllLoaded +@ stub SE_DllUnloaded +@ stub SE_GetHookAPIs +@ stub SE_GetMaxShimCount +@ stub SE_GetProcAddressLoad +@ stub SE_GetShimCount +@ stub SE_InstallAfterInit +@ stub SE_InstallBeforeInit +@ stub SE_IsShimDll +@ stub SE_LdrEntryRemoved +@ stub SE_ProcessDying +@ stub SetPermLayers +@ stub ShimDbgPrint +@ stub ShimDumpCache +@ stub ShimFlushCache
1
0
0
0
Alexander Morozov : wincrypt.h: Fix a typo.
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: a39e87532b2c8c33ea756cbbe7edccbffa7f76ff URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a39e87532b2c8c33ea756cbbe…
Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Nov 2 15:16:07 2011 +0400 wincrypt.h: Fix a typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 843e09d..8ebcc4e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -593,7 +593,7 @@ typedef struct _CERT_REQUEST_INFO { typedef struct _CERT_KEYGEN_REQUEST_INFO { DWORD dwVersion; - CERT_PUBLIC_KEY_INFO SubjectPubliceKeyInfo; + CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo; LPWSTR pwszChallengeString; } CERT_KEYGEN_REQUEST_INFO, *PCERT_KEYGEN_REQUEST_INFO;
1
0
0
0
Marcus Meissner : kernel32: Make sure we reference stack data still in scope (Coverity).
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: df69fa186f193d227a2dc7a200010be30c2b6f71 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=df69fa186f193d227a2dc7a20…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Nov 2 11:53:40 2011 +0100 kernel32: Make sure we reference stack data still in scope (Coverity). --- dlls/kernel32/volume.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index a937f6b..e2b03a2 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -572,6 +572,8 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE hand static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE handle, enum fs_type type, const BYTE *superblock ) { + BYTE block[BLOCK_SIZE]; + switch(type) { case FS_ERROR: @@ -584,13 +586,9 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha return GETLONG( superblock, 0x33 ); case FS_UDF: { - BYTE block[BLOCK_SIZE]; - if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) break; - superblock = block; - /* fallthrough */ } case FS_ISO9660:
1
0
0
0
Alexandre Julliard : inetcpl: Convert dialogs to po files.
by Alexandre Julliard
02 Nov '11
02 Nov '11
Module: wine Branch: master Commit: fad88bc0c7fc73f1597143227d56ea682cc7ba1e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fad88bc0c7fc73f1597143227…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 14:55:15 2011 +0100 inetcpl: Convert dialogs to po files. --- dlls/inetcpl.cpl/Makefile.in | 19 +----- dlls/inetcpl.cpl/cpl_De.rc | 103 ----------------------------- dlls/inetcpl.cpl/cpl_En.rc | 101 ----------------------------- dlls/inetcpl.cpl/cpl_Fr.rc | 105 ------------------------------ dlls/inetcpl.cpl/cpl_He.rc | 66 ------------------- dlls/inetcpl.cpl/cpl_It.rc | 104 ------------------------------ dlls/inetcpl.cpl/cpl_Ja.rc | 65 ------------------- dlls/inetcpl.cpl/cpl_Ko.rc | 104 ------------------------------ dlls/inetcpl.cpl/cpl_Lt.rc | 104 ------------------------------ dlls/inetcpl.cpl/cpl_Nl.rc | 61 ----------------- dlls/inetcpl.cpl/cpl_Pl.rc | 83 ------------------------ dlls/inetcpl.cpl/cpl_Pt.rc | 63 ------------------ dlls/inetcpl.cpl/cpl_Ru.rc | 105 ------------------------------ dlls/inetcpl.cpl/cpl_Sr.rc | 103 ----------------------------- dlls/inetcpl.cpl/cpl_Sv.rc | 63 ------------------ dlls/inetcpl.cpl/cpl_Uk.rc | 65 ------------------- dlls/inetcpl.cpl/inetcpl.rc | 77 ++++++++++++++++++++++ po/ar.po | 135 ++++++++++++++++++++++++++++++++++----- po/bg.po | 138 +++++++++++++++++++++++++++++++++++----- po/ca.po | 143 ++++++++++++++++++++++++++++++++++++----- po/cs.po | 137 +++++++++++++++++++++++++++++++++++---- po/da.po | 142 ++++++++++++++++++++++++++++++++++++---- po/de.po | 145 +++++++++++++++++++++++++++++++++++++---- po/el.po | 134 ++++++++++++++++++++++++++++++++++---- po/en.po | 131 +++++++++++++++++++++++++++++++++---- po/en_US.po | 144 +++++++++++++++++++++++++++++++++++++---- po/eo.po | 139 +++++++++++++++++++++++++++++++++++----- po/es.po | 139 +++++++++++++++++++++++++++++++++++---- po/fa.po | 135 ++++++++++++++++++++++++++++++++++----- po/fi.po | 146 +++++++++++++++++++++++++++++++++++++----- po/fr.po | 145 +++++++++++++++++++++++++++++++++++++---- po/he.po | 133 ++++++++++++++++++++++++++++++++++---- po/hi.po | 133 ++++++++++++++++++++++++++++++++++---- po/hu.po | 141 ++++++++++++++++++++++++++++++++++++----- po/it.po | 144 +++++++++++++++++++++++++++++++++++++---- po/ja.po | 133 ++++++++++++++++++++++++++++++++++---- po/ko.po | 142 ++++++++++++++++++++++++++++++++++++---- po/lt.po | 146 +++++++++++++++++++++++++++++++++++++---- po/ml.po | 133 ++++++++++++++++++++++++++++++++++---- po/nb_NO.po | 142 ++++++++++++++++++++++++++++++++++++---- po/nl.po | 135 ++++++++++++++++++++++++++++++++++---- po/or.po | 133 ++++++++++++++++++++++++++++++++++---- po/pa.po | 133 ++++++++++++++++++++++++++++++++++---- po/pl.po | 146 +++++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 135 ++++++++++++++++++++++++++++++++++---- po/pt_PT.po | 142 ++++++++++++++++++++++++++++++++++++---- po/rm.po | 133 ++++++++++++++++++++++++++++++++++---- po/ro.po | 141 ++++++++++++++++++++++++++++++++++++---- po/ru.po | 146 +++++++++++++++++++++++++++++++++++++---- po/sk.po | 135 ++++++++++++++++++++++++++++++++++---- po/sl.po | 142 ++++++++++++++++++++++++++++++++++++---- po/sr_RS(a)cyrillic.po | 144 +++++++++++++++++++++++++++++++++++------ po/sr_RS(a)latin.po | 144 +++++++++++++++++++++++++++++++++++------ po/sv.po | 135 ++++++++++++++++++++++++++++++++++---- po/te.po | 133 ++++++++++++++++++++++++++++++++++---- po/th.po | 138 +++++++++++++++++++++++++++++++++++----- po/tr.po | 137 +++++++++++++++++++++++++++++++++++---- po/uk.po | 135 ++++++++++++++++++++++++++++++++++---- po/wa.po | 136 ++++++++++++++++++++++++++++++++++----- po/wine.pot | 131 +++++++++++++++++++++++++++++++++---- po/zh_CN.po | 143 ++++++++++++++++++++++++++++++++++++----- po/zh_TW.po | 143 ++++++++++++++++++++++++++++++++++++----- 62 files changed, 5618 insertions(+), 2013 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=fad88bc0c7fc73f159714…
1
0
0
0
← Newer
1
...
75
76
77
78
79
80
81
...
86
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
Results per page:
10
25
50
100
200