October 2008 - Wine-commits

Michael Stefaniuc : comctl32: DPA_GetPtr() returns a LPVOID so don' t cast its return value.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 165931314286f4043dc19031297127422d178d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=165931314286f4043dc190312… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 23 23:52:28 2008 +0200 comctl32: DPA_GetPtr() returns a LPVOID so don't cast its return value. --- dlls/comctl32/listview.c | 52 +++++++++++++++++++++++----------------------- dlls/comctl32/treeview.c | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 34e6208..55fb848 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2422,7 +2422,7 @@ static SUBITEM_INFO* LISTVIEW_GetSubItemPtr(HDPA hdpaSubItems, INT nSubItem) /* we should binary search here if need be */ for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++) { - lpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i); + lpSubItem = DPA_GetPtr(hdpaSubItems, i); if (lpSubItem->iSubItem == nSubItem) return lpSubItem; } @@ -2607,12 +2607,12 @@ static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line assert (ranges); assert (DPA_GetPtrCount(ranges->hdpa) >= 0); ranges_dump(ranges); - prev = (RANGE *)DPA_GetPtr(ranges->hdpa, 0); + prev = DPA_GetPtr(ranges->hdpa, 0); if (DPA_GetPtrCount(ranges->hdpa) > 0) assert (prev->lower >= 0 && prev->lower < prev->upper); for (i = 1; i < DPA_GetPtrCount(ranges->hdpa); i++) { - curr = (RANGE *)DPA_GetPtr(ranges->hdpa, i); + curr = DPA_GetPtr(ranges->hdpa, i); assert (prev->upper <= curr->lower); assert (curr->lower < curr->upper); prev = curr; @@ -3433,8 +3433,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } else { - HDPA hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); - lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); + HDPA hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); + lpItem = DPA_GetPtr(hdpaSubItems, 0); assert (lpItem); } @@ -3574,7 +3574,7 @@ static BOOL set_sub_item(const LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, if (!(lpLVItem->mask & (LVIF_TEXT | LVIF_IMAGE | LVIF_STATE))) return TRUE; /* get the subitem structure, and create it if not there */ - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); assert (hdpaSubItems); lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, lpLVItem->iSubItem); @@ -3588,7 +3588,7 @@ static BOOL set_sub_item(const LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, /* we could binary search here, if need be...*/ for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++) { - tmpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i); + tmpSubItem = DPA_GetPtr(hdpaSubItems, i); if (tmpSubItem->iSubItem > lpLVItem->iSubItem) break; } if (DPA_InsertPtr(hdpaSubItems, i, lpSubItem) == -1) @@ -4506,10 +4506,10 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) if (!bSuppress) notify_deleteitem(infoPtr, i); if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, i); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); for (j = 0; j < DPA_GetPtrCount(hdpaSubItems); j++) { - hdrItem = (ITEMHDR *)DPA_GetPtr(hdpaSubItems, j); + hdrItem = DPA_GetPtr(hdpaSubItems, j); if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText); Free(hdrItem); } @@ -4627,12 +4627,12 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) for (nItem = 0; nItem < infoPtr->nItemCount; nItem++) { - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, nItem); nSubItem = 0; lpDelItem = 0; for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++) { - lpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i); + lpSubItem = DPA_GetPtr(hdpaSubItems, i); if (lpSubItem->iSubItem == nColumn) { nSubItem = i; @@ -4789,7 +4789,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) hdpaSubItems = (HDPA)DPA_DeletePtr(infoPtr->hdpaItems, nItem); for (i = 0; i < DPA_GetPtrCount(hdpaSubItems); i++) { - hdrItem = (ITEMHDR *)DPA_GetPtr(hdpaSubItems, i); + hdrItem = DPA_GetPtr(hdpaSubItems, i); if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText); Free(hdrItem); } @@ -4851,8 +4851,8 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { - HDPA hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nEditLabelItem); - ITEM_INFO* lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); + HDPA hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nEditLabelItem); + ITEM_INFO* lpItem = DPA_GetPtr(hdpaSubItems, 0); if (lpItem && lpItem->hdr.pszText == LPSTR_TEXTCALLBACKW) { LISTVIEW_InvalidateItem(infoPtr, infoPtr->nEditLabelItem); @@ -5506,8 +5506,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* find the item and subitem structures before we proceed */ - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); - lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); + lpItem = DPA_GetPtr(hdpaSubItems, 0); assert (lpItem); if (isubitem) @@ -6449,8 +6449,8 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, */ static INT WINAPI LISTVIEW_InsertCompare( LPVOID first, LPVOID second, LPARAM lParam) { - ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 ); - ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 ); + ITEM_INFO* lv_first = DPA_GetPtr( (HDPA)first, 0 ); + ITEM_INFO* lv_second = DPA_GetPtr( (HDPA)second, 0 ); INT cmpv = textcmpWT(lv_first->hdr.pszText, lv_second->hdr.pszText, TRUE); /* if we're sorting descending, negate the return value */ @@ -6849,10 +6849,10 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, for (nItem = 0; nItem < infoPtr->nItemCount; nItem++) { - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, nItem); for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++) { - lpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i); + lpSubItem = DPA_GetPtr(hdpaSubItems, i); if (lpSubItem->iSubItem >= nNewColumn) lpSubItem->iSubItem++; } @@ -7731,8 +7731,8 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL fUnicode) static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; - ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 ); - ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 ); + ITEM_INFO* lv_first = DPA_GetPtr( (HDPA)first, 0 ); + ITEM_INFO* lv_second = DPA_GetPtr( (HDPA)second, 0 ); /* Forward the call to the client defined callback */ return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort ); @@ -7772,8 +7772,8 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, if (infoPtr->nFocusedItem >= 0) { - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); - lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); + lpItem = DPA_GetPtr(hdpaSubItems, 0); if (lpItem) lpItem->state |= LVIS_FOCUSED; } /* FIXME: go thorugh selected items and mark them so in lpItem->state */ @@ -7792,8 +7792,8 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, selectionMarkItem=(infoPtr->nSelectionMark>=0)?DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nSelectionMark):NULL; for (i=0; i < infoPtr->nItemCount; i++) { - hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, i); - lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); + lpItem = DPA_GetPtr(hdpaSubItems, 0); if (lpItem->state & LVIS_SELECTED) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ef3e137..2505042 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3010,8 +3010,8 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, HTREEITEM parent, /* The order of DPA entries has been changed, so fixup the * nextSibling and prevSibling pointers. */ - item = (HTREEITEM)DPA_GetPtr(sortList, count++); - while ((nextItem = (HTREEITEM)DPA_GetPtr(sortList, count++)) != NULL) + item = DPA_GetPtr(sortList, count++); + while ((nextItem = DPA_GetPtr(sortList, count++)) != NULL) { /* link the two current item together */ item->nextSibling = nextItem;

1 0

Michael Stefaniuc : comctl32: LockResource() returns a LPVOID so don' t cast its return value.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 6060ca94388c4b0089af6683570323c2aa7b0fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6060ca94388c4b0089af66835… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 23 23:52:45 2008 +0200 comctl32: LockResource() returns a LPVOID so don't cast its return value. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/propsheet.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 050a018..f21aa11 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -878,7 +878,7 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, hglb = LoadResource (hInstance, hRsrc); if (hglb == 0) return 0; - lpBitmap = (LPBITMAPINFOHEADER)LockResource (hglb); + lpBitmap = LockResource (hglb); if (lpBitmap == NULL) return 0; diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0499a83..b463dfd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -441,7 +441,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, (LPWSTR)RT_DIALOG); HGLOBAL hTemplate = LoadResource(lppsp->hInstance, hResource); - pTemplate = (LPDLGTEMPLATEW)LockResource(hTemplate); + pTemplate = LockResource(hTemplate); } else { @@ -450,7 +450,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, (LPSTR)RT_DIALOG); HGLOBAL hTemplate = LoadResource(lppsp->hInstance, hResource); - pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); + pTemplate = LockResource(hTemplate); } /* @@ -1412,7 +1412,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if(!hTemplate) return FALSE; - pTemplate = (LPDLGTEMPLATEW)LockResource(hTemplate); + pTemplate = LockResource(hTemplate); /* * Make a copy of the dialog template to make it writable */ @@ -1434,7 +1434,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if(!hTemplate) return FALSE; - pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); + pTemplate = LockResource(hTemplate); /* * Make a copy of the dialog template to make it writable */

1 0

Juan Lang : crypt32: Fix a failing test on Windows, and remove TODO_ERROR since Wine's implemenation already matches.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 92e88c3a9eeabf49c4a3b7f3147da4122bf87f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e88c3a9eeabf49c4a3b7f31… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 17:12:05 2008 -0700 crypt32: Fix a failing test on Windows, and remove TODO_ERROR since Wine's implemenation already matches. --- dlls/crypt32/tests/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index fc9768b..8133c1c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1539,7 +1539,8 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, TODO_ERROR }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_SIGNATURE_VALID, 0 }, + 1, simpleStatus12 }, 0 }, { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus13 },

1 0

Michael Stefaniuc : gdi32: Don' t cast the void pointer returned by GDI_GetObjPtr().
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 2d94915f27d0ddbd16114a011c5de1d400500070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d94915f27d0ddbd16114a011… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 23 23:51:07 2008 +0200 gdi32: Don't cast the void pointer returned by GDI_GetObjPtr(). --- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/enhmetafile.c | 6 +++--- dlls/gdi32/font.c | 2 +- dlls/gdi32/metafile.c | 4 ++-- dlls/gdi32/palette.c | 10 +++++----- dlls/gdi32/region.c | 30 +++++++++++++++--------------- dlls/gdi32/wing.c | 3 +-- 9 files changed, 35 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d94915f27d0ddbd16114…

1 0

Stefan Leichter : include: Fix prototype of SCardReleaseStartedEvent.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 6a262ac74f58a5147b511cb1d38fc511869cb946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a262ac74f58a5147b511cb1d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Oct 23 23:33:27 2008 +0200 include: Fix prototype of SCardReleaseStartedEvent. --- include/winscard.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winscard.h b/include/winscard.h index 8da8e7f..825e26d 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -129,7 +129,7 @@ LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPS #define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); LONG WINAPI SCardReleaseContext(SCARDCONTEXT); -void WINAPI SCardReleaseStartedEvent(void); +void WINAPI SCardReleaseStartedEvent(HANDLE); LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); #define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup)

1 0

Reece Dunn : include/mlang: Added a missing out attribute.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 7a1e7212059425756a067cb9829a630472d6c2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1e7212059425756a067cb98… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Oct 23 22:26:58 2008 +0100 include/mlang: Added a missing out attribute. --- include/mlang.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mlang.idl b/include/mlang.idl index 2b236c7..6f00734 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -36,7 +36,7 @@ interface IMLangCodePages : IUnknown { HRESULT GetCharCodePages( [in] WCHAR chSrc, - DWORD *pdwCodePages); + [out] DWORD *pdwCodePages); HRESULT GetStrCodePages( [in, size_is(cchSrc)] const WCHAR *pszSrc, [in] long cchSrc,

1 0

Jacek Caban : urlmon: Added IsLoggingEnabled[AW] stub implementation.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 2ef724113a1a80c7305a176625bd190bae346007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef724113a1a80c7305a17662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 23 16:19:27 2008 -0700 urlmon: Added IsLoggingEnabled[AW] stub implementation. --- dlls/urlmon/urlmon.spec | 4 ++-- dlls/urlmon/urlmon_main.c | 18 ++++++++++++++++++ include/urlmon.idl | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0f3c9c2..2001f0b 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -51,8 +51,8 @@ @ stub HlinkSimpleNavigateToMoniker @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) @ stdcall IsAsyncMoniker(ptr) -@ stub IsLoggingEnabledA -@ stub IsLoggingEnabledW +@ stdcall IsLoggingEnabledA(str) +@ stdcall IsLoggingEnabledW(wstr) @ stdcall IsValidURL(ptr wstr long) @ stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) @ stdcall ObtainUserAgentString(long str ptr) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index bc3de93..15944b6 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -767,3 +767,21 @@ HRESULT WINAPI Extract(void *dest, LPCSTR szCabName) return pExtract(dest, szCabName); } + +/*********************************************************************** + * IsLoggingEnabledA (URLMON.@) + */ +BOOL WINAPI IsLoggingEnabledA(LPCSTR url) +{ + FIXME("(%s)\n", debugstr_a(url)); + return FALSE; +} + +/*********************************************************************** + * IsLoggingEnabledW (URLMON.@) + */ +BOOL WINAPI IsLoggingEnabledW(LPCWSTR url) +{ + FIXME("(%s)\n", debugstr_w(url)); + return FALSE; +} diff --git a/include/urlmon.idl b/include/urlmon.idl index 5ac78f2..866f9a8 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1461,6 +1461,10 @@ cpp_quote("#define OInetCombineUrl CoInternetCombineUrl") cpp_quote("#define OInetCompareUrl CoInternetCompareUrl") cpp_quote("#define OInetGetSession CoInternetGetSession") +cpp_quote("BOOL WINAPI IsLoggingEnabledA(LPCSTR);") +cpp_quote("BOOL WINAPI IsLoggingEnabledW(LPCWSTR);") +cpp_quote("#define IsLoggingEnabled WINELIB_NAME_AW(IsLoggingEnabled)") + cpp_quote("#define MKSYS_URLMONIKER 6") cpp_quote("#define URL_MK_LEGACY 0") cpp_quote("#define URL_MK_UNIFORM 1")

1 0

Henri Verbeet : wined3d: Remove the SDKVersion parameter to WineDirect3DCreate().
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 7142754820ce0174776c45ee47af41cfa5ba807e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7142754820ce0174776c45ee4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 23 16:37:10 2008 +0200 wined3d: Remove the SDKVersion parameter to WineDirect3DCreate(). --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d9/d3d9_main.c | 2 +- dlls/ddraw/main.c | 2 +- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d_interface.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 56de60d..8e32dc3 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -53,7 +53,7 @@ IDirect3D8* WINAPI Direct3DCreate8(UINT SDKVersion) { object->lpVtbl = &Direct3D8_Vtbl; object->ref = 1; - object->WineD3D = WineDirect3DCreate(SDKVersion, 8, (IUnknown *)object); + object->WineD3D = WineDirect3DCreate(8, (IUnknown *)object); TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); LeaveCriticalSection(&d3d8_cs); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 03c75a4..40d73a5 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -48,7 +48,7 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { object->lpVtbl = &Direct3D9_Vtbl; object->ref = 1; EnterCriticalSection(&d3d9_cs); - object->WineD3D = WineDirect3DCreate(SDKVersion, 9, (IUnknown *)object); + object->WineD3D = WineDirect3DCreate(9, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 07c1708..21cd272 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -206,7 +206,7 @@ DDRAW_Create(const GUID *guid, * but DirectDraw specific management, like DDSURFACEDESC and DDPIXELFORMAT * structure handling is handled in this lib. */ - wineD3D = pWineDirect3DCreate(0 /* SDKVersion */, 7 /* DXVersion */, (IUnknown *) This /* Parent */); + wineD3D = pWineDirect3DCreate(7 /* DXVersion */, (IUnknown *) This /* Parent */); if(!wineD3D) { ERR("Failed to initialise WineD3D\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 355f7db..fa1d028 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,7 +48,7 @@ wined3d_settings_t wined3d_settings = FALSE /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ }; -IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *parent) { +IWineD3D* WINAPI WineDirect3DCreate(UINT dxVersion, IUnknown *parent) { IWineD3DImpl* object; if (!InitAdapters()) { diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3330ebc..79c94bc 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -343,7 +343,7 @@ DECLARE_INTERFACE_(IWineD3D, IWineD3DBase) #endif /* Define the main WineD3D entrypoint */ -IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *parent); +IWineD3D* WINAPI WineDirect3DCreate(UINT dxVersion, IUnknown *parent); /***************************************************************************** * IWineD3DDevice interface

1 0

Paul Vriens : shlwapi/tests: Fix failures on multiple platforms.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: c5866d369695902fd78833ab4d8e552d9d854678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5866d369695902fd78833ab4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 23 21:41:11 2008 +0200 shlwapi/tests: Fix failures on multiple platforms. --- dlls/shlwapi/tests/assoc.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index aa01814..872575e 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -40,29 +40,46 @@ static void test_getstring_bad(void) hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); - expect_hr(E_FAIL, hr); + ok(hr == E_FAIL || + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); - expect_hr(E_FAIL, hr); + ok(hr == E_FAIL || + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); - expect_hr(0x80070002, hr); /* NOT FOUND */ + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); - expect_hr(E_UNEXPECTED, hr); + ok(hr == E_UNEXPECTED || + hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); - expect_hr(E_FAIL, hr); + ok(hr == E_FAIL || + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); - expect_hr(E_FAIL, hr); + ok(hr == E_FAIL || + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); - expect_hr(0x80070002, hr); /* NOT FOUND */ + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || /* W2K/Vista/W2K8 */ + hr == E_FAIL, /* Win9x/WinMe/NT4 */ + "Unexpected result : %08x\n", hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); - expect_hr(E_UNEXPECTED, hr); + ok(hr == E_UNEXPECTED || + hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + "Unexpected result : %08x\n", hr); } static void test_getstring_basic(void)

1 0

Henri Verbeet : ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header .
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 99a50b5396a5369b94aa730116d18a5893c0b7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a50b5396a5369b94aa73011… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 23 16:37:10 2008 +0200 ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header. --- dlls/ddraw/ddraw_private.h | 3 +-- dlls/ddraw/main.c | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7ff3c5c..cd1ce15 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -414,8 +414,7 @@ struct IDirectDrawClipperImpl const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl; -typedef IWineD3DClipper* (WINAPI *fnWineDirect3DCreateClipper)(IUnknown *); -fnWineDirect3DCreateClipper pWineDirect3DCreateClipper; +typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper; /***************************************************************************** * IDirectDrawPalette implementation structure diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 9d882c6..07c1708 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -47,9 +47,7 @@ #include "ddraw_private.h" -typedef IWineD3D* (WINAPI *fnWineDirect3DCreate)(UINT, UINT, IUnknown *); - -static fnWineDirect3DCreate pWineDirect3DCreate; +static typeof(WineDirect3DCreate) *pWineDirect3DCreate; WINE_DEFAULT_DEBUG_CHANNEL(ddraw); @@ -88,8 +86,8 @@ BOOL LoadWineD3D(void) hWineD3D = LoadLibraryA("wined3d"); if (hWineD3D) { - pWineDirect3DCreate = (fnWineDirect3DCreate) GetProcAddress(hWineD3D, "WineDirect3DCreate"); - pWineDirect3DCreateClipper = (fnWineDirect3DCreateClipper) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper"); + pWineDirect3DCreate = (typeof(WineDirect3DCreate) *)GetProcAddress(hWineD3D, "WineDirect3DCreate"); + pWineDirect3DCreateClipper = (typeof(WineDirect3DCreateClipper) *) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper"); return TRUE; } }

1 0