September 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Some cleanup to avoid cast in helpers.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 6bd43fbb49ae566e2f3f776ac855130c22dbedb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd43fbb49ae566e2f3f776ac… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 03:43:38 2009 +0400 comctl32/monthcal: Some cleanup to avoid cast in helpers. --- dlls/comctl32/monthcal.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5cbd9aa..7a49c70 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -91,7 +91,7 @@ typedef struct int height_increment; int width_increment; int firstDayplace; /* place of the first day of the current month */ - int delta; /* scroll rate; # of months that the */ + INT delta; /* scroll rate; # of months that the */ /* control moves when user clicks a scroll button */ int visible; /* # of months visible */ int firstDay; /* Start month calendar with firstDay's day */ @@ -166,7 +166,7 @@ static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIM } /* make sure that time is valid */ -static int MONTHCAL_ValidateTime(SYSTEMTIME time) +static BOOL MONTHCAL_ValidateTime(SYSTEMTIME time) { if(time.wMonth < 1 || time.wMonth > 12 ) return FALSE; if(time.wDayOfWeek > 6) return FALSE; @@ -759,11 +759,11 @@ MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) static LRESULT -MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, INT index) { TRACE("\n"); - switch((int)wParam) { + switch(index) { case MCSC_BACKGROUND: return infoPtr->bk; case MCSC_TEXT: @@ -834,13 +834,13 @@ MONTHCAL_GetMonthDelta(const MONTHCAL_INFO *infoPtr) static LRESULT -MONTHCAL_SetMonthDelta(MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_SetMonthDelta(MONTHCAL_INFO *infoPtr, INT delta) { - int prev = infoPtr->delta; + INT prev = infoPtr->delta; - TRACE("delta %ld\n", wParam); + TRACE("delta %d\n", delta); - infoPtr->delta = (int)wParam; + infoPtr->delta = delta; return prev; } @@ -1645,21 +1645,21 @@ done: static LRESULT -MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, HDC hdc_paint) { HDC hdc; PAINTSTRUCT ps; - if (wParam) + if (hdc_paint) { GetClientRect(infoPtr->hwndSelf, &ps.rcPaint); - hdc = (HDC)wParam; + hdc = hdc_paint; } else hdc = BeginPaint(infoPtr->hwndSelf, &ps); MONTHCAL_Refresh(infoPtr, hdc, &ps); - if (!wParam) EndPaint(infoPtr->hwndSelf, &ps); + if (!hdc_paint) EndPaint(infoPtr->hwndSelf, &ps); return 0; } @@ -2011,7 +2011,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_PRINTCLIENT: case WM_PAINT: - return MONTHCAL_Paint(infoPtr, wParam); + return MONTHCAL_Paint(infoPtr, (HDC)wParam); case WM_SETFOCUS: return MONTHCAL_SetFocus(infoPtr);

1 0

Nikolay Sivov : comctl32/monthcal: Don't redraw if date didn' t change on MCM_SETTODAY.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: decc86add9bca24dc7b1680018feddde50405856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=decc86add9bca24dc7b168001… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 03:32:18 2009 +0400 comctl32/monthcal: Don't redraw if date didn't change on MCM_SETTODAY. --- dlls/comctl32/monthcal.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index aa4b35c..5cbd9aa 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -158,6 +158,12 @@ int MONTHCAL_MonthLength(int month, int year) } } +/* compares timestamps using date part only */ +static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIME *second) +{ + return (first->wYear == second->wYear) && (first->wMonth == second->wMonth) && + (first->wDay == second->wDay); +} /* make sure that time is valid */ static int MONTHCAL_ValidateTime(SYSTEMTIME time) @@ -1093,6 +1099,9 @@ MONTHCAL_SetToday(MONTHCAL_INFO *infoPtr, SYSTEMTIME *today) TRACE("%p\n", today); if(!today) return FALSE; + + if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return TRUE; + MONTHCAL_CopyTime(today, &infoPtr->todaysDate); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE;

1 0

Nikolay Sivov : comctl32/monthcal: Name MCM_SETMAXSELCOUNT parameter.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 534ea8ab42b8156b4536f43f0d38950ddac0f4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=534ea8ab42b8156b4536f43f0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 03:16:51 2009 +0400 comctl32/monthcal: Name MCM_SETMAXSELCOUNT parameter. --- dlls/comctl32/monthcal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 4aa8d71..aa4b35c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -104,7 +104,7 @@ typedef struct int status; /* See MC_SEL flags */ int curSelDay; /* current selected day */ int firstSelDay; /* first selected day */ - int maxSelCount; + INT maxSelCount; SYSTEMTIME minSel; SYSTEMTIME maxSel; DWORD rangeValid; @@ -1026,12 +1026,12 @@ MONTHCAL_GetMaxSelCount(const MONTHCAL_INFO *infoPtr) static LRESULT -MONTHCAL_SetMaxSelCount(MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_SetMaxSelCount(MONTHCAL_INFO *infoPtr, INT max) { - TRACE("%lx\n", wParam); + TRACE("%d\n", max); if(infoPtr->dwStyle & MCS_MULTISELECT) { - infoPtr->maxSelCount = wParam; + infoPtr->maxSelCount = max; } return TRUE;

1 0

Nikolay Sivov : comctl32/monthcal: Don' t redraw after MCM_SETCURSEL if selection doesn't change.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 548645d36074d962bf71acd7e15fd234e79070c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548645d36074d962bf71acd7e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 03:13:38 2009 +0400 comctl32/monthcal: Don't redraw after MCM_SETCURSEL if selection doesn't change. --- dlls/comctl32/monthcal.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9d2e0e2..4aa8d71 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1001,12 +1001,17 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(!MONTHCAL_ValidateTime(*curSel)) return FALSE; - infoPtr->currentMonth=curSel->wMonth; - infoPtr->currentYear=curSel->wYear; - MONTHCAL_CopyTime(curSel, &infoPtr->minSel); MONTHCAL_CopyTime(curSel, &infoPtr->maxSel); + /* exit earlier if selection equals current */ + if (infoPtr->currentMonth == curSel->wMonth && + infoPtr->currentYear == curSel->wYear && + infoPtr->curSelDay == curSel->wDay) return TRUE; + + infoPtr->currentMonth = curSel->wMonth; + infoPtr->currentYear = curSel->wYear; + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE;

1 0

Nikolay Sivov : comct32/monthcal: Invalidate background too on MCM_SETCOLOR with MCSC_BACKGROUND.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: c01ab1608c669db00db78a480f57085ec3655c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01ab1608c669db00db78a480… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 02:52:37 2009 +0400 comct32/monthcal: Invalidate background too on MCM_SETCOLOR with MCSC_BACKGROUND. --- dlls/comctl32/monthcal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 972c680..9d2e0e2 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -777,13 +777,13 @@ MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT -MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, WPARAM wParam, COLORREF color) +MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, INT index, COLORREF color) { - int prev = -1; + COLORREF prev = -1; - TRACE("%ld: color %08x\n", wParam, color); + TRACE("%d: color %08x\n", index, color); - switch((int)wParam) { + switch(index) { case MCSC_BACKGROUND: prev = infoPtr->bk; infoPtr->bk = color; @@ -810,7 +810,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, WPARAM wParam, COLORREF color) break; } - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND ? TRUE : FALSE); return prev; }

1 0

Austin English : wined3d: Recognize DRI R300 drivers as Mesa.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 5d15da6df595ba60fed57c54dc055cb017dd02b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d15da6df595ba60fed57c54d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 24 16:04:05 2009 -0500 wined3d: Recognize DRI R300 drivers as Mesa. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b46c0f..e9e64c7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -988,6 +988,7 @@ static GL_Vendors wined3d_guess_vendor(const char *gl_vendor, const char *gl_ren return VENDOR_INTEL; if (strstr(gl_vendor, "Mesa") + || strstr(gl_vendor, "DRI R300 Project") || strstr(gl_vendor, "Tungsten Graphics, Inc")) return VENDOR_MESA;

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: b118d50ecb14c0fa2359a1c33536f664e1b4c2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b118d50ecb14c0fa2359a1c33… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 23 22:22:41 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 6206055..39c6f68 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -42,6 +42,8 @@ STRINGTABLE DISCARDABLE IDS_OBJECT_EXPECTED "Objet attendu" IDS_ILLEGAL_ASSIGN "Affectation illégale" IDS_UNDEFINED "« | » n'est pas défini" - IDS_NOT_BOOL "Booléen attendu" + IDS_NOT_BOOL "Objet booléen attendu" + IDS_JSCRIPT_EXPECTED "Objet JScript attendu" + IDS_REGEXP_SYNTAX_ERROR "Erreur de syntaxe dans l'expression rationnelle" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" }

1 0

Alexandre Julliard : ntdll: Support both 32-bit and 64-bit modules in RtlImageDirectoryEntryToData.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: c39e28edfb1c89bb40e2ece0de3d8abf54ebd804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39e28edfb1c89bb40e2ece0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 12:46:39 2009 +0200 ntdll: Support both 32-bit and 64-bit modules in RtlImageDirectoryEntryToData. --- dlls/ntdll/loader.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 76f0e5d..cc9904b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2522,10 +2522,25 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir, image = FALSE; } if (!(nt = RtlImageNtHeader( module ))) return NULL; - if (dir >= nt->OptionalHeader.NumberOfRvaAndSizes) return NULL; - if (!(addr = nt->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; - *size = nt->OptionalHeader.DataDirectory[dir].Size; - if (image || addr < nt->OptionalHeader.SizeOfHeaders) return (char *)module + addr; + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_NT_HEADERS64 *nt64 = (IMAGE_NT_HEADERS64 *)nt; + + if (dir >= nt64->OptionalHeader.NumberOfRvaAndSizes) return NULL; + if (!(addr = nt64->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; + *size = nt64->OptionalHeader.DataDirectory[dir].Size; + if (image || addr < nt64->OptionalHeader.SizeOfHeaders) return (char *)module + addr; + } + else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + const IMAGE_NT_HEADERS32 *nt32 = (IMAGE_NT_HEADERS32 *)nt; + + if (dir >= nt32->OptionalHeader.NumberOfRvaAndSizes) return NULL; + if (!(addr = nt32->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; + *size = nt32->OptionalHeader.DataDirectory[dir].Size; + if (image || addr < nt32->OptionalHeader.SizeOfHeaders) return (char *)module + addr; + } + else return NULL; /* not mapped as image, need to find the section containing the virtual address */ return RtlImageRvaToVa( nt, module, addr, NULL );

1 0

Alexandre Julliard : ntdll: Add support for ordinal forwards.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 135612d22f6fda56f74e02e41147bd5332d76683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135612d22f6fda56f74e02e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 13:12:02 2009 +0200 ntdll: Add support for ordinal forwards. --- dlls/ntdll/loader.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cc9904b..71d7ecd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -116,6 +116,8 @@ static WINE_MODREF *last_failed_modref; static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ); static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); +static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, + DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, const char *name, int hint, LPCWSTR load_path ); @@ -403,7 +405,13 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS } if ((exports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) - proc = find_named_export( wm->ldr.BaseAddress, exports, exp_size, end + 1, -1, load_path ); + { + const char *name = end + 1; + if (*name == '#') /* ordinal */ + proc = find_ordinal_export( wm->ldr.BaseAddress, exports, exp_size, atoi(name+1), load_path ); + else + proc = find_named_export( wm->ldr.BaseAddress, exports, exp_size, name, -1, load_path ); + } if (!proc) {

1 0

Alexandre Julliard : winedump: Ordinal functions can be forwards too.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: bb223b789b02ef9dda2a57a92d4d5bdd607f00c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb223b789b02ef9dda2a57a92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 22:36:45 2009 +0200 winedump: Ordinal functions can be forwards too. --- tools/winedump/pe.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 5ff8a16..077109d 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -492,9 +492,7 @@ static void dump_dir_exported_functions(void) pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); if (!pFunc) {printf("Can't grab functions' address table\n"); return;} pName = RVA(exportDir->AddressOfNames, exportDir->NumberOfNames * sizeof(DWORD)); - if (!pName) {printf("Can't grab functions' name table\n"); return;} pOrdl = RVA(exportDir->AddressOfNameOrdinals, exportDir->NumberOfNames * sizeof(WORD)); - if (!pOrdl) {printf("Can't grab functions' ordinal table\n"); return;} funcs = calloc( exportDir->NumberOfFunctions, sizeof(*funcs) ); if (!funcs) fatal("no memory"); @@ -506,15 +504,15 @@ static void dump_dir_exported_functions(void) if (!pFunc[i]) continue; printf(" %08X %5u ", pFunc[i], exportDir->Base + i); if (funcs[i]) - { printf("%s", get_symbol_str((const char*)RVA(funcs[i], sizeof(DWORD)))); - /* check for forwarded function */ - if ((const char *)RVA(pFunc[i],1) >= (const char *)exportDir && - (const char *)RVA(pFunc[i],1) < (const char *)exportDir + size) - printf(" (-> %s)", (const char *)RVA(pFunc[i],1)); - printf("\n"); - } - else printf("<by ordinal>\n"); + else + printf("<by ordinal>"); + + /* check for forwarded function */ + if ((const char *)RVA(pFunc[i],1) >= (const char *)exportDir && + (const char *)RVA(pFunc[i],1) < (const char *)exportDir + size) + printf(" (-> %s)", (const char *)RVA(pFunc[i],1)); + printf("\n"); } free(funcs); printf("\n");

1 0