June 2011 - Wine-Commits - list.winehq.org

Mariusz Pluciński : shell32: Add implementation of IKnownFolder::GetCategory.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 5e90301bc21d1d36a9b7f19724abde4a166cac4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e90301bc21d1d36a9b7f1972… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 23 18:49:55 2011 +0200 shell32: Add implementation of IKnownFolder::GetCategory. --- dlls/shell32/shellpath.c | 16 ++++++++++++++-- dlls/shell32/tests/shellpath.c | 2 -- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6779e61..bd77031 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3222,8 +3222,20 @@ static HRESULT WINAPI knownfolder_GetCategory( IKnownFolder *iface, KF_CATEGORY *pCategory) { - FIXME("%p\n", pCategory); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); + HRESULT hr = S_OK; + DWORD dwSize, dwType; + + TRACE("%p, %p\n", knownfolder, pCategory); + + /* we can not get category for folder which is not registered */ + if(!knownfolder->registryPath) + hr = E_FAIL; + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szCategory, RRF_RT_DWORD, &dwType, pCategory, &dwSize)); + + return hr; } static HRESULT WINAPI knownfolder_GetShellItem( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2240630..b58b5c2 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1176,9 +1176,7 @@ static void test_knownFolders(void) if(SUCCEEDED(hr)) { hr = IKnownFolder_GetCategory(folder, &cat); - todo_wine ok(hr == S_OK, "failed to get folder category: hr=0x%0x\n", hr); - todo_wine ok(cat == KF_CATEGORY_PERUSER, "invalid category returned: %d, while %d (KF_CATEGORY_PERUSER) expected\n", cat, KF_CATEGORY_PERUSER); hr = IKnownFolder_GetId(folder, &folderId);

1 0

Jay Yang : comctl32: Make ComboBoxEx send CBEN_ENDEDIT when selecting from the dropdown list.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 30fa4cb5d0488e8464a5b4e0f22da1908cf4e235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fa4cb5d0488e8464a5b4e0f… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Thu Jun 23 14:56:14 2011 -0400 comctl32: Make ComboBoxEx send CBEN_ENDEDIT when selecting from the dropdown list. --- dlls/comctl32/comboex.c | 8 ++++---- dlls/comctl32/tests/comboex.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 319696d..3402a71 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1120,10 +1120,10 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) switch (command) { case CBN_DROPDOWN: - SetFocus (infoPtr->hwndCombo); - ShowWindow (infoPtr->hwndEdit, SW_HIDE); - return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); - + SetFocus (infoPtr->hwndCombo); + ShowWindow (infoPtr->hwndEdit, SW_HIDE); + infoPtr->flags |= WCBE_ACTEDIT; + return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); case CBN_CLOSEUP: SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); /* diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 59c261c..172e564 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -42,6 +42,8 @@ static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR #define MAX_CHARS 100 static char *textBuffer = NULL; +static BOOL received_end_edit = FALSE; + static HWND createComboEx(DWORD style) { return CreateWindowExA(0, WC_COMBOBOXEXA, NULL, style, 0, 0, 300, 300, hComboExParentWnd, NULL, hMainHinst, NULL); @@ -341,6 +343,7 @@ static void test_WM_LBUTTONDOWN(void) ok(idx == 4 || broken(idx == -1), /* win98 */ "Current Selection: expected %d, got %d\n", 4, idx); + ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); DestroyWindow(hComboEx); } @@ -427,6 +430,30 @@ static void test_WM_WINDOWPOSCHANGING(void) ok(ret, "DestroyWindow failed\n"); } +static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + NMHDR *hdr = (NMHDR*)lParam; + switch(hdr->code){ + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *edit_info = (NMCBEENDEDITA*)hdr; + if(edit_info->iWhy==CBENF_DROPDOWN){ + received_end_edit = TRUE; + } + break; + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *edit_info = (NMCBEENDEDITW*)hdr; + if(edit_info->iWhy==CBENF_DROPDOWN){ + received_end_edit = TRUE; + } + break; + } + } + return 0; +} + static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -434,7 +461,8 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L case WM_DESTROY: PostQuitMessage(0); break; - + case WM_NOTIFY: + return ComboExTestOnNotify(hWnd,msg,wParam,lParam); default: return DefWindowProcA(hWnd, msg, wParam, lParam); }

1 0

Jay Yang : shell32: Implement ILIsEmpty.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 583641bc9d1820a66cdcb4d70df19dd7dcf7105a URL: http://source.winehq.org/git/wine.git/?a=commit;h=583641bc9d1820a66cdcb4d70… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Thu Jun 23 14:56:09 2011 -0400 shell32: Implement ILIsEmpty. --- include/shlobj.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index aab93fc..07981b6 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1696,6 +1696,11 @@ HRESULT WINAPI ILLoadFromStream(LPSTREAM,LPITEMIDLIST*); BOOL WINAPI ILRemoveLastID(LPITEMIDLIST); HRESULT WINAPI ILSaveToStream(LPSTREAM,LPCITEMIDLIST); +static inline BOOL ILIsEmpty(LPCITEMIDLIST pidl) +{ + return !(pidl && pidl->mkid.cb); +} + #include <poppack.h>

1 0

Travis Athougies : d3dx9_36: Added stub D3DXCreateCubeTextureFromFileInMemory.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 4434becd039f502fa34b5f28a7366409332c3193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4434becd039f502fa34b5f28a… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jun 23 18:55:16 2011 -0700 d3dx9_36: Added stub D3DXCreateCubeTextureFromFileInMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index f3b4efe..b212b05 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -39,7 +39,7 @@ @ stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) -@ stub D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 1c40d96..20d8880 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1029,6 +1029,16 @@ HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture, return D3D_OK; } +HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 pDevice, LPCVOID pSrcData, UINT SrcDataSize, + UINT Size, UINT MipLevels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey, + D3DXIMAGE_INFO *pSrcInfo, PALETTEENTRY *pPalette, LPDIRECT3DCUBETEXTURE9 *ppCubeTexture) +{ + FIXME("(%p, %p, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): stub\n", pDevice, pSrcData, SrcDataSize, Size, MipLevels, + Usage, Format, Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppCubeTexture); + + return E_NOTIMPL; +} + enum cube_coord { XCOORD = 0,

1 0

Travis Athougies : d3dx9_36: Added stub implementation of D3DXSaveSurfaceToFileInMemoryA and D3DXSaveSurfaceToFileInMemoryW .
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 59e0573a7b34ef56fb4610047df5db9d1d34b190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e0573a7b34ef56fb4610047… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jun 23 18:55:15 2011 -0700 d3dx9_36: Added stub implementation of D3DXSaveSurfaceToFileInMemoryA and D3DXSaveSurfaceToFileInMemoryW. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/surface.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index b212b05..a9b98a7 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -263,9 +263,9 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stub D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stub D3DXSaveTextureToFileA(ptr long ptr ptr) @ stub D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stub D3DXSaveTextureToFileW(ptr long ptr ptr) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 77cad08..82e3612 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -939,3 +939,18 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(LPDIRECT3DSURFACE9 pDestSurface, IDirect3DSurface9_UnlockRect(pSrcSurface); return hr; } + + +HRESULT WINAPI D3DXSaveSurfaceToFileA(LPCSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, + LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +{ + FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); + return D3DERR_INVALIDCALL; +} + +HRESULT WINAPI D3DXSaveSurfaceToFileW(LPCWSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, + LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +{ + FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); + return D3DERR_INVALIDCALL; +}

1 0

Stefan Dösinger : wined3d: Get rid of the has_signature_idx field in the ARB ps private data.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 1bc01f8f87b88fc4f962b8021b7efd4d0aa84530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc01f8f87b88fc4f962b8021… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 20 23:26:03 2011 +0200 wined3d: Get rid of the has_signature_idx field in the ARB ps private data. --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 893455e..e533018 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -285,7 +285,6 @@ struct ps_signature struct arb_pshader_private { struct arb_ps_compiled_shader *gl_shaders; UINT num_gl_shaders, shader_array_size; - BOOL has_signature_idx; DWORD input_signature_idx; DWORD clipplane_emulation; BOOL clamp_consts; @@ -4277,7 +4276,6 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh else shader_data->input_signature_idx = find_input_signature(priv, shader->input_signature); - shader_data->has_signature_idx = TRUE; TRACE("Shader got assigned input signature index %u\n", shader_data->input_signature_idx); if (!device->vs_clipping)

1 0

Mariusz Pluciński : shell32/tests: Add test of IKnownFolder::GetCategory for custom known folder.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: efc1162eb7e9cea29b0e8a29f5bde8e20d804b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc1162eb7e9cea29b0e8a29f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 23 18:49:48 2011 +0200 shell32/tests: Add test of IKnownFolder::GetCategory for custom known folder. --- dlls/shell32/tests/shellpath.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bba7858..2240630 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1175,6 +1175,12 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { + hr = IKnownFolder_GetCategory(folder, &cat); + todo_wine + ok(hr == S_OK, "failed to get folder category: hr=0x%0x\n", hr); + todo_wine + ok(cat == KF_CATEGORY_PERUSER, "invalid category returned: %d, while %d (KF_CATEGORY_PERUSER) expected\n", cat, KF_CATEGORY_PERUSER); + hr = IKnownFolder_GetId(folder, &folderId); ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); ok(IsEqualGUID(&folderId, &newFolderId)==TRUE, "invalid KNOWNFOLDERID returned\n");

1 0

Stefan Dösinger : wined3d: Fix a typo in compare_sig in the arb backend.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 3a3b4828645650d0560c9aa7de3031dcab52463f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3b4828645650d0560c9aa7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 23 00:19:11 2011 +0200 wined3d: Fix a typo in compare_sig in the arb backend. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7039841..893455e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3863,7 +3863,7 @@ static int compare_sig(const struct wined3d_shader_signature_element *sig1, cons if(sig1[i].sysval_semantic != sig2[i].sysval_semantic) return sig1[i].sysval_semantic < sig2[i].sysval_semantic ? -1 : 1; if(sig1[i].component_type != sig2[i].component_type) return sig1[i].component_type < sig2[i].component_type ? -1 : 1; if(sig1[i].register_idx != sig2[i].register_idx) return sig1[i].register_idx < sig2[i].register_idx ? -1 : 1; - if(sig1[i].mask != sig2->mask) return sig1[i].mask < sig2[i].mask ? -1 : 1; + if(sig1[i].mask != sig2[i].mask) return sig1[i].mask < sig2[i].mask ? -1 : 1; } return 0; }

1 0

Maarten Lankhorst : quartz: Skip filtergraph tests when filtergraph cannot be created.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: f991daf188247466ffe3353e3843ab0f04947d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f991daf188247466ffe3353e3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jun 24 16:51:11 2011 +0200 quartz: Skip filtergraph tests when filtergraph cannot be created. --- dlls/quartz/tests/filtergraph.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 596d115..7031199 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1872,7 +1872,14 @@ static void test_render_filter_priority(void) START_TEST(filtergraph) { + HRESULT hr; CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, (LPVOID*)&pgraph); + if (FAILED(hr)) { + skip("Creating filtergraph returned %08x, skipping tests\n", hr); + return; + } test_render_run(avifile); test_render_run(mpegfile); test_graph_builder();

1 0

Aric Stewart : usp10: Correct Pre Base glyph index shifting.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: df16d37b671298dad41e793963d3f4cdb96b68e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df16d37b671298dad41e79396… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 24 10:16:25 2011 -0500 usp10: Correct Pre Base glyph index shifting. --- dlls/usp10/shape.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8152e33..c4f7db5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2048,20 +2048,20 @@ static void Apply_Indic_PreBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, { INT index, nextIndex; INT count,g_offset; - INT prevCount = *pcGlyphs; count = syllable->base - syllable->start; g_offset = 0; index = find_consonant_halant(&pwChars[syllable->start], 0, count, lexical); - while (index >= 0 && index < (glyph_index->base - glyph_index->start)) + while (index >= 0 && index + g_offset < (glyph_index->base - glyph_index->start)) { + INT prevCount = *pcGlyphs; nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->start+g_offset, 1, pcGlyphs, feature); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); + shift_syllable_glyph_indexs(glyph_index, index + glyph_index->start + g_offset, (*pcGlyphs - prevCount)); g_offset += (*pcGlyphs - prevCount); - shift_syllable_glyph_indexs(glyph_index, index + glyph_index->start, g_offset); } index+=2;

1 0