January 2010 - Wine-Commits

Michael Stefaniuc : hhctrl.ocx: Fix the mem handling in get_attr() (Smatch) .
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 85afcdbfb3d1cae949c622098ff0d84b33500319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85afcdbfb3d1cae949c622098… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 26 22:13:54 2010 +0100 hhctrl.ocx: Fix the mem handling in get_attr() (Smatch). name_buf is allocated on the stack and node_buf by heap_alloc. Also don't leak node_buf when leaving the function. --- dlls/hhctrl.ocx/content.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 39be04b..10de54c 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -186,7 +186,7 @@ static const char *get_attr(const char *node, const char *name, int *len) ptr = strstr(node_buf, name_buf); if(!ptr) { WARN("name not found\n"); - heap_free(name_buf); + heap_free(node_buf); return NULL; } @@ -194,14 +194,16 @@ static const char *get_attr(const char *node, const char *name, int *len) ptr2 = strchr(ptr, '\"'); if(!ptr2) { - heap_free(name_buf); + heap_free(node_buf); return NULL; } *len = ptr2-ptr; - heap_free(name_buf); /* Return the pointer offset within the original string */ - return node+(ptr-node_buf); + ptr = node+(ptr-node_buf); + + heap_free(node_buf); + return ptr; } static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text)

1 0

Dylan Smith : wordpad: Reset rc.bottom between calls to EM_FORMATRANGE.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: fc473e0f6387fffac400cd69f6dca1356bcb84d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc473e0f6387fffac400cd69f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 27 02:25:10 2010 -0500 wordpad: Reset rc.bottom between calls to EM_FORMATRANGE. EM_FORMATRANGE will set rc.bottom within the FORMATRANGE struct to be the bottom of the area actually printed to, so this must be reset between calls to make sure that the page boundaries are consistent between the pages. --- programs/wordpad/print.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index dc18966..b920a4f 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -243,9 +243,11 @@ static int get_num_pages(HWND hEditorWnd, FORMATRANGE fr) do { + int bottom = fr.rc.bottom; page++; fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)&fr); + fr.rc.bottom = bottom; } while(fr.chrg.cpMin && fr.chrg.cpMin < fr.chrg.cpMax); @@ -260,7 +262,9 @@ static void char_from_pagenum(HWND hEditorWnd, FORMATRANGE *fr, int page) for(i = 1; i < page; i++) { + int bottom = fr->rc.bottom; fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); + fr->rc.bottom = bottom; } } @@ -328,6 +332,7 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) StartDocW(fr.hdc, &di); do { + int bottom = fr.rc.bottom; if(StartPage(fr.hdc) <= 0) break; @@ -335,6 +340,7 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) if(EndPage(fr.hdc) <= 0) break; + bottom = fr.rc.bottom; printedPages++; if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage)))

1 0

Dylan Smith : wordpad: Don' t render the text when getting the number of pages.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: ad52ae67a561aceae50f9fed7a7b099cf7893ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad52ae67a561aceae50f9fed7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 27 02:25:21 2010 -0500 wordpad: Don't render the text when getting the number of pages. EM_FORMATRANGE will render the text if wParam is non-zero, and there is no reason to actually render the text when just getting the number of pages. --- programs/wordpad/print.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index b920a4f..a6bdf40 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -245,7 +245,7 @@ static int get_num_pages(HWND hEditorWnd, FORMATRANGE fr) { int bottom = fr.rc.bottom; page++; - fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, + fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, (LPARAM)&fr); fr.rc.bottom = bottom; } @@ -263,7 +263,7 @@ static void char_from_pagenum(HWND hEditorWnd, FORMATRANGE *fr, int page) for(i = 1; i < page; i++) { int bottom = fr->rc.bottom; - fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); + fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, (LPARAM)fr); fr->rc.bottom = bottom; } }

1 0

Henri Verbeet : d3d9: Add depth clamp tests.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 983f96b82f397ef63e838293c8f6ffa6eb13c486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=983f96b82f397ef63e838293c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:35 2010 +0100 d3d9: Add depth clamp tests. --- dlls/d3d9/tests/visual.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 15ddd44..0d78271 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10572,6 +10572,138 @@ static void viewport_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); } +/* This test tests depth clamping / clipping behaviour: + * - When D3DRS_CLIPPING is disabled depth values are *clamped* to the + * minimum/maximum z value. + * - The viewport's MinZ/MaxZ is irrelevant for this. + * - When D3DRS_CLIPPING is enabled depth values are clipped. + * - Pretransformed vertices behave the same as regular vertices. + */ +static void depth_clamp_test(IDirect3DDevice9 *device) +{ + const struct tvertex quad1[] = + { + { 0, 0, 5.0f, 1.0, 0xff002b7f}, + { 640, 0, 5.0f, 1.0, 0xff002b7f}, + { 0, 480, 5.0f, 1.0, 0xff002b7f}, + { 640, 480, 5.0f, 1.0, 0xff002b7f}, + }; + const struct tvertex quad2[] = + { + { 0, 300, 10.0f, 1.0, 0xfff9e814}, + { 640, 300, 10.0f, 1.0, 0xfff9e814}, + { 0, 360, 10.0f, 1.0, 0xfff9e814}, + { 640, 360, 10.0f, 1.0, 0xfff9e814}, + }; + const struct vertex quad3[] = + { + {-0.65, 0.55, 5.0f, 0xffffffff}, + {-0.35, 0.55, 5.0f, 0xffffffff}, + {-0.65, 0.15, 5.0f, 0xffffffff}, + {-0.35, 0.15, 5.0f, 0xffffffff}, + }; + const struct vertex quad4[] = + { + {-0.87, 0.83, 10.0f, 0xffffffff}, + {-0.65, 0.83, 10.0f, 0xffffffff}, + {-0.87, 0.55, 10.0f, 0xffffffff}, + {-0.65, 0.55, 10.0f, 0xffffffff}, + }; + const struct vertex quad5[] = + { + { -0.5, 0.5, 10.0f, 0xff14f914}, + { 0.5, 0.5, 10.0f, 0xff14f914}, + { -0.5, -0.5, 10.0f, 0xff14f914}, + { 0.5, -0.5, 10.0f, 0xff14f914}, + }; + const struct tvertex quad6[] = + { + { 0, 120, 10.0f, 1.0, 0xfff91414}, + { 640, 120, 10.0f, 1.0, 0xfff91414}, + { 0, 180, 10.0f, 1.0, 0xfff91414}, + { 640, 180, 10.0f, 1.0, 0xfff91414}, + }; + + D3DVIEWPORT9 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 7.5; + + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(*quad4)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad5, sizeof(*quad5)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad6, sizeof(*quad6)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 75, 75); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 150); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -10627,6 +10759,7 @@ START_TEST(visual) IDirect3DDevice9_Present(device_ptr, NULL, NULL, NULL, NULL); /* Now execute the real tests */ + depth_clamp_test(device_ptr); stretchrect_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr);

1 0

Alexandre Julliard : makefiles: Generate the static library rules from configure.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: b6c275b1b4f2d4d942e7bd011172081f367c25cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c275b1b4f2d4d942e7bd011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 20:40:12 2010 +0100 makefiles: Generate the static library rules from configure. --- aclocal.m4 | 8 +++++++- configure | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 50 ++++---------------------------------------------- tools/make_makefiles | 26 ++++---------------------- 5 files changed, 65 insertions(+), 69 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b30e41e..a603833 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -215,7 +215,13 @@ dnl dnl Usage: WINE_CONFIG_LIB(name) dnl AC_DEFUN([WINE_CONFIG_LIB], -[WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])]) +[ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + $1/lib$1.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +$1/lib$1.a: $1 +$1/lib$1.cross.a: dummy + @cd $1 && \$(MAKE) lib$1.cross.a" +WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])]) dnl **** Add a message to the list displayed at the end **** dnl diff --git a/configure b/configure index 9eabf3c..75828ce 100755 --- a/configure +++ b/configure @@ -601,6 +601,8 @@ ALL_PROGRAM_BIN_INSTALL_DIRS ALL_PROGRAM_INSTALL_DIRS ALL_PROGRAM_DIRS ALL_TEST_DIRS +ALL_IMPORTLIB_RULES +ALL_STATIC_LIBS ALL_IMPLIB_DIRS ALL_DLL_DIRS ALL_TOP_DIRS @@ -13604,6 +13606,10 @@ ALL_DLL_DIRS="" ALL_IMPLIB_DIRS="" +ALL_STATIC_LIBS="" + +ALL_IMPORTLIB_RULES="" + ALL_TEST_DIRS="" ALL_PROGRAM_DIRS="" @@ -13713,6 +13719,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/actxprxy/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + adsiid/libadsiid.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +adsiid/libadsiid.a: adsiid +adsiid/libadsiid.cross.a: dummy + @cd adsiid && \$(MAKE) libadsiid.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/adsiid/Makefile" test "x$enable_adsiid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -14697,6 +14709,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxdiagn/tests/Makefile: dlls/dxdiagn/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dxdiagn/tests/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + dxerr8/libdxerr8.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +dxerr8/libdxerr8.a: dxerr8 +dxerr8/libdxerr8.cross.a: dummy + @cd dxerr8 && \$(MAKE) libdxerr8.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr8/Makefile" test "x$enable_dxerr8" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -14705,6 +14723,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxerr8/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + dxerr9/libdxerr9.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +dxerr9/libdxerr9.a: dxerr9 +dxerr9/libdxerr9.cross.a: dummy + @cd dxerr9 && \$(MAKE) libdxerr9.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr9/Makefile" test "x$enable_dxerr9" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -14729,6 +14753,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxgi/tests/Makefile: dlls/dxgi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dxgi/tests/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + dxguid/libdxguid.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +dxguid/libdxguid.a: dxguid +dxguid/libdxguid.cross.a: dummy + @cd dxguid && \$(MAKE) libdxguid.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxguid/Makefile" test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -16601,6 +16631,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/stress.dll16/Makefile: dlls/stress.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/stress.dll16/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + strmiids/libstrmiids.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +strmiids/libstrmiids.a: strmiids +strmiids/libstrmiids.cross.a: dummy + @cd strmiids && \$(MAKE) libstrmiids.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/strmiids/Makefile" test "x$enable_strmiids" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -16793,6 +16829,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/usp10/tests/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + uuid/libuuid.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +uuid/libuuid.a: uuid +uuid/libuuid.cross.a: dummy + @cd uuid && \$(MAKE) libuuid.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/uuid/Makefile" test "x$enable_uuid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -17001,6 +17043,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winecoreaudio.drv/Makefile: dlls/winecoreaudio.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winecoreaudio.drv/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + winecrt0/libwinecrt0.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +winecrt0/libwinecrt0.a: winecrt0 +winecrt0/libwinecrt0.cross.a: dummy + @cd winecrt0 && \$(MAKE) libwinecrt0.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winecrt0/Makefile" test "x$enable_winecrt0" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ diff --git a/configure.ac b/configure.ac index 4e9d263..158aafb 100644 --- a/configure.ac +++ b/configure.ac @@ -2091,6 +2091,8 @@ AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_IMPLIB_DIRS,"") +AC_SUBST(ALL_STATIC_LIBS,"") +AC_SUBST(ALL_IMPORTLIB_RULES,"") AC_SUBST(ALL_TEST_DIRS,"") AC_SUBST(ALL_PROGRAM_DIRS,"") AC_SUBST(ALL_PROGRAM_INSTALL_DIRS,"") diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 20dcb22..361e5fb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -31,15 +31,9 @@ IMPORT_SYMLINKS = \ libwinspool.$(IMPLIBEXT) \ libxinput.$(IMPLIBEXT) -IMPORT_LIBS = \ +STATIC_LIBS = @ALL_STATIC_LIBS@ +IMPORT_LIBS = $(STATIC_LIBS) \ $(IMPORT_SYMLINKS) \ - adsiid/libadsiid.a \ - dxerr8/libdxerr8.a \ - dxerr9/libdxerr9.a \ - dxguid/libdxguid.a \ - strmiids/libstrmiids.a \ - uuid/libuuid.a \ - winecrt0/libwinecrt0.a \ aclui/libaclui.$(IMPLIBEXT) \ activeds/libactiveds.$(IMPLIBEXT) \ advapi32/libadvapi32.$(IMPLIBEXT) \ @@ -184,17 +178,10 @@ IMPORT_LIBS = \ wtsapi32/libwtsapi32.$(IMPLIBEXT) \ xinput1_3/libxinput.$(IMPLIBEXT) -CROSS_IMPLIBS = \ +CROSS_IMPLIBS = $(STATIC_LIBS:.a=.cross.a) \ libd3dx9.cross.a \ libwinspool.cross.a \ libxinput.cross.a \ - adsiid/libadsiid.cross.a \ - dxerr8/libdxerr8.cross.a \ - dxerr9/libdxerr9.cross.a \ - dxguid/libdxguid.cross.a \ - strmiids/libstrmiids.cross.a \ - uuid/libuuid.cross.a \ - winecrt0/libwinecrt0.cross.a \ aclui/libaclui.cross.a \ activeds/libactiveds.cross.a \ advapi32/libadvapi32.cross.a \ @@ -812,36 +799,7 @@ libxinput.def: xinput1_3/libxinput.def $(BUILDSUBDIRS): $(IMPORT_LIBS) $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPORT_LIBS) -# Map library name to the corresponding directory - -adsiid/libadsiid.a: adsiid -adsiid/libadsiid.cross.a: dummy - @cd adsiid && $(MAKE) libadsiid.cross.a - -dxerr8/libdxerr8.a: dxerr8 -dxerr8/libdxerr8.cross.a: dummy - @cd dxerr8 && $(MAKE) libdxerr8.cross.a - -dxerr9/libdxerr9.a: dxerr9 -dxerr9/libdxerr9.cross.a: dummy - @cd dxerr9 && $(MAKE) libdxerr9.cross.a - -dxguid/libdxguid.a: dxguid -dxguid/libdxguid.cross.a: dummy - @cd dxguid && $(MAKE) libdxguid.cross.a - -strmiids/libstrmiids.a: strmiids -strmiids/libstrmiids.cross.a: dummy - @cd strmiids && $(MAKE) libstrmiids.cross.a - -uuid/libuuid.a: uuid -uuid/libuuid.cross.a: dummy - @cd uuid && $(MAKE) libuuid.cross.a - -winecrt0/libwinecrt0.a: winecrt0 -winecrt0/libwinecrt0.cross.a: dummy - @cd winecrt0 && $(MAKE) libwinecrt0.cross.a - +(a)ALL_IMPORTLIB_RULES@ # Misc rules diff --git a/tools/make_makefiles b/tools/make_makefiles index 9b5dc43..029994e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -509,27 +509,20 @@ sub update_dlls(@) $text .= sprintf " \\\n\tlib%s.\$(IMPLIBEXT)", $importlibs{$mod}; } - $text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; - foreach my $mod (sort keys %staticlib_dirs) - { - $text .= sprintf " \\\n\t%s/lib%s.a", $staticlib_dirs{$mod}, $mod; - } + $text .= "\n\nSTATIC_LIBS = \@ALL_STATIC_LIBS\@\n"; + $text .= "IMPORT_LIBS = \$(STATIC_LIBS) \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %importlibs) { $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(IMPLIBEXT)"; next unless defined $static_implibs{$mod}; $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(STATIC_IMPLIBEXT)"; } - $text .= "\n\nCROSS_IMPLIBS ="; + $text .= "\n\nCROSS_IMPLIBS = \$(STATIC_LIBS:.a=.cross.a)"; foreach my $mod (sort @lib_symlinks) { next if $mod =~ /16$/; $text .= sprintf " \\\n\tlib%s.cross.a", $importlibs{$mod}; } - foreach my $mod (sort keys %staticlib_dirs) - { - $text .= sprintf " \\\n\t%s/lib%s.cross.a", $staticlib_dirs{$mod}, $mod; - } foreach my $mod (sort keys %importlibs) { next if $mod =~ /16$/; @@ -576,18 +569,7 @@ sub update_dlls(@) $text .= "\$(BUILDSUBDIRS): \$(IMPORT_LIBS)\n"; $text .= "\$(INSTALLSUBDIRS:%=%/__install__) \$(INSTALLSUBDIRS:%=%/__install-lib__): \$(IMPORT_LIBS)\n\n"; - - # output the inter-dll dependencies and rules - - $text .= "# Map library name to the corresponding directory\n\n"; - - foreach my $mod (sort keys %staticlib_dirs) - { - my $dir = $staticlib_dirs{$mod}; - $text .= sprintf "%s/lib%s.a: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod}; - $text .= sprintf "%s/lib%s.cross.a: dummy\n", $dir, $mod; - $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.cross.a\n\n", $dir, $mod; - } + $text .= "\@ALL_IMPORTLIB_RULES\@\n"; $text .= "\n# Misc rules\n"; replace_in_file( "dlls/Makefile.in",

1 0

Alexandre Julliard : makefiles: Generate the import library rules from configure.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 950a0f87a0306c136626ea6ccbcb395133d49a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950a0f87a0306c136626ea6cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 21:10:14 2010 +0100 makefiles: Generate the import library rules from configure. --- aclocal.m4 | 26 ++- configure | 754 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 287 ++++++++++--------- dlls/Makefile.in | 777 +------------------------------------------------- tools/make_makefiles | 148 +--------- 5 files changed, 936 insertions(+), 1056 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=950a0f87a0306c136626e…

1 0

Henri Verbeet : wined3d: Add a FIXME for missing ARB_depth_clamp support.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: fe1024ae4f47dc4f7e2afffbea51e38bb42e9c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1024ae4f47dc4f7e2afffbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:34 2010 +0100 wined3d: Add a FIXME for missing ARB_depth_clamp support. --- dlls/wined3d/state.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 75cb837..d44dc2c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -584,6 +584,10 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, stru glEnable(GL_DEPTH_CLAMP); checkGLcall("glEnable(GL_DEPTH_CLAMP)"); } + else + { + FIXME("Clipping disabled, but ARB_depth_clamp isn't supported.\n"); + } } if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); }

1 0

Alexandre Julliard : ntdll: Verify the tail contents when validating a large block.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: bf975d1f85fad29588cf7979f1d40c11bc49bb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf975d1f85fad29588cf7979f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:08:22 2010 +0100 ntdll: Verify the tail contents when validating a large block. --- dlls/ntdll/heap.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7cbc8ef..2e0dcc6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -764,6 +764,8 @@ static ARENA_LARGE *find_large_block( HEAP *heap, const void *ptr ) */ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL quiet ) { + DWORD flags = heap->flags; + if ((ULONG_PTR)arena % getpagesize()) { if (quiet == NOISY) @@ -794,6 +796,25 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui } return FALSE; } + if (arena->data_size > arena->block_size - sizeof(*arena)) + { + ERR( "Heap %p: invalid large arena %p size %lx/%lx\n", + heap, arena, arena->data_size, arena->block_size ); + return FALSE; + } + if (flags & HEAP_TAIL_CHECKING_ENABLED) + { + SIZE_T i, unused = arena->block_size - sizeof(*arena) - arena->data_size; + const unsigned char *data = (const unsigned char *)(arena + 1) + arena->data_size; + + for (i = 0; i < unused; i++) + { + if (data[i] == ARENA_TAIL_FILLER) continue; + ERR("Heap %p: block %p tail overwritten at %p (byte %lu/%lu == 0x%02x)\n", + heap, arena + 1, data + i, i, unused, data[i] ); + return FALSE; + } + } return TRUE; } @@ -1614,7 +1635,11 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) pInUse = (ARENA_INUSE *)ptr - 1; if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) { - if (!find_large_block( heapPtr, ptr )) goto error; + ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); + + if (!large_arena) goto error; + if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) + goto error; free_large_block( heapPtr, flags, ptr ); goto done; } @@ -1682,7 +1707,11 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size pArena = (ARENA_INUSE *)ptr - 1; if (!(subheap = HEAP_FindSubHeap( heapPtr, pArena ))) { - if (!find_large_block( heapPtr, ptr )) goto error; + ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); + + if (!large_arena) goto error; + if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) + goto error; if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; notify_free( ptr ); goto done;

1 0

Alexandre Julliard : ntdll: Fill the tail of large blocks too for tail checking.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: dedabe9d543331acb6b26b21f4da1eb54cf7bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedabe9d543331acb6b26b21f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:04:45 2010 +0100 ntdll: Fill the tail of large blocks too for tail checking. --- dlls/ntdll/heap.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b68af25..e112031 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -692,6 +692,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) arena->block_size = block_size; arena->size = ARENA_LARGE_SIZE; arena->magic = ARENA_LARGE_MAGIC; + mark_block_tail( (char *)(arena + 1) + size, block_size - sizeof(*arena) - size, flags ); list_add_tail( &heap->large_list, &arena->entry ); notify_alloc( arena + 1, size, flags & HEAP_ZERO_MEMORY ); return arena + 1; @@ -722,9 +723,13 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz if (arena->block_size - sizeof(*arena) >= size) { + SIZE_T unused = arena->block_size - sizeof(*arena) - size; + /* FIXME: we could remap zero-pages instead */ - if ((flags & HEAP_ZERO_MEMORY) && size > arena->data_size) - memset( (char *)ptr + arena->data_size, 0, size - arena->data_size ); + if (size > arena->data_size) + initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); + else + mark_block_tail( (char *)ptr + size, unused, flags ); arena->data_size = size; return ptr; }

1 0

Alexandre Julliard : kernel32/tests: Add tests for tail checking on large heap blocks.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 356b06faea73d43c682d1ff2523ef37b020f15d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=356b06faea73d43c682d1ff25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:08:49 2010 +0100 kernel32/tests: Add tests for tail checking on large heap blocks. --- dlls/kernel32/tests/heap.c | 47 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 11a11a5..81850fe 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -488,7 +488,7 @@ static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; BOOL ret; - SIZE_T size; + SIZE_T size, large_size = 800 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08x\n", flags ); @@ -595,6 +595,51 @@ static void test_heap_checks( DWORD flags ) ret = HeapValidate( GetProcessHeap(), 0, NULL ); ok( ret, "HeapValidate failed\n" ); } + + /* now test large blocks */ + + p = HeapAlloc( GetProcessHeap(), 0, large_size ); + ok( p != NULL, "HeapAlloc failed\n" ); + + ret = HeapValidate( GetProcessHeap(), 0, p ); + ok( ret, "HeapValidate failed\n" ); + + size = HeapSize( GetProcessHeap(), 0, p ); + ok( size == large_size, "Wrong size %lu\n", size ); + + ok( p[large_size - 2] == 0, "wrong data %x\n", p[large_size - 2] ); + ok( p[large_size - 1] == 0, "wrong data %x\n", p[large_size - 1] ); + + if (flags & HEAP_TAIL_CHECKING_ENABLED) + { + /* Windows doesn't do tail checking on large blocks */ + ok( p[large_size] == 0xab || broken(p[large_size] == 0), "wrong data %x\n", p[large_size] ); + ok( p[large_size+1] == 0xab || broken(p[large_size+1] == 0), "wrong data %x\n", p[large_size+1] ); + ok( p[large_size+2] == 0xab || broken(p[large_size+2] == 0), "wrong data %x\n", p[large_size+2] ); + if (p[large_size] == 0xab) + { + p[large_size] = 0xcc; + ret = HeapValidate( GetProcessHeap(), 0, p ); + ok( !ret, "HeapValidate succeeded\n" ); + + /* other calls only check when HEAP_VALIDATE is set */ + if (flags & HEAP_VALIDATE) + { + size = HeapSize( GetProcessHeap(), 0, p ); + ok( size == ~(SIZE_T)0, "Wrong size %lu\n", size ); + + p2 = HeapReAlloc( GetProcessHeap(), 0, p, large_size - 3 ); + ok( p2 == NULL, "HeapReAlloc succeeded\n" ); + + ret = HeapFree( GetProcessHeap(), 0, p ); + ok( !ret, "HeapFree succeeded\n" ); + } + p[large_size] = 0xab; + } + } + + ret = HeapFree( GetProcessHeap(), 0, p ); + ok( ret, "HeapFree failed\n" ); } static void test_debug_heap( const char *argv0, DWORD flags )

1 0