April 2006 - Wine-Commits - list.winehq.org

Mike McCormack : shdocvw: Add class definition for InternetExplorer.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 152541b94c48c03c528659835482ad30f48b09fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=152541b94c48c03c5286598… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 5 23:24:31 2006 +0900 shdocvw: Add class definition for InternetExplorer. --- include/exdisp.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 32ce9df..56b7648 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -421,3 +421,14 @@ coclass ShellWindows [default] interface IShellWindows; [default, source] dispinterface DShellWindowsEvents; } + +[ + uuid(0002df01-0000-0000-c000-000000000046) +] +coclass InternetExplorer +{ + [default] interface IWebBrowser2; + interface IWebBrowserApp; + [default, source] dispinterface DWebBrowserEvents2; + [source] dispinterface DWebBrowserEvents; +}

1 0

Dmitry Timoshkov : gdi32: Add tests for GetBitmapBits and GetObject for a DIB section.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 140eabf3f4157b4ba9ae9091be8440a8d84d0050 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=140eabf3f4157b4ba9ae909… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 5 18:53:07 2006 +0900 gdi32: Add tests for GetBitmapBits and GetObject for a DIB section. Make them pass under Wine. --- dlls/gdi/bitmap.c | 53 +++++++--- dlls/gdi/tests/bitmap.c | 244 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 248 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=140eabf3f4157b4ba9a…

1 0

Paul Vriens : include: Add lmshare to lm.h.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 6c1dfc832ffd505d379c7280e62ff1351abbcc75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c1dfc832ffd505d379c728… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Wed Apr 5 10:43:45 2006 +0200 include: Add lmshare to lm.h. --- include/lm.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/lm.h b/include/lm.h index c88fe83..1205fa7 100644 --- a/include/lm.h +++ b/include/lm.h @@ -23,12 +23,13 @@ #include <lmcons.h> #include <lmerr.h> +#include <lmshare.h> #include <lmbrowsr.h> #include <lmaccess.h> +#include <lmserver.h> #include <lmwksta.h> #include <lmapibuf.h> #include <lmstats.h> #include <lmjoin.h> -#include <lmserver.h> #endif

1 0

Stefan Dösinger : wined3d: Add some type macros to wined3d_interface.h.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: df7a92f70c5c1222e29a65dc1da3172a2145434d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df7a92f70c5c1222e29a65d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Apr 5 10:31:45 2006 +0200 wined3d: Add some type macros to wined3d_interface.h. --- include/wine/wined3d_interface.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 101f530..c9318ff 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -162,6 +162,9 @@ DEFINE_GUID(IID_IWineD3DQuery, #else /* defined (__WINE_D3D_H ) */ /* Identical: */ +# define WINED3DLIGHT D3DLIGHT7 +# define WINED3DMATERIAL D3DMATERIAL7 +# define WINED3DVIEWPORT D3DVIEWPORT7 # define WINED3DGAMMARAMP DDGAMMARAMP #endif

1 0

Alexandre Julliard : winebuild: Remove a no longer necessary movzwl instruction.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 392933149b1f5b6653e010362a25a3bdc796ae7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=392933149b1f5b6653e0103… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 5 20:02:51 2006 +0200 winebuild: Remove a no longer necessary movzwl instruction. This could cause broken relays to be generated depending on the order of the entry points in the relay list. Also add a few missing tabs in the assembly output. --- tools/winebuild/spec16.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index d3b4ef3..a41ec0a 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -375,7 +375,6 @@ static void output_call16_function( FILE fprintf( outfile, "\tcall *8(%%ebp)\n" ); if (needs_ldt) fprintf( outfile, "\tmovl -4(%%ebp),%%esi\n" ); - if (odp->flags & FLAG_RET16) fprintf( outfile, "\tmovzwl %%ax,%%eax\n" ); fprintf( outfile, "\tleave\n" ); fprintf( outfile, "\tret\n" ); @@ -726,17 +725,17 @@ void BuildSpec16File( FILE *outfile, DLL } else { - fprintf( outfile, "shld $16,%%eax,%%edx\n" ); - fprintf( outfile, "orl %%eax,%%eax\n" ); + fprintf( outfile, "\tshld $16,%%eax,%%edx\n" ); + fprintf( outfile, "\torl %%eax,%%eax\n" ); nop_words = 1; } if (argsize) { - fprintf( outfile, "lretw $%u\n", argsize ); + fprintf( outfile, "\tlretw $%u\n", argsize ); nop_words--; } - else fprintf( outfile, "lretw\n" ); + else fprintf( outfile, "\tlretw\n" ); if (nop_words) fprintf( outfile, "\t%s\n", nop_sequence[nop_words-1] );

1 0

Alexandre Julliard : cards: Avoid GetPixel to draw round corners, use a clip region instead.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: c205d115c8638da17f3cb60a2e9e324739b3e9dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c205d115c8638da17f3cb60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 5 14:05:03 2006 +0200 cards: Avoid GetPixel to draw round corners, use a clip region instead. --- dlls/cards/cards.c | 53 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index c9db204..1ab50a5 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -175,35 +175,34 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, i if(roundCornersFlag) { - COLORREF savedPixels[12]; + /* NOTE: native uses Get/SetPixel for corners, but that really + * hurts on X11 since it needs a server round-trip for each pixel. + * So we use a clip region instead. */ + HRGN saved = CreateRectRgn( 0, 0, 0, 0 ); + HRGN line = CreateRectRgn( x + 2, y, x + dx - 2, y + 1 ); + HRGN clip = CreateRectRgn( x, y + 2, x + dx, y + dy - 2 ); + + CombineRgn( clip, clip, line, RGN_OR ); + SetRectRgn( line, x + 1, y + 1, x + dx - 1, y + 2 ); + CombineRgn( clip, clip, line, RGN_OR ); + SetRectRgn( line, x + 1, y + dy - 2, x + dx - 1, y + dy - 1 ); + CombineRgn( clip, clip, line, RGN_OR ); + SetRectRgn( line, x + 2, y + dy - 1, x + dx - 2, y + dy ); + CombineRgn( clip, clip, line, RGN_OR ); + DeleteObject( line ); + + if (!GetClipRgn( hdc, saved )) + { + DeleteObject( saved ); + saved = 0; + } + ExtSelectClipRgn( hdc, clip, RGN_AND ); + DeleteObject( clip ); - savedPixels[0] = GetPixel(hdc, x, y); - savedPixels[1] = GetPixel(hdc, x + 1, y); - savedPixels[2] = GetPixel(hdc, x, y + 1); - savedPixels[3] = GetPixel(hdc, x + dx - 1, y); - savedPixels[4] = GetPixel(hdc, x + dx - 2, y); - savedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1); - savedPixels[6] = GetPixel(hdc, x, y + dy - 1); - savedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1); - savedPixels[8] = GetPixel(hdc, x, y + dy - 2); - savedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1); - savedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1); - savedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2); + do_blt(hdc, x, y, dx, dy, hMemoryDC, rasterOp); - do_blt(hdc, x, y, dx, dy, hMemoryDC, rasterOp); - - SetPixel(hdc, x, y, savedPixels[0]); - SetPixel(hdc, x + 1, y, savedPixels[1]); - SetPixel(hdc, x, y + 1, savedPixels[2]); - SetPixel(hdc, x + dx - 1, y, savedPixels[3]); - SetPixel(hdc, x + dx - 2, y, savedPixels[4]); - SetPixel(hdc, x + dx - 1, y + 1, savedPixels[5]); - SetPixel(hdc, x, y + dy - 1, savedPixels[6]); - SetPixel(hdc, x + 1, y + dy - 1, savedPixels[7]); - SetPixel(hdc, x, y + dy - 2, savedPixels[8]); - SetPixel(hdc, x + dx - 1, y + dy - 1, savedPixels[9]); - SetPixel(hdc, x + dx - 2, y + dy - 1, savedPixels[10]); - SetPixel(hdc, x + dx - 1, y + dy - 2, savedPixels[11]); + SelectClipRgn( hdc, saved ); + if (saved) DeleteObject( saved ); } else do_blt(hdc, x, y, dx, dy, hMemoryDC, rasterOp);

1 0

James Hawkins : advpack: Factor out advpack error handling into ADV_HRESULT .
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 148a481266f9e67e4a2255c349235c35baa09a02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=148a481266f9e67e4a2255c… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 4 13:15:51 2006 -0500 advpack: Factor out advpack error handling into ADV_HRESULT. --- dlls/advpack/install.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index c8ce340..a33d429 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); #define SPAPI_MASK 0xFFFFL #define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX) +#define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x)) + /* this structure very closely resembles parameters of RunSetupCommand() */ typedef struct { @@ -366,7 +368,6 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn DWORD dwFlags, LPVOID pvReserved ) { HINF hinf; - DWORD err; TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), @@ -384,13 +385,7 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn hinf = SetupOpenInfFileW(szCmdName, NULL, INF_STYLE_WIN4, NULL); if (hinf == INVALID_HANDLE_VALUE) - { - err = GetLastError(); - if (err & SPAPI_ERROR) - return HRESULT_FROM_SPAPI(err); - else - return HRESULT_FROM_WIN32(err); - } + return ADV_HRESULT(GetLastError()); SetupCloseInfFile(hinf); return E_UNEXPECTED;

1 0

Mike McCormack : Add an implementation of iexplore.exe.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 5a5b35cec791c7616595f04e67b73e44483a6a9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5a5b35cec791c7616595f04… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 4 23:46:10 2006 +0900 Add an implementation of iexplore.exe. --- configure | 3 ++- configure.ac | 1 + programs/Makefile.in | 2 ++ programs/iexplore/.gitignore | 2 ++ programs/iexplore/Makefile.in | 14 ++++++++++++++ programs/iexplore/main.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 1 deletions(-) create mode 100644 programs/iexplore/.gitignore create mode 100644 programs/iexplore/Makefile.in create mode 100644 programs/iexplore/main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5a5b35cec791c761659…

1 0

Mike McCormack : shdocvw: Stub implementation of IEWinMain.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: fc33d3bca8fb2c87500ac4144d64c6621f7e3eca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc33d3bca8fb2c87500ac41… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 4 22:56:32 2006 +0900 shdocvw: Stub implementation of IEWinMain. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 636461c..209abd7 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -1,5 +1,5 @@ # ordinal exports -101 stub -noname IEWinMain +101 stdcall -noname IEWinMain(str long) 102 stub -noname CreateShortcutInDirA 103 stub -noname CreateShortcutInDirW 104 stdcall -noname WhichPlatformFORWARD() diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 83b03d0..68ae398 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -656,3 +656,15 @@ DWORD WINAPI StopWatchAFORWARD(DWORD dwC return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************** + * IEWinMain (SHDOCVW.101) + * + * Only returns on error. + */ +DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) +{ + FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow); + ExitProcess(0); + return 0; +}

1 0

qingdoa daoo : msvcrt: Fix a TRACE message to avoid buffer overflow.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 330978ec9ba0c33af92d0cd3caa91e00d0f6be95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=330978ec9ba0c33af92d0cd… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Apr 4 18:21:26 2006 -0700 msvcrt: Fix a TRACE message to avoid buffer overflow. --- dlls/msvcrt/environ.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index c59cd75..4b73b48 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -77,7 +77,7 @@ int _putenv(const char *str) char *dst; int ret; - TRACE("%s\n", str); + TRACE("%s\n", debugstr_a(str)); if (!str) return -1;

1 0