May 2012 - Wine-commits - list.winehq.org

Piotr Caban : user32: Added GetMenuBarInfo implementation.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: cd08b5a40abfe33bae339d4514d3611a0abf7648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd08b5a40abfe33bae339d451… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 16 13:36:31 2012 +0200 user32: Added GetMenuBarInfo implementation. --- dlls/user32/menu.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5f26477..b113143 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3304,6 +3304,7 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) * but there are some bugs left that need to be fixed in this case. */ if ((menu = MENU_GetMenu( hMenu ))) menu->hWnd = hWnd; + if (!top_popup) top_popup_hmenu = hMenu; /* Send WM_ENTERMENULOOP and WM_INITMENU message only if TPM_NONOTIFY flag is not specified */ if (!(wFlags & TPM_NONOTIFY)) @@ -4182,8 +4183,86 @@ HMENU WINAPI GetMenu( HWND hWnd ) */ BOOL WINAPI GetMenuBarInfo( HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO pmbi ) { - FIXME( "(%p,0x%08x,0x%08x,%p)\n", hwnd, idObject, idItem, pmbi ); - return FALSE; + POPUPMENU *menu; + HMENU hmenu = NULL; + ATOM class_atom; + + TRACE( "(%p,0x%08x,0x%08x,%p)\n", hwnd, idObject, idItem, pmbi ); + + switch (idObject) + { + case OBJID_CLIENT: + class_atom = GetClassLongW(hwnd, GCW_ATOM); + if (!class_atom) + return FALSE; + if (class_atom != POPUPMENU_CLASS_ATOM) + { + WARN("called on invalid window: %d\n", class_atom); + SetLastError(ERROR_INVALID_MENU_HANDLE); + return FALSE; + } + + hmenu = (HMENU)GetWindowLongPtrW(hwnd, 0); + break; + case OBJID_MENU: + hmenu = GetMenu(hwnd); + break; + case OBJID_SYSMENU: + hmenu = GetSystemMenu(hwnd, FALSE); + break; + default: + return FALSE; + } + + if (!hmenu) + return FALSE; + + if (pmbi->cbSize != sizeof(MENUBARINFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + menu = MENU_GetMenu(hmenu); + if (!menu) + return FALSE; + if (idItem < 0 || idItem > menu->nItems) + return FALSE; + + if (!menu->Height) + { + SetRectEmpty(&pmbi->rcBar); + } + else if (idItem == 0) + { + GetMenuItemRect(hwnd, hmenu, 0, &pmbi->rcBar); + pmbi->rcBar.right = pmbi->rcBar.left + menu->Width; + pmbi->rcBar.bottom = pmbi->rcBar.top + menu->Height; + } + else + { + GetMenuItemRect(hwnd, hmenu, idItem - 1, &pmbi->rcBar); + } + + pmbi->hMenu = hmenu; + pmbi->hwndMenu = NULL; + pmbi->fBarFocused = top_popup_hmenu == hmenu; + if (idItem) + { + pmbi->fFocused = menu->FocusedItem == idItem - 1; + if (pmbi->fFocused && (menu->items[idItem - 1].fType & MF_POPUP)) + { + menu = MENU_GetMenu(menu->items[idItem - 1].hSubMenu); + if (menu) + pmbi->hwndMenu = menu->hWnd; + } + } + else + { + pmbi->fFocused = pmbi->fBarFocused; + } + + return TRUE; } /**********************************************************************

1 0

Piotr Caban : user32/tests: Added GetMenuBarInfo tests.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 1128546437a0cc8f79b475e68fedfe247281873a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1128546437a0cc8f79b475e68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 16 13:36:52 2012 +0200 user32/tests: Added GetMenuBarInfo tests. --- dlls/user32/tests/edit.c | 60 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 89a2843..11550f7 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -39,12 +39,14 @@ struct edit_notify { static struct edit_notify notifications; static BOOL (WINAPI *pEndMenu) (void); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); + pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2134,6 +2136,7 @@ static void test_child_edit_wmkeydown(void) static int got_en_setfocus = 0; static int got_wm_capturechanged = 0; +static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -2156,7 +2159,50 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR return DefWindowProcA(hWnd, msg, wParam, lParam); } -static void test_contextmenu_focus(void) +static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_ENTERIDLE: { + MENUBARINFO mbi; + BOOL ret; + HWND ctx_menu = (HWND)lParam; + + memset(&mbi, 0, sizeof(mbi)); + mbi.cbSize = sizeof(mbi); + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, + "GetMenuBarInfo failed\n"); + if (ret) + { + ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); + ok(!mbi.hwndMenu, "mbi.hwndMenu != NULL\n"); + ok(mbi.fBarFocused, "mbi.fBarFocused = FALSE\n"); + ok(mbi.fFocused, "mbi.fFocused = FALSE\n"); + } + + memset(&mbi, 0, sizeof(mbi)); + mbi.cbSize = sizeof(mbi); + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, + "GetMenuBarInfo failed\n"); + if (ret) + { + ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); + ok(!mbi.hwndMenu, "mbi.hwndMenu != NULL\n"); + ok(mbi.fBarFocused, "mbi.fBarFocused = FALSE\n"); + ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); + } + + pEndMenu(); + break; + } + } + return p_edit_proc(hWnd, msg, wParam, lParam); +} + +static void test_contextmenu(void) { HWND hwndMain, hwndEdit; @@ -2171,15 +2217,17 @@ static void test_contextmenu_focus(void) assert(hwndEdit); SetFocus(NULL); - SetCapture(hwndMain); - SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - ok(got_en_setfocus, "edit box didn't get focused\n"); - ok(got_wm_capturechanged, "main window capture did not change\n"); + if (pGetMenuBarInfo) + { + p_edit_proc = (void*)SetWindowLongPtr(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + } + DestroyWindow (hwndEdit); DestroyWindow (hwndMain); } @@ -2516,7 +2564,7 @@ START_TEST(edit) test_fontsize(); test_dialogmode(); if (pEndMenu) - test_contextmenu_focus(); + test_contextmenu(); else win_skip("EndMenu is not available\n");

1 0

Piotr Caban : user32/tests: Added more GetMenuBarInfo tests.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 1a74d210901dfb561f05f4457dc58ba403c08ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74d210901dfb561f05f4457… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 16 13:37:06 2012 +0200 user32/tests: Added more GetMenuBarInfo tests. --- dlls/user32/tests/menu.c | 190 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 189 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index ea7b5b0..07cf437 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -38,6 +38,7 @@ static ATOM atomMenuCheckClass; static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pEndMenu) (void); @@ -52,6 +53,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetMenuInfo) + GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) GET_PROC(EndMenu) @@ -116,6 +118,7 @@ typedef struct /* globals to communicate between test and wndproc */ static BOOL bMenuVisible; +static INT popmenu; static BOOL got_input; static HMENU hMenus[4]; @@ -267,6 +270,134 @@ static void register_menu_check_class(void) atomMenuCheckClass = RegisterClass(&wc); } +static void test_getmenubarinfo(void) +{ + BOOL ret; + HMENU hmenu; + MENUBARINFO mbi; + RECT rcw, rci; + HWND hwnd; + INT err; + + if (!pGetMenuBarInfo) { + win_skip("GetMenuBarInfo is not available\n"); + return; + } + + mbi.cbSize = sizeof(MENUBARINFO); + + hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_SYSMENU | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + + /* no menu: getmenubarinfo should fail */ + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should not have been successful\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* create menubar, no items yet */ + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(NULL, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err==ERROR_INVALID_MENU_HANDLE || broken(err==0xdeadbeef) /* NT, W2K, XP */, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, -1, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + mbi.cbSize = 1000; + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + mbi.cbSize = sizeof(MENUBARINFO); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, 123, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + ok(mbi.rcBar.left == 0 && mbi.rcBar.top == 0 && + mbi.rcBar.bottom == 0 && mbi.rcBar.right == 0, + "rcBar: Expected 0,0-0,0, got: %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", + mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: Got %d instead of 0.\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: Got %d instead of 0.\n", mbi.fFocused); + + /* add some items */ + ret = AppendMenu(hmenu, MF_STRING , 100, "item 1"); + ok(ret, "AppendMenu failed.\n"); + ret = AppendMenu(hmenu, MF_STRING , 101, "item 2"); + ok(ret, "AppendMenu failed.\n"); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 200, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* get info for the whole menu */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + /* calculate menu rectangle, from window rectangle and the position of the first item */ + ret = GetWindowRect(hwnd, &rcw); + ok(ret, "GetWindowRect failed.\n"); + ret = GetMenuItemRect(hwnd, hmenu, 0, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + todo_wine ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rcw.right - rci.left + rcw.left, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rcw.right - rci.left + rcw.left, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + /* get info for item nr.2 */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 2, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + ret = GetMenuItemRect(hwnd, hmenu, 1, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rci.right, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rci.right, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + DestroyWindow(hwnd); +} + /* demonstrates that windows locks the menu object so that it is still valid * even after a client calls DestroyMenu on it */ static void test_menu_locked_by_window(void) @@ -2030,9 +2161,12 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_ENTERMENULOOP: bMenuVisible = TRUE; break; + case WM_INITMENUPOPUP: + case WM_UNINITMENUPOPUP: case WM_EXITMENULOOP: - bMenuVisible = FALSE; + case WM_MENUSELECT: break; + case WM_KEYDOWN: case WM_SYSKEYDOWN: case WM_MOUSEMOVE: @@ -2046,6 +2180,59 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, default: return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); } + + if(pGetMenuBarInfo) + { + MENUBARINFO mbi; + HMENU hmenu; + UINT state; + BOOL br; + + mbi.cbSize = sizeof(MENUBARINFO); + + /* get info for the menu */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 0, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + hmenu = GetMenu(hWnd); + ok(!mbi.hwndMenu, "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected NULL\n", + msg, mbi.hwndMenu); + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "msg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!bMenuVisible == !mbi.fFocused, "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", + msg, mbi.fFocused != 0); + + /* get info for the menu's first item */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 1, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + state = GetMenuState(hmenu, 0, MF_BYPOSITION); + if (pGetMenuInfo) /* Skip on NT */ + { + /* Native returns handle to destroyed window */ + if (msg==WM_UNINITMENUPOPUP && popmenu==1) + todo_wine ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + else + ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + } + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "nsg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!(bMenuVisible && (state & MF_HILITE)) == !mbi.fFocused, + "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", msg, mbi.fFocused != 0); + } + + if (msg == WM_EXITMENULOOP) + bMenuVisible = FALSE; + else if (msg == WM_INITMENUPOPUP) + popmenu++; + else if (msg == WM_UNINITMENUPOPUP) + popmenu--; return 0; } @@ -3317,6 +3504,7 @@ START_TEST(menu) test_menu_locked_by_window(); test_subpopup_locked_by_menu(); test_menu_ownerdraw(); + test_getmenubarinfo(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo();

1 0

Christian Costa : d3drm: Move loading code from IDirect3DRM3Impl_Load to a separate function so it can be called recursively .
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 0013fc1ca7ec22ff4b89e4d62ccc6a1f13db345d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0013fc1ca7ec22ff4b89e4d62… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:22 2012 +0200 d3drm: Move loading code from IDirect3DRM3Impl_Load to a separate function so it can be called recursively. --- dlls/d3drm/d3drm.c | 226 +++++++++++++++++++++++++++------------------------- 1 files changed, 119 insertions(+), 107 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 401cccd..7ea0b2a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1266,6 +1266,123 @@ static HRESULT WINAPI IDirect3DRM3Impl_EnumerateObjects(IDirect3DRM3* iface, D3D return E_NOTIMPL; } +HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, + LPVOID ArgLP, D3DRMLOADTEXTURECALLBACK LoadTextureProc, LPVOID ArgLTP, LPDIRECT3DRMFRAME3 parent_frame) +{ + HRESULT ret = D3DRMERR_BADOBJECT; + HRESULT hr; + const GUID* guid; + DWORD i; + BOOL requested = FALSE; + + hr = IDirectXFileData_GetType(data_object, &guid); + if (hr != DXFILE_OK) + goto end; + + TRACE("Found object type whose GUID = %s\n", debugstr_guid(guid)); + + if (IsEqualGUID(guid, &TID_D3DRMMesh)) + { + TRACE("Found TID_D3DRMMesh\n"); + + for (i = 0; i < nb_GUIDs; i++) + if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) + { + requested = TRUE; + break; + } + + if (requested) + { + LPDIRECT3DRMMESHBUILDER3 meshbuilder; + + FIXME("Load mesh data and notify application\n"); + + hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); + if (SUCCEEDED(hr)) + { + LPDIRECT3DRMOBJECT object = NULL; + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + hr = load_mesh_data(meshbuilder, data_object); + if (SUCCEEDED(hr)) + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } + IDirect3DRMMeshBuilder3_Release(meshbuilder); + } + + if (FAILED(hr)) + ERR("Cannot process mesh\n"); + } + } + else if (IsEqualGUID(guid, &TID_D3DRMFrame)) + { + TRACE("Found TID_D3DRMFrame\n"); + + for (i = 0; i < nb_GUIDs; i++) + if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) + { + requested = TRUE; + break; + } + + if (requested) + { + LPDIRECT3DRMFRAME3 frame; + + FIXME("Fake frame data and notify application\n"); + + hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + if (SUCCEEDED(hr)) + { + LPDIRECT3DRMOBJECT object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } + IDirect3DRMFrame3_Release(frame); + } + + if (FAILED(hr)) + ERR("Cannot process frame\n"); + } + } + else if (IsEqualGUID(guid, &TID_D3DRMMaterial)) + { + TRACE("Found TID_D3DRMMaterial\n"); + + for (i = 0; i < nb_GUIDs; i++) + if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial2)) + requested = TRUE; + + if (requested) + { + FIXME("Processing material not supported yet\n"); + } + } + else + { + FIXME("Found unknown TID %s\n", debugstr_guid(guid)); + } + + ret = D3DRM_OK; + +end: + + return ret; +} + static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSource, LPVOID ObjID, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADOPTIONS LOFlags, D3DRMLOADCALLBACK LoadProc, LPVOID ArgLP, @@ -1364,115 +1481,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc goto end; } - hr = IDirectXFileData_GetType(pData, &pGuid); - if (hr != DXFILE_OK) + ret = load_data(iface, pData, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, ParentFrame); + if (ret != D3DRM_OK) goto end; - TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - - if (IsEqualGUID(pGuid, &TID_D3DRMMesh)) - { - BOOL requested = FALSE; - HRESULT hr; - - TRACE("Found TID_D3DRMMesh\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) - { - requested = TRUE; - break; - } - - if (requested) - { - LPDIRECT3DRMMESHBUILDER3 meshbuilder; - - FIXME("Load mesh data and notify application\n"); - - hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); - if (SUCCEEDED(hr)) - { - LPDIRECT3DRMOBJECT object = NULL; - - hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); - if (SUCCEEDED(hr)) - { - hr = load_mesh_data(meshbuilder, pData); - if (SUCCEEDED(hr)) - LoadProc(object, GUIDs[i], ArgLP); - IDirect3DRMObject_Release(object); - } - IDirect3DRMMeshBuilder3_Release(meshbuilder); - } - - if (FAILED(hr)) - ERR("Cannot process mesh\n"); - } - } - else if (IsEqualGUID(pGuid, &TID_D3DRMFrame)) - { - BOOL requested = FALSE; - HRESULT hr; - - TRACE("Found TID_D3DRMFrame\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) - { - requested = TRUE; - break; - } - - if (requested) - { - LPDIRECT3DRMFRAME3 frame; - - FIXME("Fake frame data and notify application\n"); - - hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); - if (SUCCEEDED(hr)) - { - LPDIRECT3DRMOBJECT object; - - hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); - if (SUCCEEDED(hr)) - { - LoadProc(object, GUIDs[i], ArgLP); - IDirect3DRMObject_Release(object); - } - IDirect3DRMFrame3_Release(frame); - } - - if (FAILED(hr)) - ERR("Cannot process frame\n"); - - } - } - else if (IsEqualGUID(pGuid, &TID_D3DRMMaterial)) - { - BOOL requested = FALSE; - - TRACE("Found TID_D3DRMMaterial\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial2)) - requested = TRUE; - - if (requested) - { - FIXME("Processing material not supported yet\n"); - } - } - else - { - FIXME("Found unknown TID %s\n", debugstr_guid(pGuid)); - } IDirectXFileData_Release(pData); pData = NULL; }

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapFrameEncode methods.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 8a62406e008edfa5877c99daf8314a7a49aca56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a62406e008edfa5877c99daf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 11:37:24 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapFrameEncode methods. --- dlls/windowscodecs/proxy.c | 47 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 16 +++++----- 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 082bc0c..cf6a5759 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -138,6 +138,53 @@ HRESULT WINAPI IWICBitmapFlipRotator_Initialize_Proxy_W(IWICBitmapFlipRotator *i return IWICBitmapFlipRotator_Initialize(iface, pISource, options); } +HRESULT WINAPI IWICBitmapFrameEncode_Initialize_Proxy_W(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + return IWICBitmapFrameEncode_Initialize(iface, pIEncoderOptions); +} + +HRESULT WINAPI IWICBitmapFrameEncode_SetSize_Proxy_W(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + return IWICBitmapFrameEncode_SetSize(iface, uiWidth, uiHeight); +} + +HRESULT WINAPI IWICBitmapFrameEncode_SetResolution_Proxy_W(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + return IWICBitmapFrameEncode_SetResolution(iface, dpiX, dpiY); +} + +HRESULT WINAPI IWICBitmapFrameEncode_SetColorContexts_Proxy_W(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + return IWICBitmapFrameEncode_SetColorContexts(iface, cCount, ppIColorContext); +} + +HRESULT WINAPI IWICBitmapFrameEncode_SetThumbnail_Proxy_W(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + return IWICBitmapFrameEncode_SetThumbnail(iface, pIThumbnail); +} + +HRESULT WINAPI IWICBitmapFrameEncode_WriteSource_Proxy_W(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + return IWICBitmapFrameEncode_WriteSource(iface, pIBitmapSource, prc); +} + +HRESULT WINAPI IWICBitmapFrameEncode_Commit_Proxy_W(IWICBitmapFrameEncode *iface) +{ + return IWICBitmapFrameEncode_Commit(iface); +} + +HRESULT WINAPI IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy_W(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + return IWICBitmapFrameEncode_GetMetadataQueryWriter(iface, ppIMetadataQueryWriter); +} + HRESULT WINAPI IWICBitmapLock_GetDataPointer_Proxy_W(IWICBitmapLock *iface, UINT *pcbBufferSize, BYTE **ppbData) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 4ae0c41..712c06e 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -33,14 +33,14 @@ @ stdcall IWICBitmapFrameDecode_GetColorContexts_Proxy(ptr long ptr ptr) IWICBitmapFrameDecode_GetColorContexts_Proxy_W @ stdcall IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy(ptr ptr) IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy_W @ stdcall IWICBitmapFrameDecode_GetThumbnail_Proxy(ptr ptr) IWICBitmapFrameDecode_GetThumbnail_Proxy_W -@ stub IWICBitmapFrameEncode_Commit_Proxy -@ stub IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy -@ stub IWICBitmapFrameEncode_Initialize_Proxy -@ stub IWICBitmapFrameEncode_SetColorContexts_Proxy -@ stub IWICBitmapFrameEncode_SetResolution_Proxy -@ stub IWICBitmapFrameEncode_SetSize_Proxy -@ stub IWICBitmapFrameEncode_SetThumbnail_Proxy -@ stub IWICBitmapFrameEncode_WriteSource_Proxy +@ stdcall IWICBitmapFrameEncode_Commit_Proxy(ptr) IWICBitmapFrameEncode_Commit_Proxy_W +@ stdcall IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy(ptr ptr) IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy_W +@ stdcall IWICBitmapFrameEncode_Initialize_Proxy(ptr ptr) IWICBitmapFrameEncode_Initialize_Proxy_W +@ stdcall IWICBitmapFrameEncode_SetColorContexts_Proxy(ptr long ptr) IWICBitmapFrameEncode_SetColorContexts_Proxy_W +@ stdcall IWICBitmapFrameEncode_SetResolution_Proxy(ptr double double) IWICBitmapFrameEncode_SetResolution_Proxy_W +@ stdcall IWICBitmapFrameEncode_SetSize_Proxy(ptr long long) IWICBitmapFrameEncode_SetSize_Proxy_W +@ stdcall IWICBitmapFrameEncode_SetThumbnail_Proxy(ptr ptr) IWICBitmapFrameEncode_SetThumbnail_Proxy_W +@ stdcall IWICBitmapFrameEncode_WriteSource_Proxy(ptr ptr ptr) IWICBitmapFrameEncode_WriteSource_Proxy_W @ stdcall IWICBitmapLock_GetDataPointer_STA_Proxy(ptr ptr ptr) IWICBitmapLock_GetDataPointer_Proxy_W @ stdcall IWICBitmapLock_GetStride_Proxy(ptr ptr) IWICBitmapLock_GetStride_Proxy_W @ stub IWICBitmapScaler_Initialize_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapEncoder methods.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 4483f85d20bc3250e5c2a0e5ccc4213157745972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4483f85d20bc3250e5c2a0e5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:34:22 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapEncoder methods. --- dlls/windowscodecs/proxy.c | 41 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 14 +++++----- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index cf6a5759..f04619d 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -132,6 +132,47 @@ HRESULT WINAPI IWICBitmapDecoder_GetFrame_Proxy_W(IWICBitmapDecoder *iface, return IWICBitmapDecoder_GetFrame(iface, index, ppIBitmapFrame); } +HRESULT WINAPI IWICBitmapEncoder_Initialize_Proxy_W(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + return IWICBitmapEncoder_Initialize(iface, pIStream, cacheOption); +} + +HRESULT WINAPI IWICBitmapEncoder_GetEncoderInfo_Proxy_W(IWICBitmapEncoder *iface, + IWICBitmapEncoderInfo **ppIEncoderInfo) +{ + return IWICBitmapEncoder_GetEncoderInfo(iface, ppIEncoderInfo); +} + +HRESULT WINAPI IWICBitmapEncoder_SetPalette_Proxy_W(IWICBitmapEncoder *iface, + IWICPalette *pIPalette) +{ + return IWICBitmapEncoder_SetPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICBitmapEncoder_SetThumbnail_Proxy_W(IWICBitmapEncoder *iface, + IWICBitmapSource *pIThumbnail) +{ + return IWICBitmapEncoder_SetThumbnail(iface, pIThumbnail); +} + +HRESULT WINAPI IWICBitmapEncoder_CreateNewFrame_Proxy_W(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + return IWICBitmapEncoder_CreateNewFrame(iface, ppIFrameEncode, ppIEncoderOptions); +} + +HRESULT WINAPI IWICBitmapEncoder_Commit_Proxy_W(IWICBitmapEncoder *iface) +{ + return IWICBitmapEncoder_Commit(iface); +} + +HRESULT WINAPI IWICBitmapEncoder_GetMetadataQueryWriter_Proxy_W(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + return IWICBitmapEncoder_GetMetadataQueryWriter(iface, ppIMetadataQueryWriter); +} + HRESULT WINAPI IWICBitmapFlipRotator_Initialize_Proxy_W(IWICBitmapFlipRotator *iface, IWICBitmapSource *pISource, WICBitmapTransformOptions options) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 712c06e..e2cb411 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -22,13 +22,13 @@ @ stdcall IWICBitmapDecoder_GetMetadataQueryReader_Proxy(ptr ptr) IWICBitmapDecoder_GetMetadataQueryReader_Proxy_W @ stdcall IWICBitmapDecoder_GetPreview_Proxy(ptr ptr) IWICBitmapDecoder_GetPreview_Proxy_W @ stdcall IWICBitmapDecoder_GetThumbnail_Proxy(ptr ptr) IWICBitmapDecoder_GetThumbnail_Proxy_W -@ stub IWICBitmapEncoder_Commit_Proxy -@ stub IWICBitmapEncoder_CreateNewFrame_Proxy -@ stub IWICBitmapEncoder_GetEncoderInfo_Proxy -@ stub IWICBitmapEncoder_GetMetadataQueryWriter_Proxy -@ stub IWICBitmapEncoder_Initialize_Proxy -@ stub IWICBitmapEncoder_SetPalette_Proxy -@ stub IWICBitmapEncoder_SetThumbnail_Proxy +@ stdcall IWICBitmapEncoder_Commit_Proxy(ptr) IWICBitmapEncoder_Commit_Proxy_W +@ stdcall IWICBitmapEncoder_CreateNewFrame_Proxy(ptr ptr ptr) IWICBitmapEncoder_CreateNewFrame_Proxy_W +@ stdcall IWICBitmapEncoder_GetEncoderInfo_Proxy(ptr ptr) IWICBitmapEncoder_GetEncoderInfo_Proxy_W +@ stdcall IWICBitmapEncoder_GetMetadataQueryWriter_Proxy(ptr ptr) IWICBitmapEncoder_GetMetadataQueryWriter_Proxy_W +@ stdcall IWICBitmapEncoder_Initialize_Proxy(ptr ptr long) IWICBitmapEncoder_Initialize_Proxy_W +@ stdcall IWICBitmapEncoder_SetPalette_Proxy(ptr ptr) IWICBitmapEncoder_SetPalette_Proxy_W +@ stdcall IWICBitmapEncoder_SetThumbnail_Proxy(ptr ptr) IWICBitmapEncoder_SetThumbnail_Proxy_W @ stdcall IWICBitmapFlipRotator_Initialize_Proxy(ptr ptr long) IWICBitmapFlipRotator_Initialize_Proxy_W @ stdcall IWICBitmapFrameDecode_GetColorContexts_Proxy(ptr long ptr ptr) IWICBitmapFrameDecode_GetColorContexts_Proxy_W @ stdcall IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy(ptr ptr) IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper for IWICFormatConverter_Initialize.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 673b074e7bf94537e3ed8ac27a1a8a115390c703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673b074e7bf94537e3ed8ac27… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:44:10 2012 -0500 windowscodecs: Add wrapper for IWICFormatConverter_Initialize. --- dlls/windowscodecs/proxy.c | 8 ++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index f04619d..51f837b 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -351,6 +351,14 @@ HRESULT WINAPI IWICBitmapFrameDecode_GetThumbnail_Proxy_W(IWICBitmapFrameDecode return IWICBitmapFrameDecode_GetThumbnail(iface, ppIThumbnail); } +HRESULT WINAPI IWICFormatConverter_Initialize_Proxy_W(IWICFormatConverter *iface, + IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) +{ + return IWICFormatConverter_Initialize(iface, pISource, dstFormat, dither, + pIPalette, alphaThresholdPercent, paletteTranslate); +} + HRESULT WINAPI IWICImagingFactory_CreateBitmapClipper_Proxy_W(IWICImagingFactory *pFactory, IWICBitmapClipper **ppIBitmapClipper) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index e2cb411..314fa10 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -62,7 +62,7 @@ @ stdcall IWICComponentInfo_GetVersion_Proxy(ptr long ptr ptr) IWICComponentInfo_GetVersion_Proxy_W @ stdcall IWICFastMetadataEncoder_Commit_Proxy(ptr) IWICFastMetadataEncoder_Commit_Proxy_W @ stdcall IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy(ptr ptr) IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy_W -@ stub IWICFormatConverter_Initialize_Proxy +@ stdcall IWICFormatConverter_Initialize_Proxy(ptr ptr ptr long ptr double long) IWICFormatConverter_Initialize_Proxy_W @ stdcall IWICImagingFactory_CreateBitmapClipper_Proxy(ptr ptr) IWICImagingFactory_CreateBitmapClipper_Proxy_W @ stdcall IWICImagingFactory_CreateBitmapFlipRotator_Proxy(ptr ptr) IWICImagingFactory_CreateBitmapFlipRotator_Proxy_W @ stdcall IWICImagingFactory_CreateBitmapFromHBITMAP_Proxy(ptr ptr ptr long ptr) IWICImagingFactory_CreateBitmapFromHBITMAP_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper for IWICBitmapScaler_Initialize .
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: d65cddae0a3b28a44b19c98c9aac48ae57f76852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65cddae0a3b28a44b19c98c9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 13:00:39 2012 -0500 windowscodecs: Add wrapper for IWICBitmapScaler_Initialize. --- dlls/windowscodecs/proxy.c | 6 ++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 51f837b..08de527 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -238,6 +238,12 @@ HRESULT WINAPI IWICBitmapLock_GetStride_Proxy_W(IWICBitmapLock *iface, return IWICBitmapLock_GetStride(iface, pcbStride); } +HRESULT WINAPI IWICBitmapScaler_Initialize_Proxy_W(IWICBitmapScaler *iface, + IWICBitmapSource *pISource, UINT uiWidth, UINT uiHeight, WICBitmapInterpolationMode mode) +{ + return IWICBitmapScaler_Initialize(iface, pISource, uiWidth, uiHeight, mode); +} + HRESULT WINAPI IWICBitmapSource_GetSize_Proxy_W(IWICBitmapSource *iface, UINT *puiWidth, UINT *puiHeight) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 314fa10..c0c01ea 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -43,7 +43,7 @@ @ stdcall IWICBitmapFrameEncode_WriteSource_Proxy(ptr ptr ptr) IWICBitmapFrameEncode_WriteSource_Proxy_W @ stdcall IWICBitmapLock_GetDataPointer_STA_Proxy(ptr ptr ptr) IWICBitmapLock_GetDataPointer_Proxy_W @ stdcall IWICBitmapLock_GetStride_Proxy(ptr ptr) IWICBitmapLock_GetStride_Proxy_W -@ stub IWICBitmapScaler_Initialize_Proxy +@ stdcall IWICBitmapScaler_Initialize_Proxy(ptr ptr long long long) IWICBitmapScaler_Initialize_Proxy_W @ stdcall IWICBitmapSource_CopyPalette_Proxy(ptr ptr) IWICBitmapSource_CopyPalette_Proxy_W @ stdcall IWICBitmapSource_CopyPixels_Proxy(ptr ptr long long ptr) IWICBitmapSource_CopyPixels_Proxy_W @ stdcall IWICBitmapSource_GetPixelFormat_Proxy(ptr ptr) IWICBitmapSource_GetPixelFormat_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper for IWICBitmapClipper_Initialize.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 803c2d782db5897e037f44d54a91b086de783c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=803c2d782db5897e037f44d54… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 13:02:37 2012 -0500 windowscodecs: Add wrapper for IWICBitmapClipper_Initialize. --- dlls/windowscodecs/proxy.c | 6 ++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 08de527..6115198 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, + IWICBitmapSource *pISource, const WICRect *prc) +{ + return IWICBitmapClipper_Initialize(iface, pISource, prc); +} + HRESULT WINAPI IWICBitmapCodecInfo_GetContainerFormat_Proxy_W(IWICBitmapCodecInfo *iface, GUID *pguidContainerFormat) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index c0c01ea..259ff06 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -5,7 +5,7 @@ @ stub IEnumString_Next_WIC_Proxy @ stub IEnumString_Reset_WIC_Proxy @ stub IPropertyBag2_Write_Proxy -@ stub IWICBitmapClipper_Initialize_Proxy +@ stdcall IWICBitmapClipper_Initialize_Proxy(ptr ptr ptr) IWICBitmapClipper_Initialize_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportAnimation_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportAnimation_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportLossless_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportLossless_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy_W

1 0

Andrew Eikum : dsound: Don't use IAudioClock:: GetPosition to determine buffer fullness.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 1cc9ecb558e09a94e1b92331ca132634e8dac8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc9ecb558e09a94e1b92331c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 15 14:41:24 2012 -0500 dsound: Don't use IAudioClock::GetPosition to determine buffer fullness. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/mixer.c | 29 ++++++++++++++--------------- dlls/dsound/primary.c | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1d43c5a..45c8c5d 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -83,7 +83,6 @@ struct DirectSoundDevice DWORD priolevel; PWAVEFORMATEX pwfx; UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf, helfrags; - UINT64 last_pos_bytes; DWORD fraglen; LPBYTE buffer; DWORD writelead, buflen, state, playpos, mixpos; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 06e5773..fed9165 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -667,8 +667,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - UINT64 clock_pos, clock_freq, pos_bytes; - UINT delta_frags; + UINT32 pad, to_mix_frags, to_mix_bytes; HRESULT hr; TRACE("(%p)\n", device); @@ -676,28 +675,28 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* **** */ EnterCriticalSection(&device->mixlock); - hr = IAudioClock_GetFrequency(device->clock, &clock_freq); + hr = IAudioClient_GetCurrentPadding(device->client, &pad); if(FAILED(hr)){ - WARN("GetFrequency failed: %08x\n", hr); - LeaveCriticalSection(&device->mixlock); + WARN("GetCurrentPadding failed: %08x\n", hr); + LeaveCriticalSection(&device->mixlock); return; } - hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); - LeaveCriticalSection(&device->mixlock); + to_mix_frags = device->prebuf - (pad * device->pwfx->nBlockAlign + device->fraglen - 1) / device->fraglen; + + if(to_mix_frags == 0){ + /* nothing to do! */ + LeaveCriticalSection(&device->mixlock); return; } - pos_bytes = (clock_pos * device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign) / clock_freq; + to_mix_bytes = to_mix_frags * device->fraglen; - delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; - if(delta_frags > 0){ - device->playing_offs_bytes += delta_frags * device->fraglen; + if(device->in_mmdev_bytes > 0){ + DWORD delta_bytes = min(to_mix_bytes, device->in_mmdev_bytes); + device->in_mmdev_bytes -= delta_bytes; + device->playing_offs_bytes += delta_bytes; device->playing_offs_bytes %= device->buflen; - device->in_mmdev_bytes -= delta_frags * device->fraglen; - device->last_pos_bytes = pos_bytes - (pos_bytes % device->fraglen); } if (device->priolevel != DSSCL_WRITEPRIMARY) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b3b77f9..8da12e2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -196,7 +196,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->last_pos_bytes = device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; + device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; return DS_OK; }

1 0