August 2009 - Wine-commits - list.winehq.org

Juan Lang : wintrust: Implement WVTAsn1SpcSpOpusInfoDecode.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 598e0a8fcfcbb2669cc66111646b20dbdb1a15a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598e0a8fcfcbb2669cc661116… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 6 16:41:13 2009 -0700 wintrust: Implement WVTAsn1SpcSpOpusInfoDecode. --- dlls/wintrust/asn.c | 69 +++++++++++++++++++++++++++++++++++++++------ dlls/wintrust/tests/asn.c | 4 -- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index e776cba..ec5c4de 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2079,15 +2079,6 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentDecode(DWORD dwCertEncodingType, return ret; } -BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, - void *pvStructInfo, DWORD *pcbStructInfo) -{ - FIXME("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pvStructInfo, *pcbStructInfo); - return FALSE; -} - static BOOL WINAPI CRYPT_AsnDecodeBMPString(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) @@ -2126,6 +2117,66 @@ static BOOL WINAPI CRYPT_AsnDecodeBMPString(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnDecodeProgramName(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + DWORD dataLen; + + TRACE("(%p, %d, %08x, %p, %d)\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + ret = CRYPT_AsnDecodeBMPString(dwCertEncodingType, lpszStructType, + pbEncoded + 1 + lenBytes, dataLen, dwFlags, pvStructInfo, + pcbStructInfo); + } + return ret; +} + +BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_CONSTRUCTOR | ASN_CONTEXT, + offsetof(SPC_SP_OPUS_INFO, pwszProgramName), + CRYPT_AsnDecodeProgramName, sizeof(LPCWSTR), TRUE, TRUE, + offsetof(SPC_SP_OPUS_INFO, pwszProgramName), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, + offsetof(SPC_SP_OPUS_INFO, pMoreInfo), + CRYPT_AsnDecodeSPCLinkPointer, sizeof(PSPC_LINK), TRUE, TRUE, + offsetof(SPC_SP_OPUS_INFO, pMoreInfo), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 2, + offsetof(SPC_SP_OPUS_INFO, pPublisherInfo), + CRYPT_AsnDecodeSPCLinkPointer, sizeof(PSPC_LINK), TRUE, TRUE, + offsetof(SPC_SP_OPUS_INFO, pPublisherInfo), 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_AsnDecodeInteger(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index a4f4fbb..96bca50 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -878,7 +878,6 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -890,7 +889,6 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithProgramName, sizeof(spOpusInfoWithProgramName), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -903,7 +901,6 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithMoreInfo, sizeof(spOpusInfoWithMoreInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -922,7 +919,6 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithPublisherInfo, sizeof(spOpusInfoWithPublisherInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Nikolay Sivov : comctl32/treeview: Check passed handle value in WM_COMMAND handler.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 6bcdc69ec05e6929c9ac5d63fb4a5976301dd4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcdc69ec05e6929c9ac5d63f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Aug 7 00:13:25 2009 +0400 comctl32/treeview: Check passed handle value in WM_COMMAND handler. --- dlls/comctl32/tests/treeview.c | 16 ++++++++++++++++ dlls/comctl32/treeview.c | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 7c86450..5cfaf20 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -879,9 +879,25 @@ static void test_itemedit(void) /* item shouldn't be selected automatically after TVM_EDITLABEL */ r = SendMessage(hTree, TVM_GETITEMSTATE, (WPARAM)hRoot, TVIS_SELECTED); expect(0, r); + /* try to cancel with wrong edit handle */ + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)NULL); + expect(0, r); + ok(IsWindow(edit), "Expected edit control to be valid\n"); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); ok(!IsWindow(edit), "Expected edit control to be destroyed\n"); + /* try to cancel without creating edit */ + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)NULL); + expect(0, r); + + /* try to cancel with wrong (not null) handle */ + edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hTree); + expect(0, r); + ok(IsWindow(edit), "Expected edit control to be valid\n"); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); /* remove selection after starting edit */ r = TreeView_SelectItem(hTree, hRoot); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 44bb841..a38434d 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3651,8 +3651,11 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) break; } case EN_KILLFOCUS: - TREEVIEW_EndEditLabelNow(infoPtr, FALSE); - break; + /* apparently we should respect passed handle value */ + if (infoPtr->hwndEdit != (HWND)lParam) return FALSE; + + TREEVIEW_EndEditLabelNow(infoPtr, FALSE); + break; default: return SendMessageW(infoPtr->hwndNotify, WM_COMMAND, wParam, lParam);

1 0

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

07 Aug '09

Module: wine Branch: master Commit: 99ec95e474eb2a9247b102bea017dbf3a5cef7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ec95e474eb2a9247b102bea… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 6 21:14:15 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 6ef3502..4554fb0 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -35,6 +35,7 @@ STRINGTABLE DISCARDABLE IDS_SEMICOLON "« ; » attendu" IDS_LBRACKET "« ( » attendu" IDS_RBRACKET "« ) » attendu" + IDS_UNTERMINATED_STR "Constante chaîne de caractères non clôturée" IDS_NOT_FUNC "Fonction attendue" IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" IDS_NOT_NUM "Nombre attendu"

1 0

Nikolay Sivov : comctl32/treeview: Use separate pointer for currently edited item.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 83c9cdb79768b7ba6ec7e08e581c24144085ecea URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c9cdb79768b7ba6ec7e08e5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Aug 7 00:10:30 2009 +0400 comctl32/treeview: Use separate pointer for currently edited item. --- dlls/comctl32/tests/treeview.c | 31 ++++++++++++++++- dlls/comctl32/treeview.c | 72 ++++++++++++++++++++++++--------------- 2 files changed, 74 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 252949f..7c86450 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -769,6 +769,7 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa } return 0; } + case TVN_ENDLABELEDIT: return TRUE; } } return 0; @@ -862,20 +863,48 @@ static void test_itemedit(void) { DWORD r; HWND edit; + TVITEMA item; + CHAR buff[2]; hTree = create_treeview_control(); fill_tree(hTree); + /* try with null item */ + edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)NULL); + ok(!IsWindow(edit), "Expected valid handle\n"); + /* trigger edit */ edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); /* item shouldn't be selected automatically after TVM_EDITLABEL */ r = SendMessage(hTree, TVM_GETITEMSTATE, (WPARAM)hRoot, TVIS_SELECTED); - todo_wine expect(0, r); + expect(0, r); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + ok(!IsWindow(edit), "Expected edit control to be destroyed\n"); + /* remove selection after starting edit */ + r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); + edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = TreeView_SelectItem(hTree, NULL); + expect(TRUE, r); + /* alter text */ + strncpy(buff, "x", sizeof(buff)/sizeof(CHAR)); + r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buff); + expect(TRUE, r); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); ok(!IsWindow(edit), "Expected edit control to be destroyed\n"); + /* check that text is saved */ + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buff; + item.cchTextMax = sizeof(buff)/sizeof(CHAR); + r = SendMessage(hTree, TVM_GETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + ok(!strcmp("x", buff), "Expected item text to change\n"); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 84a8c30..44bb841 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -119,6 +119,7 @@ typedef struct tagTREEVIEW_INFO HTREEITEM selectedItem; /* handle to selected item or 0 if none */ HTREEITEM hotItem; /* handle currently under cursor, 0 if none */ HTREEITEM focusedItem; /* item that was under the cursor when WM_LBUTTONDOWN was received */ + HTREEITEM editItem; /* item being edited with builtin edit box */ HTREEITEM firstVisible; /* handle to first visible item */ LONG maxVisibleOrder; @@ -3546,6 +3547,14 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE; break; + case WM_DESTROY: + { + WNDPROC editProc = infoPtr->wpEditOrig; + infoPtr->wpEditOrig = 0; + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (DWORD_PTR)editProc); + return CallWindowProcW(editProc, hwnd, uMsg, wParam, lParam); + } + case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTALLKEYS; @@ -3581,7 +3590,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - TRACE("%lx %ld\n", wParam, lParam); + TRACE("code=%x, id=%x, handle=%lx\n", HIWORD(wParam), LOWORD(wParam), lParam); switch (HIWORD(wParam)) { @@ -3591,11 +3600,15 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * Adjust the edit window size */ WCHAR buffer[1024]; - TREEVIEW_ITEM *editItem = infoPtr->selectedItem; + TREEVIEW_ITEM *editItem = infoPtr->editItem; HDC hdc = GetDC(infoPtr->hwndEdit); SIZE sz; HFONT hFont, hOldFont = 0; + TRACE("edit=%p\n", infoPtr->hwndEdit); + + if (!IsWindow(infoPtr->hwndEdit) || !hdc) return FALSE; + infoPtr->bLabelChanged = TRUE; GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); @@ -3654,7 +3667,6 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) HWND hwnd = infoPtr->hwnd; HWND hwndEdit; SIZE sz; - TREEVIEW_ITEM *editItem = hItem; HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); HDC hdc; HFONT hOldFont=0; @@ -3662,7 +3674,7 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) static const WCHAR EditW[] = {'E','d','i','t',0}; TRACE("%p %p\n", hwnd, hItem); - if (!TREEVIEW_ValidItem(infoPtr, editItem)) + if (!TREEVIEW_ValidItem(infoPtr, hItem)) return NULL; if (infoPtr->hwndEdit) @@ -3670,11 +3682,10 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) infoPtr->bLabelChanged = FALSE; - /* Make sure that edit item is selected */ - TREEVIEW_DoSelectItem(infoPtr, TVGN_CARET, hItem, TVC_UNKNOWN); + /* make edit item visible */ TREEVIEW_EnsureVisible(infoPtr, hItem, TRUE); - TREEVIEW_UpdateDispInfo(infoPtr, editItem, TVIF_TEXT); + TREEVIEW_UpdateDispInfo(infoPtr, hItem, TVIF_TEXT); hdc = GetDC(hwnd); /* Select the font to get appropriate metric dimensions */ @@ -3684,8 +3695,8 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) } /* Get string length in pixels */ - if (editItem->pszText) - GetTextExtentPoint32W(hdc, editItem->pszText, strlenW(editItem->pszText), + if (hItem->pszText) + GetTextExtentPoint32W(hdc, hItem->pszText, strlenW(hItem->pszText), &sz); else GetTextExtentPoint32A(hdc, "", 0, &sz); @@ -3695,7 +3706,7 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) sz.cx += (textMetric.tmMaxCharWidth * 2); sz.cx = max(sz.cx, textMetric.tmMaxCharWidth * 3); - sz.cx = min(sz.cx, infoPtr->clientWidth - editItem->textOffset + 2); + sz.cx = min(sz.cx, infoPtr->clientWidth - hItem->textOffset + 2); if (infoPtr->hFont != 0) { @@ -3703,15 +3714,18 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) } ReleaseDC(hwnd, hdc); + + infoPtr->editItem = hItem; + hwndEdit = CreateWindowExW(WS_EX_LEFT, EditW, 0, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL | WS_CLIPSIBLINGS | ES_WANTRETURN | - ES_LEFT, editItem->textOffset - 2, - editItem->rect.top - 1, sz.cx + 3, - editItem->rect.bottom - - editItem->rect.top + 3, hwnd, 0, hinst, 0); + ES_LEFT, hItem->textOffset - 2, + hItem->rect.top - 1, sz.cx + 3, + hItem->rect.bottom - + hItem->rect.top + 3, hwnd, 0, hinst, 0); /* FIXME: (HMENU)IDTVEDIT,pcs->hInstance,0); */ infoPtr->hwndEdit = hwndEdit; @@ -3723,23 +3737,22 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) GetWindowLongW(hwndEdit, GWL_STYLE) | WS_BORDER); SendMessageW(hwndEdit, WM_SETFONT, - (WPARAM)TREEVIEW_FontForItem(infoPtr, editItem), FALSE); + (WPARAM)TREEVIEW_FontForItem(infoPtr, hItem), FALSE); infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (DWORD_PTR) TREEVIEW_Edit_SubclassProc); - if (TREEVIEW_BeginLabelEditNotify(infoPtr, editItem)) + if (TREEVIEW_BeginLabelEditNotify(infoPtr, hItem)) { DestroyWindow(hwndEdit); infoPtr->hwndEdit = 0; + infoPtr->editItem = NULL; return NULL; } - infoPtr->selectedItem = hItem; - - if (editItem->pszText) - SetWindowTextW(hwndEdit, editItem->pszText); + if (hItem->pszText) + SetWindowTextW(hwndEdit, hItem->pszText); SetFocus(hwndEdit); SendMessageW(hwndEdit, EM_SETSEL, 0, -1); @@ -3753,7 +3766,7 @@ static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { HWND hwnd = infoPtr->hwnd; - TREEVIEW_ITEM *editedItem = infoPtr->selectedItem; + TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; WCHAR tmpText[1024] = { '\0' }; @@ -3813,6 +3826,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if(newText != tmpText) Free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; + infoPtr->editItem = NULL; return FALSE; } else @@ -3829,6 +3843,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) ShowWindow(infoPtr->hwndEdit, SW_HIDE); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; + infoPtr->editItem = NULL; return TRUE; } @@ -4942,13 +4957,14 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->treeHeight = 0; infoPtr->uIndent = MINIMUM_INDENT; - infoPtr->selectedItem = 0; - infoPtr->focusedItem = 0; - infoPtr->hotItem = 0; - infoPtr->firstVisible = 0; + infoPtr->selectedItem = NULL; + infoPtr->focusedItem = NULL; + infoPtr->hotItem = NULL; + infoPtr->editItem = NULL; + infoPtr->firstVisible = NULL; infoPtr->maxVisibleOrder = 0; - infoPtr->dropItem = 0; - infoPtr->insertMarkItem = 0; + infoPtr->dropItem = NULL; + infoPtr->insertMarkItem = NULL; infoPtr->insertBeforeorAfter = 0; /* dragList */ @@ -4961,7 +4977,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* hwndToolTip */ - infoPtr->hwndEdit = 0; + infoPtr->hwndEdit = NULL; infoPtr->wpEditOrig = NULL; infoPtr->bIgnoreEditKillFocus = FALSE; infoPtr->bLabelChanged = FALSE;

1 0

Alexander Nicolaysen Sørnes : note: Prevent link creation for version notes
by Alexander Nicolaysen Sørnes 07 Aug '09

07 Aug '09

Module: appdb Branch: master Commit: f459f341b45fcc949d7def6ce97c81038b15d841 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f459f341b45fcc949d7def6c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 7 15:24:41 2009 +0200 note: Prevent link creation for version notes --- include/note.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/note.php b/include/note.php index ae4032d..b88727b 100644 --- a/include/note.php +++ b/include/note.php @@ -610,11 +610,13 @@ class Note { { $this->aNoteLinks = $this->getNoteLinksFromInput($aValues); + // There's no need to use links if the note is only shown for one version if(sizeof($this->aNoteLinks) == 1) { $oLink = $this->aNoteLinks[0]; $this->iVersionId = $oLink->objectGetParent('version'); $this->iAppId = 0; + $this->aNoteLinks = array(); } }

1 0

Maik Schulz : Website: German translation of Scott's changes
by Maik Schulz 07 Aug '09

07 Aug '09

Module: website Branch: master Commit: 9a91aa5a0475f004369e85f468fd16805d543d15 URL: http://source.winehq.org/git/website.git/?a=commit;h=9a91aa5a0475f004369e85… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Fri Aug 7 10:26:29 2009 +0200 Website: German translation of Scott's changes --- templates/de/about.template | 4 ++-- templates/de/devel.template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 3a89d7f..1838fae 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -7,13 +7,13 @@ <p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="http://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender</a> nutzen Wine, um ihre Programme zu verwenden.</p> -<h2>Open Source und benutzergetrieben</h2> +<h3>Open Source und benutzergetrieben</h3> <p>Wine wird immer <a href="" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> <p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> zur Dokumentation davon, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> -<h2>Erfahre mehr:</h2> +<h3>Erfahre mehr:</h3> <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen entlarvt (en)</a></li> diff --git a/templates/de/devel.template b/templates/de/devel.template index 41542bf..d6e9f21 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -99,7 +99,7 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/fun_projects">Spaß-Projekte</a> + <a href="http://wiki.winehq.org/Fun_Projects">Spaß-Projekte</a> </td> <td valign="top"> Ein weiterer Aufgabenbereich. Diese haben eine niedrigere Priorität und sollten eher als Nebenprojekte

1 0

Alexander Nicolaysen Sørnes : downloadurl: Fix objectSetParent() on objects with versionId = 0
by Alexander Nicolaysen Sørnes 06 Aug '09

06 Aug '09

Module: appdb Branch: master Commit: 63762543dc080e5216b4ee966d44c9b2a4aab28b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=63762543dc080e5216b4ee96… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 6 18:49:20 2009 +0200 downloadurl: Fix objectSetParent() on objects with versionId = 0 --- include/downloadurl.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 9883fc0..d4d4b03 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -71,7 +71,7 @@ class downloadurl public function objectSetParent($iNewId, $sClass = '') { - if($this->iVersionId) + if($this->iVersionId || !$this->iAppId) $this->iVersionId = $iNewId; else $this->iAppId = $iNewId;

1 0

Alexander Nicolaysen Sørnes : version: Properly merge arrays in objectGetChildren()
by Alexander Nicolaysen Sørnes 06 Aug '09

06 Aug '09

Module: appdb Branch: master Commit: 19c34f5f2e0d89822d8f65415e41c904a17c14a5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=19c34f5f2e0d89822d8f6541… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 6 18:40:20 2009 +0200 version: Properly merge arrays in objectGetChildren() --- include/version.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/version.php b/include/version.php index acf2764..6af2864 100644 --- a/include/version.php +++ b/include/version.php @@ -1727,7 +1727,7 @@ class version { foreach($this->getTestResults($bIncludeDeleted) as $oTest) { if($bRecursive) - $aChildren += $oTest->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oTest->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oTest; } @@ -1743,7 +1743,7 @@ class version { $oMaintainer = new maintainer(0, $oRow); if($bRecursive) - $aChildren += $oMaintainer->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oMaintainer->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oMaintainer; } @@ -1759,7 +1759,7 @@ class version { $oMonitor = new monitor(0, $oRow); if($bRecursive) - $aChildren += $oMonitor->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oMonitor->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oMonitor; } @@ -1791,7 +1791,7 @@ class version { $oScreenshot = new screenshot(0, $oRow); if($bRecursive) - $aChildren += $oScreenshot->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oScreenshot->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oScreenshot; } @@ -1801,7 +1801,7 @@ class version { $oBug = new bug($iBugId); if($bRecursive) - $aChildren += $oBug->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oBug->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oBug; } @@ -1832,7 +1832,7 @@ class version { $oUrl = new url(0, $oRow); if($bRecursive) - $aChildren += $oUrl->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oUrl->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oUrl; } @@ -1848,12 +1848,12 @@ class version { $oDownload = new downloadurl(0, $oRow); if($bRecursive) - $aChildren += $oDownload->objectGetChildren($bIncludeDeleted); + $aChildren = array_merge($aChildren, $oDownload->objectGetChildren($bIncludeDeleted)); $aChildren[] = $oDownload; } /* Get votes, include deleted ones */ - $aChildren += vote::getVotesForVersion($this->iVersionId); + $aChildren = array_merge($aChildren, vote::getVotesForVersion($this->iVersionId)); return $aChildren; }

1 0

Alexander Nicolaysen Sørnes : note: Allow showing notes for a list of versions
by Alexander Nicolaysen Sørnes 06 Aug '09

06 Aug '09

Module: appdb Branch: master Commit: 68b9a2b69e9341086f37407fe6775b838b446c8f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=68b9a2b69e9341086f37407f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Aug 6 02:02:36 2009 +0200 note: Allow showing notes for a list of versions --- include/html.php | 32 ++++++ include/note.php | 279 +++++++++++++++++++++++++++++++++++++++++++++-- include/version.php | 6 +- tables/appdb_tables.sql | 1 + 4 files changed, 307 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=68b9a2b69e9341086f37…

1 0

Huw Davies : include: Add correct structure packing.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 760d2b652f547fe3861d5fa30fcbf219beab69da URL: http://source.winehq.org/git/wine.git/?a=commit;h=760d2b652f547fe3861d5fa30… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 6 14:39:17 2009 +0100 include: Add correct structure packing. --- include/oledb.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/oledb.idl b/include/oledb.idl index 31e2111..b973bb9 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -15,6 +15,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +cpp_quote("#ifdef _WIN64") +cpp_quote("#include <pshpack8.h>") +cpp_quote("#else") +cpp_quote("#include <pshpack2.h>") +cpp_quote("#endif") +cpp_quote("") import "wtypes.idl"; import "oaidl.idl"; @@ -36,3 +42,6 @@ typedef ULONG DBCOUNTITEM; #include "opnrst.idl" #include "binres.idl" #include "crtrow.idl" + +cpp_quote("#include <poppack.h>") +cpp_quote("")

1 0