November 2010 - Wine-Commits

Juan Lang : crypt32: Add CertFindChainInStore stub.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 107a95d86bffdf8a9519bff5af9c3b82f32a7aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107a95d86bffdf8a9519bff5a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 15 11:26:01 2010 -0800 crypt32: Add CertFindChainInStore stub. --- dlls/crypt32/chain.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index fa739fe..1fb368b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2901,6 +2901,15 @@ VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) } } +PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE store, + DWORD certEncodingType, DWORD findFlags, DWORD findType, + const void *findPara, PCCERT_CHAIN_CONTEXT prevChainContext) +{ + FIXME("(%p, %08x, %08x, %d, %p, %p): stub\n", store, certEncodingType, + findFlags, findType, findPara, prevChainContext); + return NULL; +} + static void find_element_with_error(PCCERT_CHAIN_CONTEXT chain, DWORD error, LONG *iChain, LONG *iElement) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index d9cd9a8..dedcb4f 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -40,6 +40,7 @@ @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) +@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindCRLInStore(ptr long long long ptr ptr) @ stdcall CertFindCTLInStore(ptr long long long ptr ptr) @ stdcall CertFindCertificateInStore(ptr long long long ptr ptr)

1 0

Alexandre Julliard : user32: Add a stub for IsGUIThread().
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 14a77db43f242c2acacc910a868fcc23bee49911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a77db43f242c2acacc910a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 21:01:08 2010 +0100 user32: Add a stub for IsGUIThread(). --- dlls/user32/message.c | 10 ++++++++++ dlls/user32/user32.spec | 2 +- include/winuser.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c6daf31..93a90ea 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4230,6 +4230,16 @@ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id ) /********************************************************************** + * IsGUIThread (USER32.@) + */ +BOOL WINAPI IsGUIThread( BOOL convert ) +{ + FIXME( "%u: stub\n", convert ); + return TRUE; +} + + +/********************************************************************** * GetGUIThreadInfo (USER32.@) */ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 072fed4..5eb7154 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -436,7 +436,7 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -# @ stub IsGUIThread +@ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) diff --git a/include/winuser.h b/include/winuser.h index 154c8da..83c99cb 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4814,6 +4814,7 @@ WINUSERAPI BOOL WINAPI IsDialogMessageA(HWND,LPMSG); WINUSERAPI BOOL WINAPI IsDialogMessageW(HWND,LPMSG); #define IsDialogMessage WINELIB_NAME_AW(IsDialogMessage) WINUSERAPI UINT WINAPI IsDlgButtonChecked(HWND,int); +WINUSERAPI BOOL WINAPI IsGUIThread(BOOL); WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU);

1 0

Nikolay Sivov : comctl32/listview: Use a code set by dispinfo holder to convert data encoding after LVN_GETDISPINFO .
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 119860b05f8c22d1525b573e461afe95e430a63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=119860b05f8c22d1525b573e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 16 23:55:23 2010 +0300 comctl32/listview: Use a code set by dispinfo holder to convert data encoding after LVN_GETDISPINFO. --- dlls/comctl32/listview.c | 130 ++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 41 +++++++++++++ 2 files changed, 121 insertions(+), 50 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6c4165d..fd9a499 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -928,74 +928,104 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) Send notification. depends on dispinfoW having same structure as dispinfoA. infoPtr : listview struct - notificationCode : *Unicode* notification code + code : *Unicode* notification code pdi : dispinfo structure (can be unicode or ansi) isW : TRUE if dispinfo is Unicode */ -static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW) +static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISPINFOW pdi, BOOL isW) { - BOOL bResult = FALSE; - BOOL convertToAnsi = FALSE, convertToUnicode = FALSE; - INT cchTempBufMax = 0, savCchTextMax = 0; - UINT realNotifCode; - LPWSTR pszTempBuf = NULL, savPszText = NULL; + INT length = 0, ret_length; + LPWSTR buffer = NULL, ret_text; + BOOL return_ansi = FALSE; + BOOL return_unicode = FALSE; + BOOL ret; if ((pdi->item.mask & LVIF_TEXT) && is_text(pdi->item.pszText)) { - convertToAnsi = (isW && infoPtr->notifyFormat == NFR_ANSI); - convertToUnicode = (!isW && infoPtr->notifyFormat == NFR_UNICODE); + return_unicode = ( isW && infoPtr->notifyFormat == NFR_ANSI); + return_ansi = (!isW && infoPtr->notifyFormat == NFR_UNICODE); } - if (convertToAnsi || convertToUnicode) + ret_length = pdi->item.cchTextMax; + ret_text = pdi->item.pszText; + + if (return_unicode || return_ansi) { - if (notificationCode != LVN_GETDISPINFOW) - { - cchTempBufMax = convertToUnicode ? + if (code != LVN_GETDISPINFOW) + { + length = return_ansi ? MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, NULL, 0): WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); - } - else - { - cchTempBufMax = pdi->item.cchTextMax; - *pdi->item.pszText = 0; /* make sure we don't process garbage */ - } - - pszTempBuf = Alloc( (convertToUnicode ? sizeof(WCHAR) : sizeof(CHAR)) * cchTempBufMax); - if (!pszTempBuf) return FALSE; - - if (convertToUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, - pszTempBuf, cchTempBufMax); - else - WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) pszTempBuf, - cchTempBufMax, NULL, NULL); + } + else + { + length = pdi->item.cchTextMax; + *pdi->item.pszText = 0; /* make sure we don't process garbage */ + } - savCchTextMax = pdi->item.cchTextMax; - savPszText = pdi->item.pszText; - pdi->item.pszText = pszTempBuf; - pdi->item.cchTextMax = cchTempBufMax; + buffer = Alloc( (return_ansi ? sizeof(WCHAR) : sizeof(CHAR)) * length); + if (!buffer) return FALSE; + + if (return_ansi) + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, + buffer, length); + else + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) buffer, + length, NULL, NULL); + + pdi->item.pszText = buffer; + pdi->item.cchTextMax = length; } if (infoPtr->notifyFormat == NFR_ANSI) - realNotifCode = get_ansi_notification(notificationCode); - else - realNotifCode = notificationCode; + code = get_ansi_notification(code); + TRACE(" pdi->item=%s\n", debuglvitem_t(&pdi->item, infoPtr->notifyFormat != NFR_ANSI)); - bResult = notify_hdr(infoPtr, realNotifCode, &pdi->hdr); + ret = notify_hdr(infoPtr, code, &pdi->hdr); + TRACE(" resulting code=0x%08x\n", pdi->hdr.code); - if (convertToUnicode || convertToAnsi) + if (return_ansi || return_unicode) { - if (convertToUnicode) /* note : pointer can be changed by app ! */ - WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) savPszText, - savCchTextMax, NULL, NULL); - else - MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1, - savPszText, savCchTextMax); - pdi->item.pszText = savPszText; /* restores our buffer */ - pdi->item.cchTextMax = savCchTextMax; - Free (pszTempBuf); + if (return_ansi && (pdi->hdr.code == LVN_GETDISPINFOA)) + { + strcpy((char*)ret_text, (char*)pdi->item.pszText); + } + else if (return_unicode && (pdi->hdr.code == LVN_GETDISPINFOW)) + { + strcpyW(ret_text, pdi->item.pszText); + } + else if (return_ansi) /* note : pointer can be changed by app ! */ + { + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) ret_text, + ret_length, NULL, NULL); + } + else + MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1, + ret_text, ret_length); + + pdi->item.pszText = ret_text; /* restores our buffer */ + pdi->item.cchTextMax = ret_length; + + Free(buffer); + return ret; } - return bResult; + + /* if dipsinfo holder changed notification code then convert */ + if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW)) + { + length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); + + buffer = Alloc(length * sizeof(CHAR)); + if (!buffer) return FALSE; + + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) buffer, + ret_length, NULL, NULL); + + strcpy((LPSTR)pdi->item.pszText, (LPSTR)buffer); + Free(buffer); + } + + return ret; } static void customdraw_fill(NMLVCUSTOMDRAW *lpnmlvcd, const LISTVIEW_INFO *infoPtr, HDC hdc, @@ -6490,7 +6520,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, if (lpLVItem->mask & LVIF_STATE) dispInfo.item.stateMask = lpLVItem->stateMask & infoPtr->uCallbackMask; /* could be zeroed on LVIF_NORECOMPUTE case */ - if (dispInfo.item.mask != 0) + if (dispInfo.item.mask) { notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); dispInfo.item.stateMask = lpLVItem->stateMask; @@ -6596,7 +6626,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* If we don't have all the requested info, query the application */ - if (dispInfo.item.mask != 0) + if (dispInfo.item.mask) { dispInfo.item.iItem = lpLVItem->iItem; dispInfo.item.iSubItem = lpLVItem->iSubItem; /* yes: the original subitem */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0223167..89619f7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -59,6 +59,8 @@ static INT notifyFormat; static BOOL g_is_below_5; /* item data passed to LVN_GETDISPINFOA */ static LVITEMA g_itema; +/* alter notification code A->W */ +static BOOL g_disp_A_to_W; static HWND subclass_editbox(HWND hwndListview); @@ -372,6 +374,13 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP { NMLVDISPINFOA *dispinfo = (NMLVDISPINFOA*)lParam; g_itema = dispinfo->item; + + if (g_disp_A_to_W && (dispinfo->item.mask & LVIF_TEXT)) + { + static const WCHAR testW[] = {'T','E','S','T',0}; + dispinfo->hdr.code = LVN_GETDISPINFOW; + memcpy(dispinfo->item.pszText, testW, sizeof(testW)); + } } break; case NM_HOVER: @@ -4538,6 +4547,37 @@ static void test_createdragimage(void) DestroyWindow(list); } +static void test_dispinfo(void) +{ + static const char testA[] = "TEST"; + WCHAR buff[10]; + LVITEMA item; + HWND hwnd; + INT ret; + + hwnd = create_listview_control(LVS_ICON); + ok(hwnd != 0, "failed to create listview window\n"); + + insert_item(hwnd, 0); + + memset(&item, 0, sizeof(item)); + item.pszText = LPSTR_TEXTCALLBACKA; + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + g_disp_A_to_W = TRUE; + item.pszText = (char*)buff; + item.cchTextMax = sizeof(buff)/sizeof(WCHAR); + ret = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + ok(ret == sizeof(testA)-1, "got %d, expected 4\n", ret); + g_disp_A_to_W = FALSE; + + ok(memcmp(item.pszText, testA, sizeof(testA)) == 0, + "got %s, expected %s\n", item.pszText, testA); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4601,6 +4641,7 @@ START_TEST(listview) test_hover(); test_destroynotify(); test_createdragimage(); + test_dispinfo(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Hans Leidekker : winspool.drv: Return success from the AddPrintProcessorW stub.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: b8d0c0dcc70dc06674c9b0f42230357c736359f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d0c0dcc70dc06674c9b0f42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:50 2010 +0100 winspool.drv: Return success from the AddPrintProcessorW stub. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4ffe092..3076572 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4666,7 +4666,7 @@ BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPathNa { FIXME("(%s,%s,%s,%s): stub\n", debugstr_w(pName), debugstr_w(pEnvironment), debugstr_w(pPathName), debugstr_w(pPrintProcessorName)); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

André Hentschel : include: Define SIO_SET_COMPATIBILITY_MODE.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: b45454c155a1a35caa987f08188a1f8069f7e7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45454c155a1a35caa987f081… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 14 20:40:33 2010 +0100 include: Define SIO_SET_COMPATIBILITY_MODE. --- include/mswsock.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 322ab20..1447a8d 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -84,8 +84,10 @@ extern "C" { #ifndef USE_WS_PREFIX #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) +#define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #else #define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Henri Verbeet : d3d9: Fix some return values.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 06581b45136307b620e4100162104d82c55d6ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06581b45136307b620e410016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:30 2010 +0100 d3d9: Fix some return values. --- dlls/d3d9/device.c | 39 ++++++++++++++++++++------------------- dlls/d3d9/surface.c | 5 +++-- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c2aa99..d453350 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -420,9 +420,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", iface, XHotSpot, YHotSpot, pCursorBitmap); - if(!pCursorBitmap) { - WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if (!pCursorBitmap) + { + WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); @@ -616,7 +617,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDE This->notreset = TRUE; wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; + return D3DERR_INVALIDCALL; } localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; @@ -2717,7 +2718,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(IDirect3DD FIXME("iface %p, width %u, height %u, rows %p, columns %p stub!\n", iface, width, height, rows, columns); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *iface, @@ -2729,7 +2730,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *if iface, src_surface, dst_surface, src_descs, rect_count, dst_descs, operation, offset_x, offset_y); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface, @@ -2739,28 +2740,28 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface FIXME("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x stub!\n", iface, src_rect, dst_rect, dst_window_override, dirty_region, flags); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority) { FIXME("iface %p, priority %p stub!\n", iface, priority); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_SetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT priority) { FIXME("iface %p, priority %d stub!\n", iface, priority); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(IDirect3DDevice9Ex *iface, UINT swapchain_idx) { FIXME("iface %p, swapchain_idx %u stub!\n", iface, swapchain_idx); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDevice9Ex *iface, @@ -2769,14 +2770,14 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDev FIXME("iface %p, resources %p, resource_count %u stub!\n", iface, resources, resource_count); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) @@ -2785,7 +2786,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDev *max_latency = 2; - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) @@ -2797,7 +2798,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex if (!i++) FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); - return WINED3D_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevice9Ex *iface, @@ -2809,7 +2810,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevic iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, @@ -2819,7 +2820,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDire FIXME("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p, usage %#x stub!\n", iface, width, height, format, pool, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex *iface, @@ -2831,7 +2832,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, @@ -2839,7 +2840,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, { FIXME("iface %p, present_parameters %p, mode %p stub!\n", iface, present_parameters, mode); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9Ex *iface, @@ -2847,7 +2848,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9 { FIXME("iface %p, swapchain_idx %u, mode %p, rotation %p stub!\n", iface, swapchain_idx, mode, rotation); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static const IDirect3DDevice9ExVtbl Direct3DDevice9_Vtbl = diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 76c5e98..6601530 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -325,8 +325,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, hr = IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); wined3d_mutex_unlock(); - switch(hr) { - case WINEDDERR_NODC: return WINED3DERR_INVALIDCALL; + switch (hr) + { + case WINEDDERR_NODC: return D3DERR_INVALIDCALL; default: return hr; } }

1 0

Piotr Caban : shell32: Added partial implementation of SHPropStgWriteMultiple.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: b490803b37c8e0ef781914ee2c448ae05ba20154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b490803b37c8e0ef781914ee2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:22 2010 +0100 shell32: Added partial implementation of SHPropStgWriteMultiple. --- dlls/shell32/shellole.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 5168e38..d678276 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -752,6 +752,37 @@ HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) { - FIXME("stub\n"); - return E_NOTIMPL; + STATPROPSETSTG stat; + UINT codepage; + HRESULT hres; + + FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); + + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) + return hres; + + if(uCodePage && *uCodePage) + codepage = *uCodePage; + else { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres)) + return hres; + if(ret.vt!=VT_I2 || !ret.u.iVal) + return E_FAIL; + + codepage = ret.u.iVal; + if(uCodePage) + *uCodePage = codepage; + } + + /* TODO: do something with codepage and stat */ + + hres = IPropertyStorage_WriteMultiple(pps, cpspec, rgpspec, rgvar, propidNameFirst); + return hres; }

1 0

Piotr Caban : shell32: Added partial implementation of SHPropStgReadMultiple.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: c148c0419d3acd481cb84172412a2226909c9f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c148c0419d3acd481cb841724… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:13 2010 +0100 shell32: Added partial implementation of SHPropStgReadMultiple. --- dlls/shell32/shellole.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 0949647..5168e38 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -715,8 +715,35 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) { - FIXME("stub\n"); - return E_NOTIMPL; + STATPROPSETSTG stat; + HRESULT hres; + + FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); + + memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); + hres = IPropertyStorage_ReadMultiple(pps, cpspec, rgpspec, rgvar); + if(FAILED(hres)) + return hres; + + if(!uCodePage) { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + return S_OK; + + uCodePage = ret.u.iVal; + } + + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) + return S_OK; + + /* TODO: do something with codepage and stat */ + return S_OK; } /*************************************************************************

1 0

Piotr Caban : shell32/tests: Added SHPropStg* tests.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: b1c1ace81ac29260700b0f936d19b30a6584f6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c1ace81ac29260700b0f936… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 15:49:47 2010 +0100 shell32/tests: Added SHPropStg* tests. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/shellole.c | 437 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 438 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1c1ace81ac29260700b0…

1 0

Henri Verbeet : wined3d: Remove a redundant flag in IWineD3DSurfaceImpl_SetMem().
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 4dc28005eb94da48a1bf01702b372e05aa802f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc28005eb94da48a1bf01702… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:28 2010 +0100 wined3d: Remove a redundant flag in IWineD3DSurfaceImpl_SetMem(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 69a9efd..fa715b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2612,7 +2612,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M This->resource.heapMemory = NULL; } This->resource.allocatedMemory = Mem; - This->flags |= SFLAG_USERPTR | SFLAG_INSYSMEM; + This->flags |= SFLAG_USERPTR; /* Now the surface memory is most up do date. Invalidate drawable and texture */ surface_modify_location(This, SFLAG_INSYSMEM, TRUE);

1 0