October 2011 - Wine-commits

Andrew Talbot : dsound: Remove unneeded address-of operator from function name.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 1f1a97a9b539753664f90ef014afec3a615982d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1a97a9b539753664f90ef01… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 21:15:37 2011 +0100 dsound: Remove unneeded address-of operator from function name. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 77dffe6..77ce7b6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1048,7 +1048,7 @@ static HRESULT DirectSoundCaptureDevice_Initialize( } IAudioClient_Release(client); - device->timerID = DSOUND_create_timer(&DSOUND_capture_timer, (DWORD_PTR)device); + device->timerID = DSOUND_create_timer(DSOUND_capture_timer, (DWORD_PTR)device); list_add_tail(&DSOUND_capturers, &device->entry);

1 0

Charles Davis : winemenubuilder: Don't define crc16() on Mac OS.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: db7383d969806b4259a683c5eedc915fcd2f5c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7383d969806b4259a683c5e… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Oct 8 14:34:17 2011 -0600 winemenubuilder: Don't define crc16() on Mac OS. --- programs/winemenubuilder/winemenubuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index b983a8d..755e0b2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -199,6 +199,7 @@ static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ +#ifndef __APPLE__ static unsigned short crc16(const char* string) { unsigned short crc = 0; @@ -217,6 +218,7 @@ static unsigned short crc16(const char* string) } return crc; } +#endif static char *strdupA( const char *str ) {

1 0

Alexander Nicolaysen Sørnes : version: Return the user to the version page after managing notes
by Alexander Nicolaysen Sørnes 09 Oct '11

09 Oct '11

Module: appdb Branch: master Commit: cb1b2d21850e6dd8dceb592f6aa34c5b8712c996 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=cb1b2d21850e6dd8dceb592f… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Oct 9 15:12:53 2011 +0200 version: Return the user to the version page after managing notes --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index 8286c5b..8f02b24 100644 --- a/include/version.php +++ b/include/version.php @@ -1011,7 +1011,7 @@ class version { echo $shAdd.'" />'; echo "\t".'<input type="submit" value="Add note/how-to" class="button">'."\n"; echo '</form>'."\n"; - echo '<form method="post" action="'.BASE.'objectManager.php?sClass=tagNoteVersionAssignMgr&sAction=edit&iId='.$this->iVersionId.'">'; + echo '<form method="post" action="'.BASE.'objectManager.php?sClass=tagNoteVersionAssignMgr&sAction=edit&iId='.$this->iVersionId.'&sReturnTo='.urlencode($this->objectMakeUrl()).'">'; echo '<input type="submit" value="Manage notes" />'; echo '</form>'; echo "</td></tr>";

1 0

Alexander Nicolaysen Sørnes : objectManager: use value instead of innerHTML when adding common replies to the e-mail text field
by Alexander Nicolaysen Sørnes 09 Oct '11

09 Oct '11

Module: appdb Branch: master Commit: 28df9c104dbead0bac8a119c4611fe49e21f073e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=28df9c104dbead0bac8a119c… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Oct 9 14:47:35 2011 +0200 objectManager: use value instead of innerHTML when adding common replies to the e-mail text field --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 00c7251..d6be2aa 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -452,7 +452,7 @@ class ObjectManager { $sReply = $oReply->getReply(); echo '<tr valign=top><td class="color0"></td>',"\n"; - echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].innerHTML += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; + echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].value += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; echo '</tr>',"\n"; } // end output radio buttons for common responses

1 0

Louis Lenders : dwmapi: Add stub for DwmRegisterThumbnail.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 09dfda553c6afb26f2ac063d4549885f181620b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dfda553c6afb26f2ac063d4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 30 12:30:10 2011 +0200 dwmapi: Add stub for DwmRegisterThumbnail. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ include/dwmapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 8e01cac..8f8f7a3 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -36,7 +36,7 @@ @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize -@ stub DwmRegisterThumbnail +@ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration @ stub DwmSetPresentParameters @ stdcall DwmSetWindowAttribute(long long ptr long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1bc000..39a9918 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -198,3 +198,13 @@ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attrib return E_NOTIMPL; } + +/********************************************************************** + * DwmRegisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_id) +{ + FIXME("(%p %p %p) stub\n", dest, src, thumbnail_id); + + return E_NOTIMPL; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index ecc515c..b2546ae 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -30,6 +30,7 @@ extern "C" { #endif DECLARE_HANDLE(HTHUMBNAIL); +typedef HTHUMBNAIL *PHTHUMBNAIL; typedef struct _MilMatrix3x2D { @@ -60,6 +61,7 @@ DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

André Hentschel : tools: Upgrade the config.guess/ config.sub scripts.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 2843d4f831aac681cdd42ee8fad950b93bce6875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2843d4f831aac681cdd42ee8f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 30 16:24:34 2011 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 223 +++++++++++++++++++++++++++------------------------- tools/config.sub | 122 ++++++++++++++++++----------- 2 files changed, 192 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2843d4f831aac681cdd42…

1 0

André Hentschel : ntdll: Map ETIME to STATUS_IO_TIMEOUT.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 905a819d7c06bc066925b59c6f18c81450c49657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905a819d7c06bc066925b59c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 3 17:45:27 2011 +0200 ntdll: Map ETIME to STATUS_IO_TIMEOUT. --- dlls/ntdll/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 53984f9..85fc858 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -347,6 +347,7 @@ NTSTATUS FILE_GetNtStatus(void) case ECONNRESET:return STATUS_PIPE_DISCONNECTED; case EFAULT: return STATUS_ACCESS_VIOLATION; case ESPIPE: return STATUS_ILLEGAL_FUNCTION; + case ETIME: return STATUS_IO_TIMEOUT; case ENOEXEC: /* ?? */ case EEXIST: /* ?? */ default:

1 0

Aric Stewart : usp10: Handle the SSA_PASSWORD flag in ScriptStringAnalyse.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 95ca444692ee97dc165101c8f29a55b5b514dc75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ca444692ee97dc165101c8f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 6 15:23:45 2011 -0500 usp10: Handle the SSA_PASSWORD flag in ScriptStringAnalyse. --- dlls/usp10/usp10.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14f523f..5a8a468 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -914,6 +914,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_STATE sState; int i, num_items = 255; BYTE *BidiLevel; + WCHAR *iString = NULL; TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, @@ -945,6 +946,14 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, else memset(&sControl, 0, sizeof(SCRIPT_CONTROL)); + if (dwFlags & SSA_PASSWORD) + { + iString = heap_alloc(sizeof(WCHAR)*cString); + for (i = 0; i < cString; i++) + iString[i] = *((const WCHAR *)pString); + pString = iString; + } + hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); @@ -1026,9 +1035,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, heap_free(BidiLevel); *pssa = analysis; + heap_free(iString); return S_OK; error: + heap_free(iString); heap_free(analysis->glyphs); heap_free(analysis->logattrs); heap_free(analysis->pItem);

1 0

Peter Schellenbach : comctl32/statusbar: Fixed missing icon in owner draw panels.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 9751a946e353bb95d7c183bc87d1cd9c3b681939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9751a946e353bb95d7c183bc8… Author: Peter Schellenbach <pjs(a)asent.com> Date: Wed Sep 14 18:58:00 2011 -0700 comctl32/statusbar: Fixed missing icon in owner draw panels. --- dlls/comctl32/status.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 1cb69eb..43b65aa 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -207,6 +207,7 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART UINT border = BDR_SUNKENOUTER; HTHEME theme = GetWindowTheme (infoPtr->Self); int themePart = SP_PANE; + int x = 0; TRACE("part bound %s\n", wine_dbgstr_rect(&r)); if (part->style & SBT_POPOUT) @@ -224,6 +225,12 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART else DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); + if (part->hIcon) { + INT cy = r.bottom - r.top; + DrawIconEx (hdc, r.left + 2, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); + x = 2 + cy; + } + if (part->style & SBT_OWNERDRAW) { DRAWITEMSTRUCT dis; @@ -233,15 +240,9 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART dis.hDC = hdc; dis.rcItem = r; dis.itemData = (ULONG_PTR)part->text; - SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); + SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else { - if (part->hIcon) { - INT cy = r.bottom - r.top; - - r.left += 2; - DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); - r.left += cy; - } + r.left += x; DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); } }

1 0

Andrew Talbot : msxml3: Add a break to a switch statement.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 708f3a3fef3f4b06fb096549afeffe808cd2e37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=708f3a3fef3f4b06fb096549a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 17:51:38 2011 +0100 msxml3: Add a break to a switch statement. --- dlls/msxml3/domdoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2eedc78..144648e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1958,6 +1958,7 @@ static HRESULT WINAPI domdoc_createNode( case NODE_ENTITY_REFERENCE: case NODE_PROCESSING_INSTRUCTION: if (!name || *name == 0) return E_FAIL; + break; default: break; }

1 0