wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Nikolay Sivov : comctl32/monthcal: Implement MCM_GETMONTHRANGE for GMR_VISIBLE flag, single calendar control only.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 96022da6c88a3d60050ed5e1032f7666351072d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96022da6c88a3d60050ed5e10… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 18:27:21 2009 +0400 comctl32/monthcal: Implement MCM_GETMONTHRANGE for GMR_VISIBLE flag, single calendar control only. --- dlls/comctl32/monthcal.c | 23 +++++++++++++++++++++-- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ed059ff..b5cb65a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -936,10 +936,29 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) static LRESULT -MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr) +MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) { TRACE("\n"); + if(st) + { + if(flag == GMR_VISIBLE) + { + /*FIXME: currently multicalendar feature isn't implelented, so entirely + visible month is current */ + st[0] = st[1] = infoPtr->curSel; + + st[0].wDay = 1; + st[0].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(1, st[0].wMonth, st[0].wYear); + + st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); + st[1].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(st[1].wDay, st[1].wMonth, + st[1].wYear); + } + else + FIXME("only GMR_VISIBLE flag supported, got %d\n", flag); + } + return infoPtr->monthRange; } @@ -2053,7 +2072,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return MONTHCAL_SetSelRange(infoPtr, (LPSYSTEMTIME)lParam); case MCM_GETMONTHRANGE: - return MONTHCAL_GetMonthRange(infoPtr); + return MONTHCAL_GetMonthRange(infoPtr, wParam, (SYSTEMTIME*)lParam); case MCM_SETDAYSTATE: return MONTHCAL_SetDayState(infoPtr, (INT)wParam, (LPMONTHDAYSTATE)lParam); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 1ac2bb8..4a051b7 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1323,10 +1323,13 @@ static void test_monthcal_monthrange(void) res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); todo_wine { expect(2, res); + } expect(2000, st_visible[0].wYear); expect(11, st_visible[0].wMonth); expect(1, st_visible[0].wDay); expect(2000, st_visible[1].wYear); + + todo_wine { expect(12, st_visible[1].wMonth); expect(31, st_visible[1].wDay); }

1 0

Nikolay Sivov : comctl32/monthcal: Drop exstyle parameter, it isn't used.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: ec3e9308da35c614f67af17e36e82a8987885f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3e9308da35c614f67af17e3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 18:26:43 2009 +0400 comctl32/monthcal: Drop exstyle parameter, it isn't used. --- dlls/comctl32/tests/datetime.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index c449e45..a0f12f0 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -149,7 +149,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa return ret; } -static HWND create_datetime_control(DWORD style, DWORD exstyle) +static HWND create_datetime_control(DWORD style) { struct subclass_info *info; HWND hWndDateTime = NULL; @@ -187,7 +187,7 @@ static void test_dtm_set_format(void) SYSTEMTIME systime; LRESULT r; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -238,7 +238,7 @@ static void test_dtm_set_and_get_mccolor(void) { HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -259,7 +259,7 @@ static void test_dtm_set_and_get_mcfont(void) HFONT hFontOrig, hFontNew; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -277,7 +277,7 @@ static void test_dtm_get_monthcal(void) LRESULT r; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -337,7 +337,7 @@ static void test_dtm_set_and_get_range(void) SYSTEMTIME getSt[2]; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -423,7 +423,7 @@ static void test_dtm_set_range_swap_min_max(void) SYSTEMTIME origSt; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); fill_systime_struct(&st[0], 2007, 2, 4, 15, 2, 2, 2, 2); @@ -527,7 +527,7 @@ static void test_dtm_set_and_get_system_time(void) SYSTEMTIME st, getSt, ref; HWND hWnd, hWndDateTime_test_gdt_none; - hWndDateTime_test_gdt_none = create_datetime_control(0, 0); + hWndDateTime_test_gdt_none = create_datetime_control(0); ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); if(hWndDateTime_test_gdt_none) { @@ -543,7 +543,7 @@ static void test_dtm_set_and_get_system_time(void) DestroyWindow(hWndDateTime_test_gdt_none); - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);

1 0

Eric Pouech : winedbg: Properly manage Wine' s dbghelp extensions for constant symbols which value is passed by ref.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 700d9df4140596e3bd8cad60e42e2784ec7e2319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=700d9df4140596e3bd8cad60e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:15:49 2009 +0200 winedbg: Properly manage Wine's dbghelp extensions for constant symbols which value is passed by ref. --- programs/winedbg/symbol.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index e0553e7..abc7d2d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -91,24 +91,39 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG base, { struct dbg_type type; VARIANT v; - DWORD* pdw; type.module = sym->ModBase; type.id = sym->info; - /* FIXME: this won't work for pointers, as we always for the - * dereference to be in debuggee address space while here - * it's in debugger address space - */ - if (!types_get_info(&type, TI_GET_VALUE, &v) || (v.n1.n2.vt & VT_BYREF)) + if (!types_get_info(&type, TI_GET_VALUE, &v)) { - if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value"); + if (buffer) snprintf(buffer, sz, "Couldn't get full value information for %s", sym->Name); return FALSE; } - pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); - lvalue->cookie = DLV_HOST; - lvalue->addr.Offset = (ULONG)(DWORD_PTR)pdw; - *pdw = sym->Value; + else if (v.n1.n2.vt & VT_BYREF) + { + /* FIXME: this won't work for pointers or arrays, as we don't always + * know, if the value to be dereferenced lies in debuggee or + * debugger address space. + */ + if (sym->Tag == SymTagPointerType || sym->Tag == SymTagArrayType) + { + if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value for %s", sym->Name); + return FALSE; + } + /* this is likely Wine's dbghelp which passes const values by reference + * (object is managed by dbghelp, hence in debugger address space) + */ + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)sym->Value; + } + else + { + DWORD* pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)pdw; + *pdw = sym->Value; + } } else if (sym->Flags & SYMFLAG_LOCAL) {

1 0

Eric Pouech : dbghelp: Enhance support for constant values in dwarf debug information.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6a1b2a9ca55374e9dc117dcc8dc3847aac2c471e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1b2a9ca55374e9dc117dcc8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:15:43 2009 +0200 dbghelp: Enhance support for constant values in dwarf debug information. --- dlls/dbghelp/dwarf.c | 14 +++++++++++++- dlls/dbghelp/symbol.c | 1 + 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7843e67..e5617c3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1393,12 +1393,24 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, v.n1.n2.n3.byref = pool_strdup(&subpgm->ctx->module->pool, value.u.string); break; - case DW_FORM_data8: case DW_FORM_block: case DW_FORM_block1: case DW_FORM_block2: case DW_FORM_block4: + v.n1.n2.vt = VT_I4; + switch (value.u.block.size) + { + case 1: v.n1.n2.n3.lVal = *(BYTE*)value.u.block.ptr; break; + case 2: v.n1.n2.n3.lVal = *(USHORT*)value.u.block.ptr; break; + case 4: v.n1.n2.n3.lVal = *(DWORD*)value.u.block.ptr; break; + default: + v.n1.n2.vt = VT_I1 | VT_BYREF; + v.n1.n2.n3.byref = pool_alloc(&subpgm->ctx->module->pool, value.u.block.size); + memcpy(v.n1.n2.n3.byref, value.u.block.ptr, value.u.block.size); + } + break; + case DW_FORM_data8: default: FIXME("Unsupported form for const value %s (%lx)\n", name.u.string, value.form); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 34d00b2..c322a62 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -703,6 +703,7 @@ static void symt_fill_sym_info(const struct module_pair* pair, case VT_UI2: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.uiVal; break; case VT_UI1: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.bVal; break; case VT_I1 | VT_BYREF: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.byref; break; + case VT_EMPTY: sym_info->Value = 0; break; default: FIXME("Unsupported variant type (%u)\n", data->u.value.n1.n2.vt); sym_info->Value = 0;

1 0

Eric Pouech : msvcrt: Added __uncaught_exception support.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: dcf68254bd315bf1227e8e849077189daff44971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf68254bd315bf1227e8e849… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:13:37 2009 +0200 msvcrt: Added __uncaught_exception support. --- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/except.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index fc693bd..7552ca3 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -30,7 +30,7 @@ @ stub ??_Fbad_typeid@@QAEXXZ @ cdecl ??_U@YAPAXI@Z(long) msvcrt.??_U@YAPAXI@Z @ cdecl ??_V@YAXPAX@Z(ptr) msvcrt.??_V@YAXPAX@Z -@ stub __uncaught_exception +@ cdecl __uncaught_exception() msvcrt.__uncaught_exception @ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() msvcrt.?_query_new_handler@@YAP6AHI@ZXZ @ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 5de42db..119469b 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -608,3 +608,11 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ return msvcrt_exception_filter(ptr); } + +/****************************************************************** + * MSVCRT___uncaught_exception + */ +BOOL CDECL MSVCRT___uncaught_exception(void) +{ + return FALSE; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d143bee..ad8fa94 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -151,6 +151,7 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii +@ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active

1 0

Alexandre Julliard : msvideo: Pass the correct function address for 32-> 16 callbacks.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 4e276bf42a973bea57c6b2a12bcc8fe2782f5350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e276bf42a973bea57c6b2a12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:56:12 2009 +0200 msvideo: Pass the correct function address for 32->16 callbacks. --- dlls/msvideo.dll16/msvideo16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index faa8e62..6970278 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -670,7 +670,7 @@ BOOL16 VFWAPI ICInfo16(DWORD fccType, DWORD fccHandler, ICINFO16 *lpicinfo) * * */ -static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT msg, DWORD lp1, DWORD lp2) +static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT msg, LPARAM lp1, LPARAM lp2) { WORD args[8]; DWORD ret = 0; @@ -781,7 +781,7 @@ HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FAR LeaveCriticalSection(&msvideo_cs); return 0; } - if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, IC_Callback3216))) + if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)thunk))) thunk->hIC16 = HIC_16(hic32); else thunk->pfn16 = 0;

1 0

Alexandre Julliard : loader: Build the loader with -D__WINESRC__.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b1c235d364ac052fdc67d6323ca6fb09b12415e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c235d364ac052fdc67d6323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:34 2009 +0200 loader: Build the loader with -D__WINESRC__. --- loader/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 8f4d2a2..5911159 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -2,6 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ +DEFS = -D__WINESRC__ $(EXTRADEFS) C_SRCS = \ main.c \

1 0

Alexandre Julliard : tools: Build all the tools with -D__WINESRC__.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a4e22d4928132da6d56d412f9e0c1d4090c5ae38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e22d4928132da6d56d412f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:25 2009 +0200 tools: Build all the tools with -D__WINESRC__. --- tools/Makefile.in | 1 + tools/widl/Makefile.in | 1 + tools/winebuild/Makefile.in | 1 + tools/winedump/Makefile.in | 1 + tools/wmc/Makefile.in | 1 + tools/wrc/Makefile.in | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index b711a7b..496d7bf 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ MODULE = none +DEFS = -D__WINESRC__ $(EXTRADEFS) EXTRAINCL = @FREETYPEINCL@ FREETYPELIBS = @FREETYPELIBS@ diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 453276c..d0fea83 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = widl$(EXEEXT) MANPAGES = widl.man diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index d78dfe0..c4ae029 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = winebuild$(EXEEXT) MANPAGES = winebuild.man diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 34445ad..bee2fcc 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = winedump$(EXEEXT) MANPAGES = winedump.man diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index b54a19f..fba92ea 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = wmc$(EXEEXT) wmc-installed MANPAGES = wmc.man diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 911d131..c8a8534 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = wrc$(EXEEXT) wrc-installed MANPAGES = wrc.man

1 0

Alexandre Julliard : msvcrt: Add an MSVCRT prefix to _wenviron.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 7c15ae127c1724cc92b145cf34528110c28750ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c15ae127c1724cc92b145cf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:09 2009 +0200 msvcrt: Add an MSVCRT prefix to _wenviron. --- dlls/msvcrt/data.c | 10 +++++----- dlls/msvcrt/environ.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 1e4eafc..c91980d 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -51,7 +51,7 @@ MSVCRT_wchar_t **MSVCRT___wargv = NULL; char *MSVCRT__acmdln = NULL; MSVCRT_wchar_t *MSVCRT__wcmdln = NULL; char **MSVCRT__environ = NULL; -MSVCRT_wchar_t **_wenviron = NULL; +MSVCRT_wchar_t **MSVCRT__wenviron = NULL; char **MSVCRT___initenv = NULL; MSVCRT_wchar_t **MSVCRT___winitenv = NULL; int MSVCRT_app_type = 0; @@ -213,9 +213,9 @@ char*** CDECL __p__environ(void) */ MSVCRT_wchar_t*** CDECL __p__wenviron(void) { - if (!_wenviron) - _wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); - return &_wenviron; + if (!MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); + return &MSVCRT__wenviron; } /********************************************************************* @@ -325,7 +325,7 @@ void msvcrt_free_args(void) HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); HeapFree(GetProcessHeap(), 0, MSVCRT__environ); - HeapFree(GetProcessHeap(), 0, _wenviron); + HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 44f201a..a60f116 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -107,8 +107,8 @@ int CDECL _putenv(const char *str) /* Update the __p__environ array only when already initialized */ if (MSVCRT__environ) MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (_wenviron) - _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); + if (MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); finish: HeapFree(GetProcessHeap(), 0, name); @@ -153,8 +153,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str) /* Update the __p__environ array only when already initialized */ if (MSVCRT__environ) MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (_wenviron) - _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); + if (MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); finish: HeapFree(GetProcessHeap(), 0, name); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 502703c..337a17c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -131,7 +131,7 @@ void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum); extern char **MSVCRT__environ; -extern MSVCRT_wchar_t **_wenviron; +extern MSVCRT_wchar_t **MSVCRT__wenviron; extern char ** msvcrt_SnapshotOfEnvironmentA(char **); extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5c475a0..d143bee 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -550,7 +550,7 @@ @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ extern _wenviron +@ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr) @ varargs _wexeclp(wstr wstr)

1 0

Wilfried Pasquazzo : user32: DrawState always uses real icon size for drawing.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 2326f3d4d57f1aed68b7988862ad31052b1c5516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2326f3d4d57f1aed68b798886… Author: Wilfried Pasquazzo <wilfried.pasquazzo(a)gmail.com> Date: Fri Oct 2 21:55:26 2009 +0000 user32: DrawState always uses real icon size for drawing. --- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/uitools.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5e7558d..ff86cd0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1341,7 +1341,7 @@ static void test_DrawState(void) /* DSS_NORMAL draw Icon without any modifications */ /* DSS_UNION draw the Icon dithered */ - todo_wine check_DrawState_Size(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, __LINE__); + check_DrawState_Size(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, __LINE__); check_DrawState_Color(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); cleanup: diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 54dab13..a401fc3 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1534,7 +1534,7 @@ static BOOL UITOOLS_DrawStateJam( HDC hdc, UINT opcode, DRAWSTATEPROC func, LPAR return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); case DST_ICON: - return DrawIcon(hdc, rc->left, rc->top, (HICON)lp); + return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, 0, 0, 0, NULL, DI_NORMAL); case DST_BITMAP: memdc = CreateCompatibleDC(hdc);

1 0

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 October 2009