October 2012 - Wine-Commits

Henri Verbeet : include: Add the D3DDisassemble() prototype and flags.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 6e4fd6b171fba63b0240d055e2d94593bd86d7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4fd6b171fba63b0240d055e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:43 2012 +0200 include: Add the D3DDisassemble() prototype and flags. --- include/d3dcompiler.h | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 3950143..047c1ea 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -25,25 +25,31 @@ extern "C" { #endif -#define D3DCOMPILE_DEBUG 0x0001 -#define D3DCOMPILE_SKIP_VALIDATION 0x0002 -#define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004 -#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x0008 -#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x0010 -#define D3DCOMPILE_PARTIAL_PRECISION 0x0020 -#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x0040 -#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x0080 -#define D3DCOMPILE_NO_PRESHADER 0x0100 -#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x0200 -#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x0400 -#define D3DCOMPILE_ENABLE_STRICTNESS 0x0800 -#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 -#define D3DCOMPILE_IEEE_STRICTNESS 0x2000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x4000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x0000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0xC000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 -#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 + +#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 +#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 +#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 +#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 +#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, @@ -75,6 +81,8 @@ typedef enum D3D_BLOB_PART D3D_BLOB_TEST_COMPILE_PERF } D3D_BLOB_PART; +HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, + UINT flags, const char *comments, ID3DBlob **disassembly); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob);

1 0

Frédéric Delanoy : cmd/tests: Add tests for GTR comparison operator in "if" statements.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 5888ad35377d30683a30723e3975835474527a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5888ad35377d30683a30723e3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:28 2012 +0200 cmd/tests: Add tests for GTR comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b7e72ec..4256056 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -704,6 +704,11 @@ for %%i in (%STR_PARMS%) do call :GEQtest %%i B for %%i in (%STR_PARMS%) do call :GEQtest %%i AB for %%i in (%STR_PARMS%) do call :GEQtest %%i BA for %%i in (%STR_PARMS%) do call :GEQtest %%i AA +for %%i in (%STR_PARMS%) do call :GTRtest %%i A +for %%i in (%STR_PARMS%) do call :GTRtest %%i B +for %%i in (%STR_PARMS%) do call :GTRtest %%i AB +for %%i in (%STR_PARMS%) do call :GTRtest %%i BA +for %%i in (%STR_PARMS%) do call :GTRtest %%i AA echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -737,6 +742,10 @@ for %%i in (%INT_PARMS%) do call :GEQtest %%i 0 for %%i in (%INT_PARMS%) do call :GEQtest %%i 1 for %%i in (%INT_PARMS%) do call :GEQtest %%i 10 for %%i in (%INT_PARMS%) do call :GEQtest %%i 9 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 0 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 1 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 10 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -755,6 +764,9 @@ goto :eof :GEQtest if %1 GEQ %2 echo %1 GEQ %2 goto :eof +:GTRtest +if %1 GTR %2 echo %1 GTR %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 81686ff..6c1825e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -522,6 +522,16 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)AB GEQ AA @todo_wine(a)BA GEQ AA @todo_wine(a)AA GEQ AA +(a)todo_wine@B GTR A +(a)todo_wine@AB GTR A +(a)todo_wine@BA GTR A +(a)todo_wine@AA GTR A +(a)todo_wine@BA GTR B +(a)todo_wine@B GTR AB +(a)todo_wine@BA GTR AB +(a)todo_wine@B GTR AA +(a)todo_wine@AB GTR AA +(a)todo_wine@BA GTR AA ------ for numbers negative numbers handled negative numbers handled @@ -576,6 +586,12 @@ also in negative form @todo_wine(a)10 GEQ 10 @todo_wine(a)10 GEQ 9 @todo_wine(a)9 GEQ 9 +(a)todo_wine@1 GTR 0 +(a)todo_wine@10 GTR 0 +(a)todo_wine@9 GTR 0 +(a)todo_wine@10 GTR 1 +(a)todo_wine@9 GTR 1 +(a)todo_wine@10 GTR 9 ------------ Testing for ------------ --- plain FOR A

1 0

Nikolay Sivov : dwrite: Implement GetFontFamily() for system font collection.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 10431905e50baa8d0b3ffaf50b9af3a34bf57157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10431905e50baa8d0b3ffaf50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 00:06:03 2012 -0400 dwrite: Implement GetFontFamily() for system font collection. --- dlls/dwrite/font.c | 14 ++++++++++++-- dlls/dwrite/tests/font.c | 7 +++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 60aa7db..bdc84ee 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -161,6 +161,8 @@ struct dwrite_fontface { LONG ref; }; +static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); + static inline struct dwrite_fontface *impl_from_IDWriteFontFace(IDWriteFontFace *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace_iface); @@ -666,8 +668,16 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, family); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p)\n", This, index, family); + + if (index >= This->count) + { + *family = NULL; + return E_FAIL; + } + + return create_fontfamily(This->families[index], family); } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 423c876..dde50eb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -526,6 +526,7 @@ todo_wine static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; + IDWriteFontFamily *family; HRESULT hr; UINT32 i; BOOL ret; @@ -546,6 +547,12 @@ static void test_system_fontcollection(void) i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i); + /* invalid index */ + family = (void*)0xdeadbeef; + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(family == NULL, "got %p\n", family); + ret = FALSE; i = (UINT32)-1; hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &i, &ret);

1 0

Christian Costa : d3dxof/tests: Document dump function and rename X files with .x extension.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 834512f186b9138d8e43dbc86b7da3cc74fdf742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834512f186b9138d8e43dbc86… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Oct 22 21:39:19 2012 +0200 d3dxof/tests: Document dump function and rename X files with .x extension. --- dlls/d3dxof/tests/d3dxof.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 6361317..182bf33 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -706,6 +706,8 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); } +/* Dump an X file 'objects.x' and its related templates file 'templates.x' if they are both presents + * Useful for debug by comparing outputs from native and builtin dlls */ static void test_dump(void) { HRESULT hr; @@ -724,12 +726,12 @@ static void test_dump(void) } /* Dump data only if there is an object and a template */ - hFile = CreateFileA("objects.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileA("objects.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) return; CloseHandle(hFile); - hFile = CreateFileA("templates.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileA("templates.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) return;

1 0

Alexandre Julliard : Revert "winex11: Refuse to set the pixel format for HWND_MESSAGE windows."
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: f950f41bfe821879b9974f204c1f0e7ad26ebf89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f950f41bfe821879b9974f204… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 23 16:34:57 2012 +0200 Revert "winex11: Refuse to set the pixel format for HWND_MESSAGE windows." This reverts commit 53806917a3fc32460201a40a9edd6d8d24983c25. Tests show that this is allowed. --- dlls/opengl32/tests/opengl.c | 79 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 12 ++---- 2 files changed, 83 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4f799d2..02a72c8 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1110,6 +1110,84 @@ static void test_window_dc(void) DestroyWindow(window); } +static void test_message_window(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + RECT vp, r; + HGLRC ctx; + BOOL ret; + HDC dc; + GLenum glerr; + + window = CreateWindowA("static", "opengl32_test", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, HWND_MESSAGE, 0, 0, 0); + if (!window) + { + win_skip( "HWND_MESSAGE not supported\n" ); + return; + } + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + GetClientRect(window, &r); + glGetIntegerv(GL_VIEWPORT, (GLint *)&vp); + ok(EqualRect(&r, &vp), "Viewport not equal to client rect.\n"); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); +} + static void test_destroy(HDC oldhdc) { PIXELFORMATDESCRIPTOR pf_desc = @@ -1458,6 +1536,7 @@ START_TEST(opengl) test_bitmap_rendering( FALSE ); test_minimized(); test_window_dc(); + test_message_window(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7c30ce0..61aff532 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1170,9 +1170,9 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) gl->drawable = 0; - if (parent == GetDesktopWindow()) /* top-level window */ + if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { - Window xparent = X11DRV_get_whole_window( hwnd ); + Window parent = X11DRV_get_whole_window( hwnd ); gl->type = DC_GL_WINDOW; gl->colormap = XCreateColormap( gdi_display, root_window, gl->visual->visual, @@ -1185,8 +1185,8 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) attrib.backing_store = NotUseful; /* put the initial rect outside of the window, it will be moved into place by SetWindowPos */ OffsetRect( &gl->rect, gl->rect.right, gl->rect.bottom ); - if (xparent) - gl->drawable = XCreateWindow( gdi_display, xparent, gl->rect.left, gl->rect.top, + if (parent) + gl->drawable = XCreateWindow( gdi_display, parent, gl->rect.left, gl->rect.top, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, default_visual.depth, InputOutput, gl->visual->visual, CWBitGravity | CWWinGravity | CWBackingStore | CWColormap, @@ -1196,10 +1196,6 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) else XFreeColormap( gdi_display, gl->colormap ); } - else if (!GetAncestor( parent, GA_PARENT )) - { - FIXME( "can't set format of HWND_MESSAGE window %p\n", hwnd ); - } #ifdef SONAME_LIBXCOMPOSITE else if(usexcomposite) {

1 0

Christian Costa : krnl386.exe: If we use operands order of AT&T asm syntax, we' d better use % for registers as in winedbg and GNU assembler to avoid confusion .
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 2a43bb22618ac4d2a29487414a55cfaac9a6b5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a43bb22618ac4d2a29487414… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Oct 22 21:29:21 2012 +0200 krnl386.exe: If we use operands order of AT&T asm syntax, we'd better use % for registers as in winedbg and GNU assembler to avoid confusion. --- dlls/krnl386.exe16/instr.c | 78 ++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 5db0b2b..59420ef 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -512,57 +512,57 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x0f: /* extended instruction */ switch(instr[1]) { - case 0x22: /* mov eax, crX */ + case 0x22: /* mov %eax, %crX */ switch (instr[2]) { - case 0xc0: - ERR("mov eax,cr0 at 0x%08x, EAX=0x%08x\n", - context->Eip,context->Eax ); + case 0xc0: + ERR("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n", + context->Eip,context->Eax ); context->Eip += prefixlen+3; - return ExceptionContinueExecution; - default: - break; /*fallthrough to bad instruction handling */ - } - break; /*fallthrough to bad instruction handling */ - case 0x20: /* mov crX, eax */ + return ExceptionContinueExecution; + default: + break; /* Fallthrough to bad instruction handling */ + } + break; /* Fallthrough to bad instruction handling */ + case 0x20: /* mov %crX, %eax */ switch (instr[2]) { - case 0xe0: /* mov cr4, eax */ - /* CR4 register . See linux/arch/i386/mm/init.c, X86_CR4_ defs - * bit 0: VME Virtual Mode Exception ? - * bit 1: PVI Protected mode Virtual Interrupt - * bit 2: TSD Timestamp disable - * bit 3: DE Debugging extensions - * bit 4: PSE Page size extensions - * bit 5: PAE Physical address extension - * bit 6: MCE Machine check enable - * bit 7: PGE Enable global pages - * bit 8: PCE Enable performance counters at IPL3 - */ - ERR("mov cr4,eax at 0x%08x\n",context->Eip); + case 0xe0: /* mov %cr4, %eax */ + /* CR4 register: See linux/arch/i386/mm/init.c, X86_CR4_ defs + * bit 0: VME Virtual Mode Exception ? + * bit 1: PVI Protected mode Virtual Interrupt + * bit 2: TSD Timestamp disable + * bit 3: DE Debugging extensions + * bit 4: PSE Page size extensions + * bit 5: PAE Physical address extension + * bit 6: MCE Machine check enable + * bit 7: PGE Enable global pages + * bit 8: PCE Enable performance counters at IPL3 + */ + ERR("mov %%cr4, %%eax at 0x%08x\n",context->Eip); context->Eax = 0; context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xc0: /* mov cr0, eax */ - ERR("mov cr0,eax at 0x%08x\n",context->Eip); + return ExceptionContinueExecution; + case 0xc0: /* mov %cr0, %eax */ + ERR("mov %%cr0, %%eax at 0x%08x\n",context->Eip); context->Eax = 0x10; /* FIXME: set more bits ? */ context->Eip += prefixlen+3; - return ExceptionContinueExecution; - default: /* fallthrough to illegal instruction */ - break; - } - /* fallthrough to illegal instruction */ - break; - case 0x21: /* mov drX, eax */ + return ExceptionContinueExecution; + default: /* Fallthrough to illegal instruction */ + break; + } + /* Fallthrough to illegal instruction */ + break; + case 0x21: /* mov %drX, %eax */ switch (instr[2]) { - case 0xc8: /* mov dr1, eax */ - TRACE("mov dr1,eax at 0x%08x\n",context->Eip); + case 0xc8: /* mov %dr1, %eax */ + TRACE("mov %%dr1, %%eax at 0x%08x\n",context->Eip); context->Eax = context->Dr1; context->Eip += prefixlen+3; return ExceptionContinueExecution; - case 0xf8: /* mov dr7, eax */ - TRACE("mov dr7,eax at 0x%08x\n",context->Eip); + case 0xf8: /* mov %dr7, %eax */ + TRACE("mov %%dr7, %%eax at 0x%08x\n",context->Eip); context->Eax = 0x400; context->Eip += prefixlen+3; return ExceptionContinueExecution; @@ -570,10 +570,10 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; - case 0x23: /* mov eax drX */ + case 0x23: /* mov %eax, %drX */ switch (instr[2]) { - case 0xc8: /* mov eax, dr1 */ + case 0xc8: /* mov %eax, %dr1 */ context->Dr1 = context->Eax; context->Eip += prefixlen+3; return ExceptionContinueExecution;

1 0

Frédéric Delanoy : cmd/tests: Add tests for mixed number/stringified numbers comparisons in "if" statements.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: c5faceabd23e7a8c20712b3bcbcd6d1753f13abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5faceabd23e7a8c20712b3bc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:29 2012 +0200 cmd/tests: Add tests for mixed number/stringified numbers comparisons in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 19 +++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4256056..d314336 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -746,6 +746,25 @@ for %%i in (%INT_PARMS%) do call :GTRtest %%i 0 for %%i in (%INT_PARMS%) do call :GTRtest %%i 1 for %%i in (%INT_PARMS%) do call :GTRtest %%i 10 for %%i in (%INT_PARMS%) do call :GTRtest %%i 9 +echo ------ for numbers and stringified numbers +if not "1" EQU 1 (echo strings and integers not equal) else echo foo +if not 1 EQU "1" (echo strings and integers not equal) else echo foo +if '1' EQU 1 echo '1' EQU 1 +if 1 EQU '1' echo 1 EQU '1' +if not "1" GEQ 1 (echo foo) else echo bar +if "10" GEQ "1" echo "10" GEQ "1" +if '1' GEQ 1 (echo '1' GEQ 1) else echo NT4 +if 1 GEQ "1" echo 1 GEQ "1" +if "1" GEQ "1" echo "1" GEQ "1" +if '1' GEQ "1" echo '1' GEQ "1" +if "10" GEQ "1" echo "10" GEQ "1" +if not 1 GEQ '1' (echo non NT4) else echo 1 GEQ '1' +for %%i in ("1" '1') do call :GEQtest %%i '1' +if "10" GEQ '1' (echo "10" GEQ '1') else echo foo +if 1 GEQ "10" (echo 1 GEQ "10") else echo foo +if "1" GEQ "10" (echo 1 GEQ "10") else echo foo +if '1' GEQ "10" (echo '1' GEQ "10") else echo foo +if "10" GEQ "10" (echo "10" GEQ "10") goto :endIfCompOpsSubroutines rem IF subroutines helpers diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6c1825e..020246a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -592,6 +592,23 @@ also in negative form @todo_wine(a)10 GTR 1 @todo_wine(a)9 GTR 1 @todo_wine(a)10 GTR 9 +------ for numbers and stringified numbers +strings and integers not equal +strings and integers not equal +foo +(a)todo_wine@"10" GEQ "1" +(a)todo_wine@'1' GEQ 1(a)or_broken@NT4 +(a)todo_wine@1 GEQ "1" +(a)todo_wine@"1" GEQ "1" +(a)todo_wine@'1' GEQ "1" +(a)todo_wine@"10" GEQ "1" +(a)todo_wine@non NT4(a)or_broken@1 GEQ '1' +(a)todo_wine@'1' GEQ '1' +(a)todo_wine@foo +(a)todo_wine@1 GEQ "10" +(a)todo_wine@foo +(a)todo_wine@'1' GEQ "10" +(a)todo_wine@"10" GEQ "10" ------------ Testing for ------------ --- plain FOR A

1 0

Nikolay Sivov : dwrite: Implement IDWriteTextFormat::GetFontCollection().
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: a30faec10ebce7c8c4c1fc2dc96ba6edbd5911a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30faec10ebce7c8c4c1fc2dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 23:49:27 2012 -0400 dwrite: Implement IDWriteTextFormat::GetFontCollection(). --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 31 ++++++++++++++++++++++++++++--- dlls/dwrite/main.c | 6 +----- dlls/dwrite/tests/layout.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e9d927a..7216393 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -68,7 +68,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, +extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 760ebb2..91360ee 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -51,6 +51,8 @@ struct dwrite_textformat { DWRITE_FONT_STRETCH stretch; FLOAT size; + + IDWriteFontCollection *collection; }; static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout(IDWriteTextLayout *iface) @@ -705,6 +707,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) if (!ref) { + if (This->collection) IDWriteFontCollection_Release(This->collection); heap_free(This->family_name); heap_free(This->locale); heap_free(This); @@ -832,8 +835,13 @@ static HRESULT WINAPI dwritetextformat_GetLineSpacing(IDWriteTextFormat *iface, static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *iface, IDWriteFontCollection **collection) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p): stub\n", This, collection); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, collection); + + *collection = This->collection; + IDWriteFontCollection_AddRef(*collection); + + return S_OK; } static UINT32 WINAPI dwritetextformat_GetFontFamilyNameLength(IDWriteTextFormat *iface) @@ -923,11 +931,13 @@ static const IDWriteTextFormatVtbl dwritetextformatvtbl = { dwritetextformat_GetLocaleName }; -HRESULT create_textformat(const WCHAR *family_name, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, +HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) { struct dwrite_textformat *This; + *format = NULL; + This = heap_alloc(sizeof(struct dwrite_textformat)); if (!This) return E_OUTOFMEMORY; @@ -939,6 +949,21 @@ HRESULT create_textformat(const WCHAR *family_name, DWRITE_FONT_WEIGHT weight, D This->style = style; This->size = size; + if (collection) + { + This->collection = collection; + IDWriteFontCollection_AddRef(collection); + } + else + { + HRESULT hr = get_system_fontcollection(&This->collection); + if (hr != S_OK) + { + IDWriteTextFormat_Release(&This->IDWriteTextFormat_iface); + return hr; + } + } + *format = &This->IDWriteTextFormat_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ea1bbce..09ed3f2 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -488,11 +488,7 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHA { TRACE("(%s %p %d %d %d %f %s %p)\n", debugstr_w(family_name), collection, weight, style, stretch, size, debugstr_w(locale), format); - - if (collection) - FIXME("font collection not supported\n"); - - return create_textformat(family_name, weight, style, stretch, size, locale, format); + return create_textformat(family_name, collection, weight, style, stretch, size, locale, format); } static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWriteTypography **typography) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ab29c06..6b8dc62 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -28,6 +28,7 @@ static IDWriteFactory *factory; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR enusW[] = {'e','n','-','u','s',0}; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) @@ -62,7 +63,6 @@ static void test_CreateTextLayout(void) static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; - static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteTextLayout *layout; IDWriteTextFormat *format; HRESULT hr; @@ -107,6 +107,33 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteTextFormat_Release(format); } +static void test_CreateTextFormat(void) +{ + IDWriteFontCollection *collection, *syscoll; + IDWriteTextFormat *format; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDWriteTextFormat_GetFontCollection(format, NULL); + + collection = NULL; + hr = IDWriteTextFormat_GetFontCollection(format, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(collection != NULL, "got %p\n", collection); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscoll, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(collection == syscoll, "got %p, was %p\n", syscoll, collection); + IDWriteFontCollection_Release(syscoll); + IDWriteFontCollection_Release(collection); + + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -121,6 +148,7 @@ START_TEST(layout) test_CreateTextLayout(); test_CreateGdiCompatibleTextLayout(); + test_CreateTextFormat(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Keep a single instance of system font collection.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: a291a7adf8f92e97e3bb9365008b0fc28d17a773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a291a7adf8f92e97e3bb93650… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 23:20:42 2012 -0400 dwrite: Keep a single instance of system font collection. --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 97 +++++++++++++++++++++-------------------- dlls/dwrite/main.c | 5 ++- dlls/dwrite/tests/font.c | 12 +++++- 4 files changed, 67 insertions(+), 50 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4cb0e3b..e9d927a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -74,4 +74,5 @@ extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSP extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; -extern HRESULT create_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern void release_system_fontcollection(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ff4a345..60aa7db 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -129,13 +129,14 @@ typedef struct struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; - LONG ref; WCHAR **families; UINT32 count; int alloc; }; +static IDWriteFontCollection *system_collection; + struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -645,32 +646,14 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection return E_NOINTERFACE; } -static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection *iface) +static ULONG WINAPI dwritesysfontcollection_AddRef(IDWriteFontCollection *iface) { - struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + return 2; } -static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) +static ULONG WINAPI dwritesysfontcollection_Release(IDWriteFontCollection *iface) { - struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(%d)\n", This, ref); - - if (!ref) - { - int i; - - for (i = 0; i < This->count; i++) - heap_free(This->families[i]); - heap_free(This->families); - heap_free(This); - } - - return ref; + return 1; } static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) @@ -715,10 +698,10 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec return E_NOTIMPL; } -static const IDWriteFontCollectionVtbl fontcollectionvtbl = { +static const IDWriteFontCollectionVtbl systemfontcollectionvtbl = { dwritefontcollection_QueryInterface, - dwritefontcollection_AddRef, - dwritefontcollection_Release, + dwritesysfontcollection_AddRef, + dwritesysfontcollection_Release, dwritefontcollection_GetFontFamilyCount, dwritefontcollection_GetFontFamily, dwritefontcollection_FindFamilyName, @@ -749,35 +732,55 @@ static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm return add_family_syscollection(collection, lf->lfFaceName) == S_OK; } -HRESULT create_system_fontcollection(IDWriteFontCollection **collection) +static void release_font_collection(IDWriteFontCollection *iface) { - struct dwrite_fontcollection *This; - LOGFONTW lf; - HDC hdc; + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + int i; - *collection = NULL; + for (i = 0; i < This->count; i++) + heap_free(This->families[i]); + heap_free(This->families); + heap_free(This); +} - This = heap_alloc(sizeof(struct dwrite_fontcollection)); - if (!This) return E_OUTOFMEMORY; +void release_system_fontcollection(void) +{ + release_font_collection(system_collection); +} - This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; - This->ref = 1; +HRESULT get_system_fontcollection(IDWriteFontCollection **collection) +{ + if (!system_collection) + { + struct dwrite_fontcollection *This; + LOGFONTW lf; + HDC hdc; - This->alloc = 50; - This->count = 0; - This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + *collection = NULL; - TRACE("building system font collection:\n"); + This = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!This) return E_OUTOFMEMORY; - hdc = CreateCompatibleDC(0); - memset(&lf, 0, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = DEFAULT_PITCH; - lf.lfFaceName[0] = 0; - EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); - DeleteDC(hdc); + This->IDWriteFontCollection_iface.lpVtbl = &systemfontcollectionvtbl; + This->alloc = 50; + This->count = 0; + This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + + TRACE("building system font collection:\n"); + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfFaceName[0] = 0; + EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); + DeleteDC(hdc); + + if (InterlockedCompareExchangePointer((void**)&system_collection, &This->IDWriteFontCollection_iface, NULL)) + release_font_collection(&This->IDWriteFontCollection_iface); + } - *collection = &This->IDWriteFontCollection_iface; + *collection = system_collection; return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4605008..ea1bbce 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -43,6 +43,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; + case DLL_PROCESS_DETACH: + release_system_fontcollection(); + break; } return TRUE; } @@ -389,7 +392,7 @@ static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *ifac if (check_for_updates) FIXME("checking for system font updates not implemented\n"); - return create_system_fontcollection(collection); + return get_system_fontcollection(collection); } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 07d3e7d..423c876 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -525,7 +525,7 @@ todo_wine static void test_system_fontcollection(void) { - IDWriteFontCollection *collection; + IDWriteFontCollection *collection, *coll2; HRESULT hr; UINT32 i; BOOL ret; @@ -533,6 +533,16 @@ static void test_system_fontcollection(void) hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll2 == collection, "got %p, was %p\n", coll2, collection); + IDWriteFontCollection_Release(coll2); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll2 == collection, "got %p, was %p\n", coll2, collection); + IDWriteFontCollection_Release(coll2); + i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i);

1 0

James Eder : ntdll: Split up feature detection by architecture.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 7978a38f24eca2eae944025a6fbb11c10d2f0fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7978a38f24eca2eae944025a6… Author: James Eder <jimportal(a)gmail.com> Date: Mon Oct 22 15:22:51 2012 -0600 ntdll: Split up feature detection by architecture. --- dlls/ntdll/nt.c | 439 ++++++++++++++----------------------------------------- 1 files changed, 109 insertions(+), 330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7978a38f24eca2eae9440…

1 0