September 2006 - Wine-Commits

Robert Shearman : include: Add recently added PSDK VM flags to winnt.h.
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: f9e12a1001e57028b1c9b4ffd547f29ea6868590 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9e12a1001e57028b1c9b4f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:50:04 2006 +0100 include: Add recently added PSDK VM flags to winnt.h. --- include/winnt.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 7ae686a..119e0be 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -535,6 +535,7 @@ #define PAGE_EXECUTE_READWRITE 0x40 #define PAGE_EXECUTE_WRITECOPY 0x80 #define PAGE_GUARD 0x100 #define PAGE_NOCACHE 0x200 +#define PAGE_WRITECOMBINE 0x400 #define MEM_COMMIT 0x00001000 #define MEM_RESERVE 0x00002000 @@ -545,7 +546,10 @@ #define MEM_PRIVATE 0x000200 #define MEM_MAPPED 0x00040000 #define MEM_RESET 0x00080000 #define MEM_TOP_DOWN 0x00100000 +#define MEM_WRITE_WATCH 0x00200000 #define MEM_PHYSICAL 0x00400000 +#define MEM_LARGE_PAGES 0x20000000 +#define MEM_4MB_PAGES 0x80000000 #ifdef __WINESRC__ #define MEM_SYSTEM 0x80000000 #endif @@ -555,8 +559,11 @@ #define SEC_IMAGE 0x010000 #define SEC_RESERVE 0x04000000 #define SEC_COMMIT 0x08000000 #define SEC_NOCACHE 0x10000000 +#define SEC_LARGE_PAGES 0x80000000 #define MEM_IMAGE SEC_IMAGE +#define WRITE_WATCH_FLAG_RESET 0x00000001 + #define MINCHAR 0x80 #define MAXCHAR 0x7f

1 0

Robert Shearman : ntdll: Avoid crashing in check_atl_thunk if an execution exception was raised with a bad address .
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: 5881d91cfc20f830893e00b1220299de303ee225 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5881d91cfc20f830893e00b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:07 2006 +0100 ntdll: Avoid crashing in check_atl_thunk if an execution exception was raised with a bad address. --- dlls/ntdll/signal_i386.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 44f47ec..9a8f197 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -828,14 +828,26 @@ #include "poppack.h" */ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) { - struct atl_thunk *thunk = (struct atl_thunk *)rec->ExceptionInformation[1]; + const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; + BOOL ret = FALSE; - if (thunk->movl != 0x042444c7 || thunk->jmp != 0xe9) return FALSE; - *((DWORD *)context->Esp + 1) = thunk->this; - context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk->func; - TRACE( "emulating ATL thunk at %p, func=%08lx arg=%08lx\n", - thunk, context->Eip, *((DWORD *)context->Esp + 1) ); - return TRUE; + __TRY + { + if (thunk->movl == 0x042444c7 && thunk->jmp == 0xe9) + { + *((DWORD *)context->Esp + 1) = thunk->this; + context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk->func; + TRACE( "emulating ATL thunk at %p, func=%08lx arg=%08lx\n", + thunk, context->Eip, *((DWORD *)context->Esp + 1) ); + ret = TRUE; + } + } + __EXCEPT_PAGE_FAULT + { + return FALSE; + } + __ENDTRY + return ret; }

1 0

Jacek Caban : mshtml: Added get_readyState implementation.
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: 8b125182c1516d9973b27eea1ac92719fd9ae296 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b125182c1516d9973b27ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 27 16:37:36 2006 +0200 mshtml: Added get_readyState implementation. --- dlls/mshtml/htmldoc.c | 26 ++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 4 ++ dlls/mshtml/persist.c | 1 + dlls/mshtml/task.c | 23 ++++++++---- dlls/mshtml/tests/htmldoc.c | 81 ++++++++++++++++++++++++++++++++++++++---- 6 files changed, 118 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8b125182c1516d9973b…

1 0

Jacek Caban : mshtml: Remove conflicts between resource.h and mshtmcid.h.
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: 5c7078b2686747833d6771e064c432b6f23ef0cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c7078b2686747833d6771e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 27 16:36:19 2006 +0200 mshtml: Remove conflicts between resource.h and mshtmcid.h. --- dlls/mshtml/Bg.rc | 8 ++++---- dlls/mshtml/De.rc | 8 ++++---- dlls/mshtml/En.rc | 8 ++++---- dlls/mshtml/Fi.rc | 8 ++++---- dlls/mshtml/Fr.rc | 8 ++++---- dlls/mshtml/Hu.rc | 8 ++++---- dlls/mshtml/Ko.rc | 8 ++++---- dlls/mshtml/Nl.rc | 8 ++++---- dlls/mshtml/No.rc | 8 ++++---- dlls/mshtml/Sv.rc | 8 ++++---- dlls/mshtml/Tr.rc | 8 ++++---- dlls/mshtml/resource.h | 4 +--- dlls/mshtml/rsrc.rc | 1 + 13 files changed, 46 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5c7078b2686747833d6…

1 0

Dmitry Timoshkov : gdi32: Modify kerning scaling algorithm to the one which appears to better match what Windows does .
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: 98b2e55b5cf970ebfb39f203d9e63998c7d2522f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98b2e55b5cf970ebfb39f20… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 27 23:43:23 2006 +0900 gdi32: Modify kerning scaling algorithm to the one which appears to better match what Windows does. --- dlls/gdi/font.c | 9 +++- dlls/gdi/freetype.c | 14 ++++++ dlls/gdi/tests/font.c | 115 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 123 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=98b2e55b5cf970ebfb3…

1 0

Alexandre Julliard : git-to-cvs: Better detection of empty directories when generating .cvsignore.
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: tools Branch: master Commit: 6bdf6719a223361a6e265dd9b5ce6c2d595d240c URL: http://source.winehq.org/git/?p=tools.git;a=commit;h=6bdf6719a223361a6e265d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 11:33:43 2006 +0200 git-to-cvs: Better detection of empty directories when generating .cvsignore. --- git-to-cvs | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git-to-cvs b/git-to-cvs index ef393ea..e8b058b 100755 --- a/git-to-cvs +++ b/git-to-cvs @@ -22,6 +22,7 @@ # with .git (or GIT_DIR) pointing to the # use Unicode::String qw(latin1 utf8); +use File::Find; my %tags = (); @@ -176,8 +177,10 @@ sub make_cvsignore($) { my $dir = shift; my %patterns = (); - my @files = glob "$dir/*"; - if (@files > 1) # we always have a CVS dir + my $is_dir_empty = 1; + find sub { $is_dir_empty = 0 unless (-d $_ || $_ eq ".cvsignore" || $File::Find::name =~ /\/CVS\//); }, $dir; + + if (!$is_dir_empty) { foreach $file (read_all_gitignores($dir)) {

1 0

Alexandre Julliard : ole32/tests: Avoid using sizeof in a trace.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 335144dc04984bdf8c256731f0bd52874156feac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=335144dc04984bdf8c25673… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 27 20:54:05 2006 +0200 ole32/tests: Avoid using sizeof in a trace. --- dlls/ole32/tests/hglobalstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 82de590..482ef1b 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -54,7 +54,7 @@ static void test_streamonhglobal(IStream /* should return S_OK, not S_FALSE */ hr = IStream_Read(pStream, buffer, sizeof(buffer), &read); ok_ole_success(hr, "IStream_Read"); - ok(read == sizeof(data), "IStream_Read returned read %ld instead of %d\n", read, sizeof(data)); + ok(read == sizeof(data), "IStream_Read returned read %ld\n", read); /* ignores HighPart */ ull.HighPart = -1;

1 0

Alexandre Julliard : d3d9/tests: Don' t test texture states beyond the supported maximum.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: dba338f2e6b8b3417666f140a64e65e2afc894b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dba338f2e6b8b3417666f14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 27 20:53:01 2006 +0200 d3d9/tests: Don't test texture states beyond the supported maximum. --- dlls/d3d9/tests/stateblock.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 3eb5d6e..65a11e6 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -23,6 +23,8 @@ #include "wine/test.h" static HMODULE d3d9_handle = 0; +static DWORD texture_stages; + static HWND create_window(void) { WNDCLASS wc = {0}; @@ -761,7 +763,7 @@ static void transform_set_handler( hret = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, &tdata->texture0); ok(hret == D3D_OK, "SetTransform returned %#lx.\n", hret); - hret = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE7, &tdata->texture7); + hret = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0 + texture_stages - 1, &tdata->texture7); ok(hret == D3D_OK, "SetTransform returned %#lx.\n", hret); hret = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &tdata->world0); @@ -786,7 +788,7 @@ static void transform_get_handler( hret = IDirect3DDevice9_GetTransform(device, D3DTS_TEXTURE0, &tdata->texture0); ok(hret == D3D_OK, "GetTransform returned %#lx.\n", hret); - hret = IDirect3DDevice9_GetTransform(device, D3DTS_TEXTURE7, &tdata->texture7); + hret = IDirect3DDevice9_GetTransform(device, D3DTS_TEXTURE0 + texture_stages - 1, &tdata->texture7); ok(hret == D3D_OK, "GetTransform returned %#lx.\n", hret); hret = IDirect3DDevice9_GetTransform(device, D3DTS_WORLD, &tdata->world0); @@ -1317,6 +1319,8 @@ static void test_state_management( ok(hret == D3D_OK, "GetDeviceCaps returned %#lx.\n", hret); if (hret != D3D_OK) return; + texture_stages = caps.MaxTextureBlendStages; + if (caps.VertexShaderVersion & 0xffff) { shader_constants_queue_test(device, &tests[tcount], &buffer[bcount], FALSE); bcount += SHADER_CONSTANTS_REQ_BUFFER;

1 0

Mikołaj Zalewski : comctl32: toolbar: Test and fix TB_ADDSTRING from resource.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 5db5744c5b7ba23610cb966069d0dcce8f0da224 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5db5744c5b7ba23610cb966… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 26 21:30:26 2006 +0200 comctl32: toolbar: Test and fix TB_ADDSTRING from resource. --- dlls/comctl32/tests/resources.h | 10 ++ dlls/comctl32/tests/rsrc.rc | 11 ++ dlls/comctl32/tests/toolbar.c | 59 ++++++++++++ dlls/comctl32/toolbar.c | 185 +++++++++++---------------------------- 4 files changed, 130 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5db5744c5b7ba23610c…

1 0

Jan Zerebecki : wined3d: Fix typo in ResourceReleased.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 10d13b2186c173ae8989f4b7cdfe2e6d14bca020 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10d13b2186c173ae8989f4b… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Sep 25 11:54:14 2006 +0200 wined3d: Fix typo in ResourceReleased. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a218c8..943a616 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7927,14 +7927,14 @@ static void WINAPI IWineD3DDeviceImpl_Re */ if (This->updateStateBlock != NULL ) { /* ==NULL when device is being destroyed */ if ((IWineD3DResource *)This->updateStateBlock->streamSource[streamNumber] == resource) { - FIXME("Vertex buffer released whlst bound to a state block stream %d\n", streamNumber); + FIXME("Vertex buffer released while bound to a state block, stream %d\n", streamNumber); This->updateStateBlock->streamSource[streamNumber] = 0; /* Set changed flag? */ } } if (This->stateBlock != NULL ) { /* only happens if there is an error in the application, or on reset/release (because we don't manage internal tracking properly) */ if ((IWineD3DResource *)This->stateBlock->streamSource[streamNumber] == resource) { - TRACE("Vertex buffer released whlst bound to a state block stream %d\n", streamNumber); + TRACE("Vertex buffer released while bound to a state block, stream %d\n", streamNumber); This->stateBlock->streamSource[streamNumber] = 0; } }

1 0