May 2013 - Wine-commits - list.winehq.org

Dmitry Timoshkov : kernel32: Remove todo_wine from the now passing test.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 5cbcbdd8a89b2f2dd933863139151292f4e03c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbcbdd8a89b2f2dd93386313… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:35:36 2013 +0900 kernel32: Remove todo_wine from the now passing test. --- dlls/kernel32/tests/loader.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5abcb76..22d83aa 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1165,7 +1165,6 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (test_dll_phase == 4 || test_dll_phase == 5) { -todo_wine ok(0, "dll_entry_point(DLL_PROCESS_DETACH) should not be called\n"); break; }

1 0

Dmitry Timoshkov : kernel32: DLL entry point is no longer called with PEB lock held.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 94c7992f86afe8cc662dfa57743b3b8613361bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c7992f86afe8cc662dfa577… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:34:52 2013 +0900 kernel32: DLL entry point is no longer called with PEB lock held. --- dlls/kernel32/tests/loader.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 31b91c6..5abcb76 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1141,10 +1141,6 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) DWORD ret; ok(!inside_loader_lock, "inside_loader_lock should not be set\n"); - /* FIXME: remove once Wine is fixed */ - if (inside_peb_lock && reason == DLL_PROCESS_DETACH) todo_wine - ok(!inside_peb_lock, "inside_peb_lock should not be set\n"); - else ok(!inside_peb_lock, "inside_peb_lock should not be set\n"); switch (reason)

1 0

Dmitry Timoshkov : include/commdlg.h: Fix definition of LPPRINTHOOKPROC and LPSETUPHOOKPROC.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 4986ba35c3a3fe13a03a77a34fc313761a3c64b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4986ba35c3a3fe13a03a77a34… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 18:15:34 2013 +0900 include/commdlg.h: Fix definition of LPPRINTHOOKPROC and LPSETUPHOOKPROC. --- dlls/comdlg32/printdlg.c | 2 +- include/commdlg.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index e3b89ea..3c3fab3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3987,7 +3987,7 @@ struct callback_data IObjectWithSite *object; }; -static UINT CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static UINT_PTR CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { if (msg == WM_INITDIALOG) { diff --git a/include/commdlg.h b/include/commdlg.h index db5aaaa..df56c14 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -531,8 +531,8 @@ static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', (void)SNDMSG(_hdlg, CDM_SETDEFEXT, 0, (LPARAM)(LPSTR)_pszext) -typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); +typedef UINT_PTR (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); +typedef UINT_PTR (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagPDA {

1 0

Dmitry Timoshkov : comdlg32: Add a test for nCopies/ dmCopies returned by PrintDlg.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: afb8e0296fba277127848750ee4fbbdffc7ef69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb8e0296fba277127848750e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 19:49:50 2013 +0900 comdlg32: Add a test for nCopies/dmCopies returned by PrintDlg. --- dlls/comdlg32/tests/printdlg.c | 60 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index d004598..7acbdb0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -2,6 +2,7 @@ * Unit test suite for comdlg32 API functions: printer dialogs * * Copyright 2006-2007 Detlef Riekenberg + * Copyright 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -123,9 +124,19 @@ static void test_PageSetupDlgA(void) /* ########################### */ +static UINT_PTR CALLBACK print_hook_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_INITDIALOG) + { + SetDlgItemInt(hdlg, edt3, 1234, FALSE); + PostMessage(hdlg, WM_COMMAND, IDOK, FALSE); + } + return 0; +} + static void test_PrintDlgA(void) { - DWORD res; + DWORD res, n_copies = 0; LPPRINTDLGA pDlg; DEVNAMES *pDevNames; LPCSTR driver; @@ -133,7 +144,7 @@ static void test_PrintDlgA(void) LPCSTR port; CHAR buffer[MAX_PATH]; LPSTR ptr; - + DEVMODE *dm; pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGA)) * 2); if (!pDlg) return; @@ -216,14 +227,55 @@ static void test_PrintDlgA(void) if (ptr) ptr[0] = '\0'; ok( lstrcmpiA(driver, buffer) == 0, "got driver '%s' (expected '%s')\n", driver, buffer); + + n_copies = DeviceCapabilities(device, port, DC_COPIES, NULL, NULL); + ok(n_copies > 0, "DeviceCapabilities(DC_COPIES) failed\n"); } GlobalUnlock(pDlg->hDevNames); - GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); - HeapFree(GetProcessHeap(), 0, pDlg); + /* if device doesn't support printing of multiple copies then + * an attempt to set number of copies > 1 in print dialog would + * cause the PrintDlg under Windows display the MessageBox and + * the test will hang waiting for user response. + */ + if (n_copies > 1) + { + ZeroMemory(pDlg, sizeof(*pDlg)); + pDlg->lStructSize = sizeof(*pDlg); + pDlg->Flags = PD_ENABLEPRINTHOOK; + pDlg->lpfnPrintHook = print_hook_proc; + res = PrintDlg(pDlg); + ok(res, "PrintDlg error %#x\n", CommDlgExtendedError()); + /* Version of Microsoft XPS Document Writer driver shipped before Win7 + * reports that it can print multiple copies, but returns 1. + */ + ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); + ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); + dm = GlobalLock(pDlg->hDevMode); + ok(dm->dmCopies == 1, "expected dm->dmCopies 1, got %d\n", dm->dmCopies); + GlobalUnlock(pDlg->hDevMode); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + ZeroMemory(pDlg, sizeof(*pDlg)); + pDlg->lStructSize = sizeof(*pDlg); + pDlg->Flags = PD_ENABLEPRINTHOOK | PD_USEDEVMODECOPIES; + pDlg->lpfnPrintHook = print_hook_proc; + res = PrintDlg(pDlg); + ok(res, "PrintDlg error %#x\n", CommDlgExtendedError()); + ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); + ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); + dm = GlobalLock(pDlg->hDevMode); + ok(dm->dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", dm->dmCopies); + GlobalUnlock(pDlg->hDevMode); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + } + + HeapFree(GetProcessHeap(), 0, pDlg); } /* ########################### */

1 0

Jacek Caban : d3dcommon.idl: Added some missing defines.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 36c5fa71da699927a9f5cb5b3a1cb90d5d80ecbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c5fa71da699927a9f5cb5b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 13:05:22 2013 +0200 d3dcommon.idl: Added some missing defines. --- include/d3dcommon.idl | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 76f66f5..bc1f372 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -86,8 +86,25 @@ typedef enum D3D_FEATURE_LEVEL D3D_FEATURE_LEVEL_10_0 = 0xa000, D3D_FEATURE_LEVEL_10_1 = 0xa100, D3D_FEATURE_LEVEL_11_0 = 0xb000, + D3D_FEATURE_LEVEL_11_1 = 0xb100 } D3D_FEATURE_LEVEL; +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION 2048") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURE1D_U_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION 2048") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION 512") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION 256") +cpp_quote("#define D3D_FL9_1_DEFAULT_MAX_ANISOTROPY 2") +cpp_quote("#define D3D_FL9_1_IA_PRIMITIVE_MAX_COUNT 65535") +cpp_quote("#define D3D_FL9_2_IA_PRIMITIVE_MAX_COUNT 1048575") +cpp_quote("#define D3D_FL9_1_SIMULTANEOUS_RENDER_TARGET_COUNT 1") +cpp_quote("#define D3D_FL9_3_SIMULTANEOUS_RENDER_TARGET_COUNT 4") +cpp_quote("#define D3D_FL9_1_MAX_TEXTURE_REPEAT 128") +cpp_quote("#define D3D_FL9_2_MAX_TEXTURE_REPEAT 2048") +cpp_quote("#define D3D_FL9_3_MAX_TEXTURE_REPEAT 8192") + typedef enum _D3D_SHADER_VARIABLE_CLASS { D3D_SVC_SCALAR,

1 0

Jacek Caban : d3d11.idl: Added some missing declarations and C++ helper classes.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 87c028449f8a09a6951c4c07dff1c92895207c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c028449f8a09a6951c4c07d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 13:05:36 2013 +0200 d3d11.idl: Added some missing declarations and C++ helper classes. --- include/d3d11.idl | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87c028449f8a09a6951c4…

1 0

Akihiro Sagawa : gdi32: Ignore the lfHeight value when it exceeds the limit .
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 8f8363ede62c74aa3369fa4c1e5f9da7eafb18a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8363ede62c74aa3369fa4c1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 8 21:11:20 2013 +0900 gdi32: Ignore the lfHeight value when it exceeds the limit. --- dlls/gdi32/freetype.c | 11 ++++++++- dlls/gdi32/tests/font.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c30a358..141238b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3983,6 +3983,7 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) TT_HoriHeader *pHori; LONG ppem; + const LONG MAX_PPEM = (1 << 16) - 1; pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); pHori = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea); @@ -4010,9 +4011,17 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) else ppem = MulDiv(ft_face->units_per_EM, height, pOS2->usWinAscent + pOS2->usWinDescent); + if(ppem > MAX_PPEM) { + WARN("Ignoring too large height %d, ppem %d\n", height, ppem); + ppem = 1; + } } - else + else if(height >= -MAX_PPEM) ppem = -height; + else { + WARN("Ignoring too large height %d\n", height); + ppem = 1; + } return ppem; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bc4e614..876b312 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5028,6 +5028,64 @@ static void test_stock_fonts(void) } } +static void test_max_height(void) +{ + HDC hdc; + LOGFONT lf; + HFONT hfont, hfont_old; + TEXTMETRICA tm1, tm; + BOOL r; + LONG invalid_height[] = { -65536, -123456, 123456 }; + size_t i; + + memset(&tm1, 0, sizeof(tm1)); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -1; + + hdc = GetDC(NULL); + + /* get 1 ppem value */ + hfont = CreateFontIndirect(&lf); + hfont_old = SelectObject(hdc, hfont); + r = GetTextMetrics(hdc, &tm1); + ok(r, "GetTextMetrics failed\n"); + ok(tm1.tmHeight > 0, "expected a positive value, got %d\n", tm1.tmHeight); + ok(tm1.tmAveCharWidth > 0, "expected a positive value, got %d\n", tm1.tmHeight); + DeleteObject(SelectObject(hdc, hfont_old)); + + /* test the largest value */ + lf.lfHeight = -((1 << 16) - 1); + hfont = CreateFontIndirect(&lf); + hfont_old = SelectObject(hdc, hfont); + memset(&tm, 0, sizeof(tm)); + r = GetTextMetrics(hdc, &tm); + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight > tm1.tmHeight, + "expected greater than 1 ppem value (%d), got %d\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth > tm1.tmAveCharWidth, + "expected greater than 1 ppem value (%d), got %d\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + + /* test an invalid value */ + for (i = 0; i < sizeof(invalid_height)/sizeof(invalid_height[0]); i++) { + lf.lfHeight = invalid_height[i]; + hfont = CreateFontIndirect(&lf); + hfont_old = SelectObject(hdc, hfont); + memset(&tm, 0, sizeof(tm)); + r = GetTextMetrics(hdc, &tm); + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight == tm1.tmHeight, + "expected 1 ppem value (%d), got %d\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, + "expected 1 ppem value (%d), got %d\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + } + + ReleaseDC(NULL, hdc); + return; +} + START_TEST(font) { init(); @@ -5084,6 +5142,7 @@ START_TEST(font) test_fullname(); test_fullname2(); test_east_asian_font_selection(); + test_max_height(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Akihiro Sagawa : winedbg: Verify context flags before reading or writing registers.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: b2de0880ec8255f654584320c8ba050b8bb190d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2de0880ec8255f654584320c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 8 21:11:13 2013 +0900 winedbg: Verify context flags before reading or writing registers. --- programs/winedbg/gdbproxy.c | 346 +++++++++++++++++++++++-------------------- 1 files changed, 183 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2de0880ec8255f654584…

1 0

Akihiro Sagawa : winedbg: Improve the register conversion to support over 64-bit registers.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: e06fd8d003ba700e08ecc2dccee808b9aaaff7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06fd8d003ba700e08ecc2dcc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 8 21:11:16 2013 +0900 winedbg: Improve the register conversion to support over 64-bit registers. --- programs/winedbg/gdbproxy.c | 63 ++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 24 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 9c62b4d..47e3bbd 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -447,22 +447,27 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) static inline void cpu_register_hex_from(CONTEXT* ctx, unsigned idx, const char** phex) { - DWORD64 val = 0; - unsigned i; - BYTE b; - - for (i = 0; i < cpu_register_map[idx].gdb_length; i++) - { - hex_from(&b, *phex, 1); - *phex += 2; - val += (DWORD64)b << (8 * i); - } - switch (cpu_register_map[idx].ctx_length) + if (cpu_register_map[idx].gdb_length == cpu_register_map[idx].ctx_length) + hex_from(cpu_register_ptr(ctx, idx), *phex, cpu_register_map[idx].gdb_length); + else { - case 2: *(WORD*)cpu_register_ptr(ctx, idx) = (WORD)val; break; - case 4: *(DWORD*)cpu_register_ptr(ctx, idx) = (DWORD)val; break; - case 8: *(DWORD64*)cpu_register_ptr(ctx, idx) = val; break; - default: assert(0); + DWORD64 val = 0; + unsigned i; + BYTE b; + + for (i = 0; i < cpu_register_map[idx].gdb_length; i++) + { + hex_from(&b, *phex, 1); + *phex += 2; + val += (DWORD64)b << (8 * i); + } + switch (cpu_register_map[idx].ctx_length) + { + case 2: *(WORD*)cpu_register_ptr(ctx, idx) = (WORD)val; break; + case 4: *(DWORD*)cpu_register_ptr(ctx, idx) = (DWORD)val; break; + case 8: *(DWORD64*)cpu_register_ptr(ctx, idx) = val; break; + default: assert(0); + } } } @@ -1010,14 +1015,19 @@ static enum packet_return packet_reply_error(struct gdb_context* gdbctx, int err static inline void packet_reply_register_hex_to(struct gdb_context* gdbctx, unsigned idx) { - DWORD64 val = cpu_register(&gdbctx->context, idx); - unsigned i; - - for (i = 0; i < cpu_register_map[idx].gdb_length; i++) + if (cpu_register_map[idx].gdb_length == cpu_register_map[idx].ctx_length) + packet_reply_hex_to(gdbctx, cpu_register_ptr(&gdbctx->context, idx), cpu_register_map[idx].gdb_length); + else { - BYTE b = val; - packet_reply_hex_to(gdbctx, &b, 1); - val >>= 8; + DWORD64 val = cpu_register(&gdbctx->context, idx); + unsigned i; + + for (i = 0; i < cpu_register_map[idx].gdb_length; i++) + { + BYTE b = val; + packet_reply_hex_to(gdbctx, &b, 1); + val >>= 8; + } } } @@ -1573,8 +1583,13 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) return packet_error; } if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Read register %x => %08x%08x\n", reg, - (unsigned)(cpu_register(pctx, reg) >> 32), (unsigned)cpu_register(pctx, reg)); + { + if (cpu_register_map[reg].ctx_length <= sizeof(DWORD64)) + fprintf(stderr, "Read register %x => %08x%08x\n", reg, + (unsigned)(cpu_register(pctx, reg) >> 32), (unsigned)cpu_register(pctx, reg)); + else + fprintf(stderr, "Read register %x\n", reg); + } packet_reply_open(gdbctx); packet_reply_register_hex_to(gdbctx, reg); packet_reply_close(gdbctx);

1 0

Akihiro Sagawa : winedbg: Add x87 register support in gdb proxy.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: f649ee599774303952606f78b4fe6bf985499879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f649ee599774303952606f78b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 8 21:11:18 2013 +0900 winedbg: Add x87 register support in gdb proxy. --- programs/winedbg/gdbproxy.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 47e3bbd..04d36f7 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -232,6 +232,22 @@ static struct cpu_register cpu_register_map[] = { REG(SegEs, 4, CONTEXT_SEGMENTS), REG(SegFs, 4, CONTEXT_SEGMENTS), REG(SegGs, 4, CONTEXT_SEGMENTS), + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[ 0]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[10]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[20]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[30]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[40]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.ControlWord), 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.StatusWord), 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.TagWord), 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, FloatSave.ErrorSelector), 2, 4, CONTEXT_FLOATING_POINT }, + REG(FloatSave.ErrorOffset, 4, CONTEXT_FLOATING_POINT ), + { FIELD_OFFSET(CONTEXT, FloatSave.DataSelector), 2, 4, CONTEXT_FLOATING_POINT }, + REG(FloatSave.DataOffset, 4, CONTEXT_FLOATING_POINT ), + { FIELD_OFFSET(CONTEXT, FloatSave.ErrorSelector)+2, 2, 4, CONTEXT_FLOATING_POINT }, }; #elif defined(__powerpc__) static const char target_xml[] = ""; @@ -480,7 +496,7 @@ static BOOL fetch_context(struct gdb_context* gdbctx, HANDLE h, CONTEXT* ctx) { ctx->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER -#if defined(__powerpc__) +#if defined(__powerpc__) || defined(__i386__) | CONTEXT_FLOATING_POINT #endif #ifdef CONTEXT_SEGMENTS

1 0