wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Alexandre Goujon : fusion: Improve parse_display_name.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 135a70772d16a1f696dc23d0af488300289c9d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135a70772d16a1f696dc23d0a… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Fri Sep 10 09:59:53 2010 +0200 fusion: Improve parse_display_name. --- dlls/fusion/asmname.c | 10 +++++++++- dlls/fusion/tests/asmname.c | 9 +++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index bcf49a7..54be4e8 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -522,8 +522,16 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam if (!str) return E_OUTOFMEMORY; - ptr = strstrW(str, separator); + ptr = strchrW(str, ','); if (ptr) *ptr = '\0'; + + /* no ',' but ' ' only */ + if( !ptr && strchrW(str, ' ') ) + { + hr = FUSION_E_INVALID_NAME; + goto done; + } + name->name = strdupW(str); if (!name->name) return E_OUTOFMEMORY; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 655f62f..170af23 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -868,12 +868,9 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine PublicKeyToken=1234567890abcdef"); name = (IAssemblyName *)0xdeadbeef; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); - todo_wine - { - ok(hr == FUSION_E_INVALID_NAME, - "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); - ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); - } + ok(hr == FUSION_E_INVALID_NAME, + "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); if(SUCCEEDED(hr)) IAssemblyName_Release(name); /* no '=' */

1 0

Roderick Colenbrander : wined3d: Move video memory override to init_driver_info.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 4baf7a52f03f1c355238e472f769738d32da2a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baf7a52f03f1c355238e472f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 11 03:59:48 2010 +0200 wined3d: Move video memory override to init_driver_info. --- dlls/wined3d/directx.c | 12 +++++++----- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ae61d9a..b6369bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1225,6 +1225,12 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } } + if (wined3d_settings.emulated_textureram) + { + TRACE_(d3d_caps)("Overriding amount of video memory with: %d byte\n", wined3d_settings.emulated_textureram); + driver_info->vidmem = wined3d_settings.emulated_textureram; + } + /* Try to obtain driver version information for the current Windows version. This fails in * some cases: * - the gpu is not available on the currently selected OS version: @@ -5209,11 +5215,7 @@ static BOOL InitAdapters(IWineD3DImpl *This) hdc = fake_gl_ctx.dc; - /* Use the VideoRamSize registry setting when set */ - if(wined3d_settings.emulated_textureram) - adapter->TextureRam = wined3d_settings.emulated_textureram; - else - adapter->TextureRam = adapter->driver_info.vidmem; + adapter->TextureRam = adapter->driver_info.vidmem; adapter->UsedTextureRam = 0; TRACE("Emulating %dMB of texture ram\n", adapter->TextureRam/(1024*1024)); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2b06b36..6dea98a 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -70,7 +70,7 @@ wined3d_settings_t wined3d_settings = RTL_READTEX, /* Default render target locking method */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ - 0, /* The default of memory is set in FillGLCaps */ + 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ FALSE, /* No strict draw ordering. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8a765b..e152dc3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1432,7 +1432,6 @@ struct wined3d_gl_limits struct wined3d_gl_info { DWORD glsl_version; - UINT vidmem; struct wined3d_gl_limits limits; DWORD reserved_glsl_constants; DWORD quirks;

1 0

Roderick Colenbrander : wined3d: Store amount of video memory in gpu_description_table.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 192e0dc433b6e9369dab7eba88dd22851255639b URL: http://source.winehq.org/git/wine.git/?a=commit;h=192e0dc433b6e9369dab7eba8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 11 03:59:47 2010 +0200 wined3d: Store amount of video memory in gpu_description_table. --- dlls/wined3d/directx.c | 269 +++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 90 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=192e0dc433b6e9369dab7…

1 0

Roderick Colenbrander : wined3d: Add legacy ATI cards.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 27fb5e2d74858dc01a80a6001269d01a0d1c3442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb5e2d74858dc01a80a6001… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 11 03:59:46 2010 +0200 wined3d: Add legacy ATI cards. --- dlls/wined3d/directx.c | 12 +++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4269052..70ddc15 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -993,7 +993,11 @@ static const struct driver_version_information driver_version_table[] = { /* ATI * - Radeon HD2x00 (R600) and up supported by current drivers. - * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) */ + * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) + * - Radeon 7xxx (R100) - 9250 (RV250) supported upto Catalyst 6.11 (XP) + * - Rage 128 supported upto XP, latest official build 6.13.3279 dated October 2001 */ + {DRIVER_ATI_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, + {DRIVER_ATI_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_ATI_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_ATI_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, {DRIVER_ATI_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, @@ -1075,7 +1079,11 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6 }, /* ATI cards */ + {HW_VENDOR_ATI, CARD_ATI_RAGE_128PRO, "ATI Rage Fury", DRIVER_ATI_RAGE_128PRO, }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_7200, "ATI RADEON 7200 SERIES", DRIVER_ATI_R100, }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_8500, "ATI RADEON 8500 SERIES", DRIVER_ATI_R100, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", DRIVER_ATI_R300, }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_XPRESS_200M, "ATI RADEON XPRESS 200M Series", DRIVER_ATI_R300, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X700, "ATI Radeon X700 SE", DRIVER_ATI_R300, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X1600, "ATI Radeon X1600 Series", DRIVER_ATI_R300, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2350, "ATI Mobility Radeon HD 2350", DRIVER_ATI_R600, }, @@ -1095,8 +1103,6 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900 }, {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950 }, {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000 } - - /* TODO: Add information about legacy ATI hardware and other cards. */ }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61a97f5..61e58a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1239,6 +1239,8 @@ typedef struct WineD3D_PixelFormat * R3xx, R4xx and R5xx GPUs. */ enum wined3d_display_driver { + DRIVER_ATI_RAGE_128PRO, + DRIVER_ATI_R100, DRIVER_ATI_R300, DRIVER_ATI_R600, DRIVER_INTEL_GMA800,

1 0

Francois Gouget : usp10: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 0d3b4b3c0c3b1a1372bc501f2747e74f5760aa4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3b4b3c0c3b1a1372bc501f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:50 2010 +0200 usp10: Add a trailing '\n' to a TRACE() call. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c103cef..65f6d2c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -688,7 +688,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || New_Script != pItems[index].a.eScript || New_Script == Script_Control) { - TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d ", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); + TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); if (strength && strength[cnt] != 0) str = strength[cnt];

1 0

Francois Gouget : shell32/tests: Make create_commdlgbrowser3() static.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 75bb4359d70c785de2f924fca889e730230456be URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bb4359d70c785de2f924fca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:46 2010 +0200 shell32/tests: Make create_commdlgbrowser3() static. --- dlls/shell32/tests/ebrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c39e17c..faaf6c7 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -411,7 +411,7 @@ static const ICommDlgBrowser3Vtbl cdbvtbl = ICommDlgBrowser3_fnOnPreviewCreated }; -ICommDlgBrowser3Impl *create_commdlgbrowser3(void) +static ICommDlgBrowser3Impl *create_commdlgbrowser3(void) { ICommDlgBrowser3Impl *cdb;

1 0

Francois Gouget : d3dcompiler_43: Make asmshader_error() and set_rel_reg() static.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 7d9cd71db77959a2d8734cecfc71cc503df40681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9cd71db77959a2d8734cecf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:39 2010 +0200 d3dcompiler_43: Make asmshader_error() and set_rel_reg() static. --- dlls/d3dcompiler_43/asmshader.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index db83ec3..5dc0914 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -71,12 +71,12 @@ void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { } } -void asmshader_error(char const *s) { +static void asmshader_error(char const *s) { asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s); set_parse_status(&asm_ctx, PARSE_ERR); } -void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { +static void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { /* We can have an additional offset without true relative addressing * ex. c2[ 4 ] */ reg->regnum += rel->additional_offset;

1 0

Francois Gouget : d3dcompiler_43: Move asmparser_message() and asmshader_error() up to avoid forward declarations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 330520980ab371882793c897eccc108c2b8de4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330520980ab371882793c897e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:14 2010 +0200 d3dcompiler_43: Move asmparser_message() and asmshader_error() up to avoid forward declarations. --- dlls/d3dcompiler_43/asmshader.y | 94 +++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 4e22c95..db83ec3 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -32,9 +32,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader); struct asm_parser asm_ctx; -/* Needed lexer functions declarations */ -void asmshader_error(const char *s); -int asmshader_lex(void); +/* Error reporting function */ +void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { + va_list args; + char* newbuffer; + int rc, newsize; + + if(ctx->messagecapacity == 0) { + ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE); + if(ctx->messages == NULL) { + ERR("Error allocating memory for parser messages\n"); + return; + } + ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE; + } + + while(1) { + va_start(args, fmt); + rc = vsnprintf(ctx->messages + ctx->messagesize, + ctx->messagecapacity - ctx->messagesize, fmt, args); + va_end(args); + + if (rc < 0 || /* C89 */ + rc >= ctx->messagecapacity - ctx->messagesize) { /* C99 */ + /* Resize the buffer */ + newsize = ctx->messagecapacity * 2; + newbuffer = asm_realloc(ctx->messages, newsize); + if(newbuffer == NULL){ + ERR("Error reallocating memory for parser messages\n"); + return; + } + ctx->messages = newbuffer; + ctx->messagecapacity = newsize; + } else { + ctx->messagesize += rc; + return; + } + } +} + +void asmshader_error(char const *s) { + asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s); + set_parse_status(&asm_ctx, PARSE_ERR); +} void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { /* We can have an additional offset without true relative addressing @@ -53,6 +93,10 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { } } +/* Needed lexer functions declarations */ +int asmshader_lex(void); + + %} %union { @@ -1660,50 +1704,6 @@ predicate: '(' REG_PREDICATE swizzle ')' %% -void asmshader_error (char const *s) { - asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s); - set_parse_status(&asm_ctx, PARSE_ERR); -} - -/* Error reporting function */ -void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { - va_list args; - char* newbuffer; - int rc, newsize; - - if(ctx->messagecapacity == 0) { - ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE); - if(ctx->messages == NULL) { - ERR("Error allocating memory for parser messages\n"); - return; - } - ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE; - } - - while(1) { - va_start(args, fmt); - rc = vsnprintf(ctx->messages + ctx->messagesize, - ctx->messagecapacity - ctx->messagesize, fmt, args); - va_end(args); - - if (rc < 0 || /* C89 */ - rc >= ctx->messagecapacity - ctx->messagesize) { /* C99 */ - /* Resize the buffer */ - newsize = ctx->messagecapacity * 2; - newbuffer = asm_realloc(ctx->messages, newsize); - if(newbuffer == NULL){ - ERR("Error reallocating memory for parser messages\n"); - return; - } - ctx->messages = newbuffer; - ctx->messagecapacity = newsize; - } else { - ctx->messagesize += rc; - return; - } - } -} - /* New status is the worst between current status and parameter value */ void set_parse_status(struct asm_parser *ctx, enum parse_status status) { if(status == PARSE_ERR) ctx->status = PARSE_ERR;

1 0

Andrew Talbot : dsound: Constify some variables.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: ab6ad77243790921b06bd5bed0dd8de539f4eccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6ad77243790921b06bd5bed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 11 17:02:12 2010 +0100 dsound: Constify some variables. --- dlls/dsound/propset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0645610..04c7b58 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -344,7 +344,7 @@ static HRESULT DSPROPERTY_EnumerateW( return S_OK; } -static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, +static BOOL DSPROPERTY_descWtoA(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA *dataA) { DWORD modlen, desclen; @@ -372,7 +372,7 @@ static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA return TRUE; } -static void DSPROPERTY_descWto1(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, +static void DSPROPERTY_descWto1(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) { data1->DeviceId = dataW->DeviceId;

1 0

Eric Pouech : dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 1e12e90cc9ff62a3fd4a6180326454fbedffa8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e12e90cc9ff62a3fd4a61803… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 11 12:14:59 2010 +0200 dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context. --- dlls/dbghelp/cpu_i386.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index a88b00f..7739d13 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -108,6 +108,9 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val; BOOL do_switch; unsigned deltapc = 1; +#ifdef __i386__ + CONTEXT _context; +#endif /* sanity check */ if (curr_mode >= stm_done) return FALSE; @@ -120,6 +123,21 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); +#ifdef __i386__ + if (!context) + { + /* setup a pseudo context for the rest of the code (esp. unwinding) */ + context = &_context; + memset(context, 0, sizeof(*context)); + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS; + if (frame->AddrPC.Mode != AddrModeFlat) context->SegCs = frame->AddrPC.Segment; + context->Eip = frame->AddrPC.Offset; + if (frame->AddrFrame.Mode != AddrModeFlat) context->SegSs = frame->AddrFrame.Segment; + context->Ebp = frame->AddrFrame.Offset; + if (frame->AddrStack.Mode != AddrModeFlat) context->SegSs = frame->AddrStack.Segment; + context->Esp = frame->AddrStack.Offset; + } +#endif if (curr_mode == stm_start) { THREAD_BASIC_INFORMATION info;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010