October 2006 - Wine-commits

Michael Stefaniuc : setupapi: Win64 printf format warning fixes.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 79ecfaf52f1c552c9f43c636e0133fe0b4d5e6c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ecfaf52f1c552c9f43c636e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 13 23:32:50 2006 +0200 setupapi: Win64 printf format warning fixes. --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/devinst.c | 28 ++++++++++++++-------------- dlls/setupapi/devinst16.c | 2 +- dlls/setupapi/dirid.c | 2 +- dlls/setupapi/install.c | 10 +++++----- dlls/setupapi/misc.c | 6 +++--- dlls/setupapi/parser.c | 10 +++++----- dlls/setupapi/query.c | 6 +++--- dlls/setupapi/queue.c | 8 ++++---- dlls/setupapi/setupcab.c | 4 ++-- dlls/setupapi/setupx_main.c | 2 +- dlls/setupapi/stringtable.c | 12 ++++++------ dlls/setupapi/stubs.c | 14 +++++++------- dlls/setupapi/virtcopy.c | 2 +- 14 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79ecfaf52f1c552c9f43c…

1 0

Michael Stefaniuc : imm32: Win64 printf format warning fixes.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: c044f26e67266503f59fdb57942596abe210297b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c044f26e67266503f59fdb579… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 13 23:32:38 2006 +0200 imm32: Win64 printf format warning fixes. --- dlls/imm32/Makefile.in | 1 - dlls/imm32/imm.c | 70 ++++++++++++++++++++++++------------------------ 2 files changed, 35 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c044f26e67266503f59fd…

1 0

Michael Ploujnikov : comctl32: Win64 printf format warning fixes.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 1c16d833796e94eaf1e95e301c6a4a47945a262d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c16d833796e94eaf1e95e301… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Fri Oct 13 09:34:21 2006 -0400 comctl32: Win64 printf format warning fixes. --- dlls/comctl32/Makefile.in | 2 - dlls/comctl32/animate.c | 64 ++++++++++++----------- dlls/comctl32/comboex.c | 42 ++++++++------- dlls/comctl32/comctl32undoc.c | 20 ++++--- dlls/comctl32/commctrl.c | 8 +-- dlls/comctl32/datetime.c | 6 +- dlls/comctl32/dpa.c | 6 +- dlls/comctl32/draglist.c | 2 - dlls/comctl32/hotkey.c | 4 + dlls/comctl32/imagelist.c | 6 +- dlls/comctl32/listview.c | 30 +++++------ dlls/comctl32/monthcal.c | 2 - dlls/comctl32/pager.c | 12 ++-- dlls/comctl32/propsheet.c | 30 +++++------ dlls/comctl32/rebar.c | 114 +++++++++++++++++++++-------------------- dlls/comctl32/smoothscroll.c | 2 - dlls/comctl32/status.c | 8 +-- dlls/comctl32/tab.c | 54 ++++++++++--------- dlls/comctl32/theming.c | 2 - dlls/comctl32/toolbar.c | 58 ++++++++++----------- dlls/comctl32/tooltips.c | 12 ++-- dlls/comctl32/trackbar.c | 8 +-- dlls/comctl32/treeview.c | 22 ++++---- 23 files changed, 257 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c16d833796e94eaf1e95…

1 0

Hans Leidekker : riched20: Win64 printf format warning fixes.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 177350d087aa9c1630a4abb258d04b2fbffc2f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177350d087aa9c1630a4abb25… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 13 21:25:54 2006 +0200 riched20: Win64 printf format warning fixes. --- dlls/riched20/Makefile.in | 1 - dlls/riched20/clipboard.c | 22 +++++++++++----------- dlls/riched20/editor.c | 16 ++++++++-------- dlls/riched20/paint.c | 2 +- dlls/riched20/richole.c | 6 +++--- dlls/riched20/run.c | 6 +++--- dlls/riched20/txtsrv.c | 4 ++-- dlls/riched20/writer.c | 32 ++++++++++++++++---------------- 8 files changed, 44 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=177350d087aa9c1630a4a…

1 0

Kirill K. Smirnov : winhelp: Window style has not been initialized.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 9a86eacdc95279e233139e9402d7ac0c64aaa451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a86eacdc95279e233139e940… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Oct 13 18:47:22 2006 +0400 winhelp: Window style has not been initialized. --- programs/winhelp/hlpfile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 4d3c458..2e64270 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1429,6 +1429,7 @@ static BOOL HLPFILE_SystemCommands(HLPFI wi->size.cx = (flags & 0x0020) ? GET_USHORT(ptr, 80) : CW_USEDEFAULT; wi->size.cy = (flags & 0x0040) ? GET_USHORT(ptr, 82) : CW_USEDEFAULT; wi->style = (flags & 0x0080) ? GET_USHORT(ptr, 84) : SW_SHOW; + wi->win_style = WS_OVERLAPPEDWINDOW; wi->sr_color = (flags & 0x0100) ? GET_UINT(ptr, 86) : 0xFFFFFF; wi->nsr_color = (flags & 0x0200) ? GET_UINT(ptr, 90) : 0xFFFFFF; WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%d,%d)x(%d,%d)\n",

1 0

Hans Leidekker : wininet: Cast-qual warnings fix.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 781f3f78a0c56a19c8cf73f34e621972132bbc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781f3f78a0c56a19c8cf73f34… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 13 15:43:54 2006 +0200 wininet: Cast-qual warnings fix. --- dlls/wininet/http.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3d9edad..c33e8bf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -915,7 +915,7 @@ static BOOL HTTP_DealWithProxy( LPWININE WCHAR buf[MAXHOSTNAME]; WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ WCHAR* url; - static const WCHAR szNul[] = { 0 }; + static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }, szSlash[] = { '/',0 } ; static const WCHAR szFormat1[] = { 'h','t','t','p',':','/','/','%','s',0 }; @@ -938,7 +938,7 @@ static BOOL HTTP_DealWithProxy( LPWININE return FALSE; if( !lpwhr->lpszPath ) - lpwhr->lpszPath = (LPWSTR)szNul; + lpwhr->lpszPath = szNul; TRACE("server='%s' path='%s'\n", debugstr_w(lpwhs->lpszHostName), debugstr_w(lpwhr->lpszPath)); /* for constant 15 see above */ @@ -1689,6 +1689,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET INTERNET_BUFFERSW BuffersInW; BOOL rc = FALSE; DWORD headerlen; + LPWSTR header = NULL; TRACE("(%p, %p, %p, %08x, %08x): stub\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); @@ -1700,16 +1701,15 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET { headerlen = MultiByteToWideChar(CP_ACP,0,lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength,0,0); - BuffersInW.lpcszHeader = HeapAlloc(GetProcessHeap(),0,headerlen* - sizeof(WCHAR)); - if (!BuffersInW.lpcszHeader) + header = HeapAlloc(GetProcessHeap(),0,headerlen*sizeof(WCHAR)); + if (!(BuffersInW.lpcszHeader = header)) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength, - (LPWSTR)BuffersInW.lpcszHeader, headerlen); + header, headerlen); } else BuffersInW.lpcszHeader = NULL; @@ -1722,8 +1722,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET rc = HttpSendRequestExW(hRequest, lpBuffersIn ? &BuffersInW : NULL, NULL, dwFlags, dwContext); - if (lpBuffersIn) - HeapFree(GetProcessHeap(),0,(LPVOID)BuffersInW.lpcszHeader); + HeapFree(GetProcessHeap(),0,header); return rc; } @@ -1949,14 +1948,14 @@ static BOOL HTTP_HandleRedirect(LPWININE { URL_COMPONENTSW urlComponents; WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; - static const WCHAR szHttp[] = {'h','t','t','p',0}; - static const WCHAR szHttps[] = {'h','t','t','p','s',0}; + static WCHAR szHttp[] = {'h','t','t','p',0}; + static WCHAR szHttps[] = {'h','t','t','p','s',0}; DWORD url_length = 0; LPWSTR orig_url; LPWSTR combined_url; urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); - urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? (LPWSTR)szHttps : (LPWSTR)szHttp; + urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; urlComponents.dwSchemeLength = 0; urlComponents.lpszHostName = lpwhs->lpszHostName; urlComponents.dwHostNameLength = 0;

1 0

Kirill K. Smirnov : winhelp: Use color specified in . hlp file for background, not just WHITE_BRUSH.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 4d00b282e157550475625f255a74aab5abc1d665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d00b282e157550475625f255… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Oct 13 16:19:48 2006 +0400 winhelp: Use color specified in .hlp file for background, not just WHITE_BRUSH. --- programs/winhelp/winhelp.c | 7 +++++++ programs/winhelp/winhelp.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index a2fa88d..9cf7993 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -272,6 +272,7 @@ static BOOL WINHELP_RegisterWinClasses(v class_text = class_main; class_text.lpfnWndProc = WINHELP_TextWndProc; + class_text.hbrBackground = 0; class_text.lpszClassName = TEXT_WIN_CLASS_NAME; class_shadow = class_main; @@ -395,6 +396,7 @@ static BOOL WINHELP_ReuseWindow(WINH win->hTextWnd = oldwin->hTextWnd; win->hHistoryWnd = oldwin->hHistoryWnd; oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0; + win->hBrush = oldwin->hBrush; SetWindowLong(win->hMainWnd, 0, (LONG)win); SetWindowLong(win->hButtonBoxWnd, 0, (LONG)win); @@ -857,6 +859,7 @@ static LRESULT CALLBACK WINHELP_TextWndP win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; SetWindowLong(hWnd, 0, (LONG) win); win->hTextWnd = hWnd; + win->hBrush = CreateSolidBrush(win->info->sr_color); if (win->info->win_style & WS_POPUP) Globals.hPopupWnd = win->hMainWnd = hWnd; WINHELP_InitFonts(hWnd); break; @@ -989,6 +992,8 @@ static LRESULT CALLBACK WINHELP_TextWndP win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); scroll_pos = GetScrollPos(hWnd, SB_VERT); + /* No DPtoLP needed - MM_TEXT map mode */ + if (ps.fErase) FillRect(hDc, &ps.rcPaint, win->hBrush); for (line = win->first_line; line; line = line->next) { for (part = &line->first_part; part; part = part->next) @@ -998,6 +1003,7 @@ static LRESULT CALLBACK WINHELP_TextWndP case hlp_line_part_text: SelectObject(hDc, part->u.text.hFont); SetTextColor(hDc, part->u.text.color); + SetBkColor(hDc, win->info->sr_color); TextOut(hDc, part->rect.left, part->rect.top - scroll_pos, part->u.text.lpsText, part->u.text.wTextLen); if (part->u.text.wUnderline) @@ -1122,6 +1128,7 @@ static LRESULT CALLBACK WINHELP_TextWndP if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); + DeleteObject(win->hBrush); WINHELP_DeleteWindow(win); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 2536b06..b7227bf 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -111,6 +111,8 @@ typedef struct tagWinHelp HCURSOR hArrowCur; HCURSOR hHandCur; + HBRUSH hBrush; + HLPFILE_WINDOWINFO* info; /* FIXME: for now it's a fixed size */

1 0

lostwages/include winehq.conf
by Alexandre Julliard 13 Oct '06

13 Oct '06

ChangeSet ID: 28933 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/10/13 10:24:51 Modified files: include : winehq.conf Log message: Release 0.9.23 Patch: http://cvs.winehq.org/patch.py?id=28933 Old revision New revision Changes Path 1.45 1.46 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.45 lostwages/include/winehq.conf:1.46 --- lostwages/include/winehq.conf:1.45 13 Oct 2006 15:24:51 -0000 +++ lostwages/include/winehq.conf 13 Oct 2006 15:24:51 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.22 +snapshot_date: 0.9.23 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

Alexandre Julliard : Release 0.9.23.
by Alexandre Julliard 13 Oct '06

13 Oct '06

Module: wine Branch: master Commit: 7affdd4c7cadc3aa90c3e1e053321f4712a6f07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7affdd4c7cadc3aa90c3e1e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 16:43:39 2006 +0200 Release 0.9.23. --- ANNOUNCE | 685 ++++++++++++++- ChangeLog | 2860 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 4 files changed, 3544 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7affdd4c7cadc3aa90c3e…

1 0

Tag wine-0.9.23 : Alexandre Julliard : Release 0.9.23
by Alexandre Julliard 13 Oct '06

13 Oct '06

Module: wine Branch: refs/tags/wine-0.9.23 Tag: 843c263b29ed83d4512727899c9c9c3af9595447 URL: http://source.winehq.org/git/wine.git/?a=tag;h=843c263b29ed83d4512727899c9c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 16:43:40 2006 +0200 Release 0.9.23

1 0