July 2011 - Wine-commits - list.winehq.org

André Hentschel : user32: Remove dead code (clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 9cd2d61b6e7bbaacd7f23d59048249de0daeb472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd2d61b6e7bbaacd7f23d590… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 13:33:53 2011 +0200 user32: Remove dead code (clang). --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5423bcf..6c5955a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2987,7 +2987,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes LPVOID p = pOldCol; *(DWORD *)p = n; p = (char*)p + sizeof(DWORD); memcpy(p, SysColorPens, n*sizeof(HPEN)); p = (char*)p + n*sizeof(HPEN); - memcpy(p, SysColorBrushes, n*sizeof(HBRUSH)); p = (char*)p + n*sizeof(HBRUSH); + memcpy(p, SysColorBrushes, n*sizeof(HBRUSH)); for (i=0; i < n; i++) {

1 0

Piotr Caban : shell32: Update currently selected folder in SHBrowseForFolder dialog.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: f984d4d7f98861a2dab3d5aa4f820068b84ce2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f984d4d7f98861a2dab3d5aa4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 3 13:55:27 2011 +0200 shell32: Update currently selected folder in SHBrowseForFolder dialog. --- dlls/shell32/brsfolder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index b97a753..3a7a736 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -556,10 +556,15 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv ) { LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; + WCHAR name[MAX_PATH]; lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; ILFree(info->pidlRet); info->pidlRet = ILClone(lptvid->lpifq); + + if (GetName(lptvid->lpsfParent, lptvid->lpi, SHGDN_NORMAL, name)) + SetWindowTextW( GetDlgItem(info->hWnd, IDD_FOLDERTEXT), name ); + browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid );

1 0

Piotr Caban : shell32: Implement "make new folder" functionality in SHBrowseForFolder.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 74c47d0a6709386ea8d28566c5d91fae4d4373e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c47d0a6709386ea8d28566c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 3 13:55:39 2011 +0200 shell32: Implement "make new folder" functionality in SHBrowseForFolder. --- dlls/shell32/brsfolder.c | 120 ++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/brsfolder.c | 2 +- 2 files changed, 111 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3a7a736..48e19cd 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -18,7 +18,6 @@ * FIXME: * - many memory leaks * - many flags unimplemented - * - implement new dialog style "make new folder" button * - implement editbox */ @@ -35,6 +34,7 @@ #include "shell32_main.h" #include "shellapi.h" #include "shresdef.h" +#include "shellfolder.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -489,17 +489,20 @@ static void BrsFolder_CheckValidSelection( browse_info *info, LPTV_ITEMDATA lptv if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) bEnabled = FALSE; } - if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) - { - dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; - r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, - (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || + + dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; + r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, + (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); + if (FAILED(r) || ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) - { + { + if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) bEnabled = FALSE; - } + EnableWindow(GetDlgItem(info->hWnd, IDD_MAKENEWFOLDER), FALSE); } + else + EnableWindow(GetDlgItem(info->hWnd, IDD_MAKENEWFOLDER), TRUE); + SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, bEnabled); } @@ -675,6 +678,103 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) return TRUE; } +static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT BrsFolder_NewFolder(browse_info *info) +{ + DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); + IShellFolder *desktop, *cur; + ISFHelper *sfhelper; + WCHAR name[MAX_PATH]; + HTREEITEM parent, added; + LPTV_ITEMDATA item_data; + LPITEMIDLIST new_item; + TVITEMW item; + HRESULT hr; + int len; + + if(!info->pidlRet) { + ERR("Make new folder button should be disabled\n"); + return E_FAIL; + } + + /* Create new directory */ + hr = SHGetDesktopFolder(&desktop); + if(FAILED(hr)) + return hr; + hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, &IID_IShellFolder, (void**)&cur); + IShellFolder_Release(desktop); + if(FAILED(hr)) + return hr; + + hr = IShellFolder_QueryInterface(cur, &IID_ISFHelper, (void**)&sfhelper); + if(FAILED(hr)) + return hr; + + hr = SHGetPathFromIDListW(info->pidlRet, name); + if(FAILED(hr)) + goto cleanup; + + len = strlenW(name); + if(len<MAX_PATH) + name[len++] = '\\'; + hr = ISFHelper_GetUniqueName(sfhelper, &name[len], MAX_PATH-len); + ISFHelper_Release(sfhelper); + if(FAILED(hr)) + goto cleanup; + + hr = E_FAIL; + if(!CreateDirectoryW(name, NULL)) + goto cleanup; + + /* Update parent of newly created directory */ + parent = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + if(!parent) + goto cleanup; + + SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)parent); + + memset(&item, 0, sizeof(TVITEMW)); + item.mask = TVIF_PARAM|TVIF_STATE; + item.hItem = parent; + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (LPTV_ITEMDATA)item.lParam; + if(!item_data) + goto cleanup; + + if(item_data->pEnumIL) + IEnumIDList_Release(item_data->pEnumIL); + hr = IShellFolder_EnumObjects(cur, info->hwndTreeView, flags, &item_data->pEnumIL); + if(FAILED(hr)) + goto cleanup; + + /* Update treeview */ + if(!(item.state&TVIS_EXPANDEDONCE)) { + item.mask = TVIF_STATE; + item.state = TVIS_EXPANDEDONCE; + item.stateMask = TVIS_EXPANDEDONCE; + SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); + } + + hr = IShellFolder_ParseDisplayName(cur, NULL, NULL, name+len, NULL, &new_item, NULL); + if(FAILED(hr)) + goto cleanup; + + added = InsertTreeViewItem(info, cur, new_item, item_data->lpifq, NULL, parent); + IShellFolder_Release(cur); + SHFree(new_item); + + SendMessageW(info->hwndTreeView, TVM_SORTCHILDREN, FALSE, (LPARAM)parent); + return BrsFolder_Rename(info, added); + +cleanup: + return hr; +} + static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) { LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; @@ -695,7 +795,7 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) return TRUE; case IDD_MAKENEWFOLDER: - FIXME("make new folder not implemented\n"); + BrsFolder_NewFolder(info); return TRUE; } return FALSE; diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index c3e9d3c..03dff74 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -216,7 +216,7 @@ static void test_click_make_new_folder_button(void) pidl = SHBrowseForFolder(&bi); number_of_folders = get_number_of_folders(test_folder_path); - todo_wine ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W95, W98 */, + ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W95, W98 */, "Clicking \"Make New Folder\" button did not result in a new folder.\n"); /* There should be a new folder foo inside the test folder */

1 0

Piotr Caban : shell32: Implement folder renaming in SHBrowseForFolder.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 1226422a08a70084c3328bc713cae7930950b36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1226422a08a70084c3328bc71… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 3 14:42:26 2011 +0200 shell32: Implement folder renaming in SHBrowseForFolder. --- dlls/shell32/brsfolder.c | 49 ++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/brsfolder.c | 4 +- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 48e19cd..71d2d0b 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -574,6 +574,46 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv return 0; } +static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) +{ + LPTV_ITEMDATA item_data; + WCHAR old_path[MAX_PATH], new_path[MAX_PATH], *p; + NMTREEVIEWW nmtv; + TVITEMW item; + + if(!pnmtv->item.pszText) + return 0; + + item.mask = TVIF_HANDLE|TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (LPTV_ITEMDATA)item.lParam; + + SHGetPathFromIDListW(item_data->lpifq, old_path); + if(!(p = strrchrW(old_path, '\\'))) + return 0; + p = new_path+(p-old_path+1); + memcpy(new_path, old_path, (p-new_path)*sizeof(WCHAR)); + strcpyW(p, pnmtv->item.pszText); + + if(!MoveFileW(old_path, new_path)) + return 0; + + SHFree(item_data->lpifq); + SHFree(item_data->lpi); + item_data->lpifq = SHSimpleIDListFromPathW(new_path); + IShellFolder_ParseDisplayName(item_data->lpsfParent, NULL, NULL, + pnmtv->item.pszText, NULL, &item_data->lpi, NULL); + + item.mask = TVIF_HANDLE|TVIF_TEXT; + item.pszText = pnmtv->item.pszText; + SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); + + nmtv.itemNew.lParam = item.lParam; + BrsFolder_Treeview_Changed(info, &nmtv); + return 0; +} + static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh ) { NMTREEVIEWW *pnmtv = (NMTREEVIEWW *)lpnmh; @@ -597,6 +637,10 @@ static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh case TVN_SELCHANGEDW: return BrsFolder_Treeview_Changed( info, pnmtv ); + case TVN_ENDLABELEDITA: + case TVN_ENDLABELEDITW: + return BrsFolder_Treeview_Rename( info, (LPNMTVDISPINFOW)pnmtv ); + default: WARN("unhandled (%d)\n", pnmtv->hdr.code); break; @@ -680,8 +724,9 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) { - FIXME("\n"); - return E_NOTIMPL; + SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)rename); + SendMessageW(info->hwndTreeView, TVM_EDITLABELW, 0, (LPARAM)rename); + return S_OK; } static HRESULT BrsFolder_NewFolder(browse_info *info) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 03dff74..4dea03e 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -222,14 +222,14 @@ static void test_click_make_new_folder_button(void) /* There should be a new folder foo inside the test folder */ strcpy(new_folder_path, test_folder_path); strcat(new_folder_path, new_folder_name); - todo_wine ok(does_folder_or_file_exist(new_folder_path) + ok(does_folder_or_file_exist(new_folder_path) || broken(!does_folder_or_file_exist(new_folder_path)) /* W95, W98, XP, W2K3 */, "The new folder did not get the name %s\n", new_folder_name); /* Dialog should return a pidl pointing to the new folder */ ok(SHGetPathFromIDListA(pidl, new_folder_pidl_path), "SHGetPathFromIDList failed for new folder.\n"); - todo_wine ok(strcmp(new_folder_path, new_folder_pidl_path) == 0 + ok(strcmp(new_folder_path, new_folder_pidl_path) == 0 || broken(strcmp(new_folder_path, new_folder_pidl_path) != 0) /* earlier than Vista */, "SHBrowseForFolder did not return the pidl for the new folder. " "Expected '%s' got '%s'\n", new_folder_path, new_folder_pidl_path);

1 0

Dylan Smith : d3dx9: Implement D3DXFloat32To16Array.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: cac35191b9dde6e3b3f3ffcbeaa099478edf9cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac35191b9dde6e3b3f3ffcbe… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jul 3 03:36:44 2011 -0400 d3dx9: Implement D3DXFloat32To16Array. Derived from patch submitted by Misha Koshelev. Corrected rounding of denormalized numbers. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 9 ++++ 3 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5973d20..19c38c1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -131,7 +131,7 @@ @ stdcall D3DXFilterTexture(ptr ptr long long) @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) -@ stub D3DXFloat32To16Array(ptr ptr long) +@ stdcall D3DXFloat32To16Array(ptr ptr long) @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index fde3e4e..f13f2fb 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -25,6 +25,8 @@ #define NONAMELESSUNION #include "config.h" +#include "wine/port.h" + #include "windef.h" #include "wingdi.h" #include "d3dx9_36_private.h" @@ -1770,6 +1772,103 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4* out, UINT outstride, CON return out; } +static inline unsigned short float_32_to_16(const float in) +{ + int exp = 0, origexp; + float tmp = fabs(in); + int sign = signbit(in); + unsigned int mantissa; + unsigned short ret; + + /* Deal with special numbers */ + if (isinf(in)) return (sign ? 0xffff : 0x7fff); + if (isnan(in)) return (sign ? 0xffff : 0x7fff); + if (in == 0.0f) return (sign ? 0x8000 : 0x0000); + + if (tmp < powf(2, 10)) + { + do + { + tmp *= 2.0f; + exp--; + } while (tmp < powf(2, 10)); + } + else if (tmp >= powf(2, 11)) + { + do + { + tmp /= 2.0f; + exp++; + } while (tmp >= powf(2, 11)); + } + + exp += 10; /* Normalize the mantissa */ + exp += 15; /* Exponent is encoded with excess 15 */ + + origexp = exp; + + mantissa = (unsigned int) tmp; + if ((tmp - mantissa == 0.5f && mantissa % 2 == 1) || /* round half to even */ + (tmp - mantissa > 0.5f)) + { + mantissa++; /* round to nearest, away from zero */ + } + if (mantissa == 2048) + { + mantissa = 1024; + exp++; + } + + if (exp > 31) + { + /* too big */ + ret = 0x7fff; /* INF */ + } + else if (exp <= 0) + { + unsigned int rounding = 0; + + /* Denormalized half float */ + + /* return 0x0000 (=0.0) for numbers too small to represent in half floats */ + if (exp < -11) + return (sign ? 0x8000 : 0x0000); + + exp = origexp; + + /* the 13 extra bits from single precision are used for rounding */ + mantissa = (unsigned int)(tmp * powf(2, 13)); + mantissa >>= 1 - exp; /* denormalize */ + + mantissa -= ~(mantissa >> 13) & 1; /* round half to even */ + /* remove 13 least significant bits to get half float precision */ + mantissa >>= 12; + rounding = mantissa & 1; + mantissa >>= 1; + + ret = mantissa + rounding; + } + else + { + ret = (exp << 10) | (mantissa & 0x3ff); + } + + ret |= ((sign ? 1 : 0) << 15); /* Add the sign */ + return ret; +} + +D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UINT n) +{ + unsigned int i; + + for (i = 0; i < n; ++i) + { + pout[i].value = float_32_to_16(pin[i]); + } + + return pout; +} + /* Native d3dx9's D3DXFloat16to32Array lacks support for NaN and Inf. Specifically, e = 16 is treated as a * regular number - e.g., 0x7fff is converted to 131008.0 and 0xffff to -131008.0. */ static inline float float_16_to_32(const unsigned short in) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index aa3f135..5dbc863 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2257,11 +2257,20 @@ static void test_D3DXFloat_Array(void) }; /* exception on NULL out or in parameter */ + out = D3DXFloat32To16Array(&half, &single, 0); + ok(out == &half, "Got %p, expected %p.\n", out, &half); + out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&half, 0); ok(out == &single, "Got %p, expected %p.\n", out, &single); for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++) { + out = D3DXFloat32To16Array(&half, &testdata[i].single_in, 1); + ok(out == &half, "Got %p, expected %p.\n", out, &half); + ok(half.value == testdata[i].half_ver1 || half.value == testdata[i].half_ver2, + "Got %x, expected %x or %x for index %d.\n", half.value, testdata[i].half_ver1, + testdata[i].half_ver2, i); + out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); ok(out == &single, "Got %p, expected %p.\n", out, &single); ok(relative_error(single, testdata[i].single_out_ver1) < admitted_error,

1 0

Dylan Smith : d3dx9/tests: Added tests for rounding of denormalized number for D3DXFloat32To16Array.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: d621accbea5afa2fdeeaa5daba78fe5fc1b4ff62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d621accbea5afa2fdeeaa5dab… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jul 3 03:36:52 2011 -0400 d3dx9/tests: Added tests for rounding of denormalized number for D3DXFloat32To16Array. --- dlls/d3dx9_36/tests/math.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5dbc863..dd214c2 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2254,6 +2254,11 @@ static void test_D3DXFloat_Array(void) { -NAN, 0xffff, 0xffff, -131008.0f, -131008.0f }, { 0.0f, 0x0, 0x0, 0.0f, 0.0f }, { -0.0f, 0x8000, 0x8000, 0.0f, 0.0f }, + { 2.9809595e-08f, 0x0, 0x0, 0.0f, 0.0f }, + { -2.9809595e-08f, 0x8000, 0x8000, -0.0f, -0.0f }, + { 2.9809598e-08f, 0x1, 0x1, 5.96046e-08f, 5.96046e-08f }, + { -2.9809598e-08f, 0x8001, 0x8001, -5.96046e-08f, -5.96046e-08f }, + { 8.9406967e-08f, 0x2, 0x2, 1.19209e-07f, 1.19209e-07f } }; /* exception on NULL out or in parameter */

1 0

Daniel Verkamp : msvcrt: Add _get_pgmptr and _get_wpgmptr.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 1357589ecaff3b1252f963a19c14ad1662b55f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1357589ecaff3b1252f963a19… Author: Daniel Verkamp <daniel(a)drv.nu> Date: Fri Jul 1 21:42:06 2011 -0700 msvcrt: Add _get_pgmptr and _get_wpgmptr. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/data.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 537c5ca..1a2fa4b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -685,14 +685,14 @@ @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_output_format() msvcrt._get_output_format -@ stub _get_pgmptr +@ cdecl _get_pgmptr(ptr) msvcrt._get_pgmptr @ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected -@ stub _get_wpgmptr +@ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr @ stub _getc_nolock @ cdecl _getch() msvcrt._getch @ stub _getch_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d9b451e..1e14bfc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -529,7 +529,7 @@ @ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver @ cdecl _get_output_format() msvcrt._get_output_format -@ stub _get_pgmptr +@ cdecl _get_pgmptr(ptr) msvcrt._get_pgmptr @ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @@ -540,7 +540,7 @@ @ stub _get_winmajor @ stub _get_winminor @ stub _get_winver -@ stub _get_wpgmptr +@ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr @ cdecl _getch() msvcrt._getch @ stub _getch_nolock @ cdecl _getche() msvcrt._getche diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f2b3770..02cb845 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -519,7 +519,7 @@ @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_output_format() msvcrt._get_output_format -@ stub _get_pgmptr +@ cdecl _get_pgmptr(ptr) msvcrt._get_pgmptr @ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @@ -527,7 +527,7 @@ @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected -@ stub _get_wpgmptr +@ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr @ stub _getc_nolock @ cdecl _getch() msvcrt._getch @ stub _getch_nolock diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 9e9d460..7829846 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -156,6 +156,36 @@ char** CDECL __p__pgmptr(void) { return &MSVCRT__pgmptr; } WCHAR** CDECL __p__wpgmptr(void) { return &MSVCRT__wpgmptr; } /*********************************************************************** + * _get_pgmptr (MSVCRT.@) + */ +int CDECL _get_pgmptr(char** p) +{ + if (!MSVCRT_CHECK_PMT(p)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *p = MSVCRT__pgmptr; + return 0; +} + +/*********************************************************************** + * _get_wpgmptr (MSVCRT.@) + */ +int CDECL _get_wpgmptr(WCHAR** p) +{ + if (!MSVCRT_CHECK_PMT(p)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *p = MSVCRT__wpgmptr; + return 0; +} + +/*********************************************************************** * __p__fmode (MSVCRT.@) */ unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 41d95bc..7d65642 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -480,13 +480,13 @@ @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver(ptr) @ cdecl _get_output_format() -# stub _get_pgmptr(ptr) +@ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) # stub _get_winmajor(ptr) # stub _get_winminor(ptr) # stub _get_winver(ptr) -# stub _get_wpgmptr(ptr) +@ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected

1 0

Alexandre Julliard : kernel32/tests: Add tests for file sharing with file-specific access bits.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 76546888868efe47960993a5609e524cc76f4597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76546888868efe47960993a56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 18:14:06 2011 +0200 kernel32/tests: Add tests for file sharing with file-specific access bits. --- dlls/kernel32/tests/file.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c2523ae..59803c6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1768,16 +1768,30 @@ static BOOL create_fake_dll( LPCSTR filename ) return ret; } +static unsigned int map_file_access( unsigned int access ) +{ + if (access & GENERIC_READ) access |= FILE_GENERIC_READ; + if (access & GENERIC_WRITE) access |= FILE_GENERIC_WRITE; + if (access & GENERIC_EXECUTE) access |= FILE_GENERIC_EXECUTE; + if (access & GENERIC_ALL) access |= FILE_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2 ) { + access1 = map_file_access( access1 ); + access2 = map_file_access( access2 ); + access1 &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA | FILE_EXECUTE | DELETE; + access2 &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA | FILE_EXECUTE | DELETE; + if (!access1) sharing1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; if (!access2) sharing2 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; - if ((access1 & GENERIC_READ) && !(sharing2 & FILE_SHARE_READ)) return 0; - if ((access1 & GENERIC_WRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; + if ((access1 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing2 & FILE_SHARE_READ)) return 0; + if ((access1 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing2 & FILE_SHARE_WRITE)) return 0; if ((access1 & DELETE) && !(sharing2 & FILE_SHARE_DELETE)) return 0; - if ((access2 & GENERIC_READ) && !(sharing1 & FILE_SHARE_READ)) return 0; - if ((access2 & GENERIC_WRITE) && !(sharing1 & FILE_SHARE_WRITE)) return 0; + if ((access2 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing1 & FILE_SHARE_READ)) return 0; + if ((access2 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing1 & FILE_SHARE_WRITE)) return 0; if ((access2 & DELETE) && !(sharing1 & FILE_SHARE_DELETE)) return 0; return 1; } @@ -1786,7 +1800,8 @@ static int is_sharing_map_compatible( DWORD map_access, DWORD access2, DWORD sha { if ((map_access == PAGE_READWRITE || map_access == PAGE_EXECUTE_READWRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; - if ((map_access & SEC_IMAGE) && (access2 & GENERIC_WRITE)) return 0; + access2 = map_file_access( access2 ); + if ((map_access & SEC_IMAGE) && (access2 & FILE_WRITE_DATA)) return 0; return 1; } @@ -1794,7 +1809,12 @@ static void test_file_sharing(void) { static const DWORD access_modes[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ|GENERIC_WRITE, - DELETE, GENERIC_READ|DELETE, GENERIC_WRITE|DELETE, GENERIC_READ|GENERIC_WRITE|DELETE }; + DELETE, GENERIC_READ|DELETE, GENERIC_WRITE|DELETE, GENERIC_READ|GENERIC_WRITE|DELETE, + GENERIC_EXECUTE, GENERIC_EXECUTE | DELETE, + FILE_READ_DATA, FILE_WRITE_DATA, FILE_APPEND_DATA, FILE_READ_EA, FILE_WRITE_EA, + FILE_READ_DATA | FILE_EXECUTE, FILE_WRITE_DATA | FILE_EXECUTE, FILE_APPEND_DATA | FILE_EXECUTE, + FILE_READ_EA | FILE_EXECUTE, FILE_WRITE_EA | FILE_EXECUTE, FILE_EXECUTE, + FILE_DELETE_CHILD, FILE_READ_ATTRIBUTES, FILE_WRITE_ATTRIBUTES }; static const DWORD sharing_modes[] = { 0, FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,

1 0

Louis Lenders : httpapi: Add stub for HttpCreateHttpHandle.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 9916931d4164b7e6adaad0dd248a5daba14a6b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9916931d4164b7e6adaad0dd2… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Jun 25 13:14:20 2011 +0200 httpapi: Add stub for HttpCreateHttpHandle. --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 19 +++++++++++++++++++ include/http.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index a33286a..7e5eede 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -5,7 +5,7 @@ @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter -@ stub HttpCreateHttpHandle +@ stdcall HttpCreateHttpHandle(ptr long) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 7b29a15..3375cb6 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -157,3 +157,22 @@ ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } + +/*********************************************************************** + * HttpCreateHttpHandle (HTTPAPI.@) + * + * Creates a handle to the HTTP request queue + * + * PARAMS + * handle [O] handle to request queue + * reserved [I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpCreateHttpHandle( PHANDLE handle, ULONG reserved ) +{ + FIXME( "(%p, %d): stub!\n", handle, reserved); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index 2e116e5..b42cbca 100644 --- a/include/http.h +++ b/include/http.h @@ -53,6 +53,7 @@ typedef enum _HTTP_SERVICE_CONFIG_ID ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); +ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

André Hentschel : imm32: Test and fix ImmIsUIMessageA/ W.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 7673d67c1e1cfdcdf7560beea9162c3699329aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7673d67c1e1cfdcdf7560beea… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 16:13:41 2011 +0200 imm32: Test and fix ImmIsUIMessageA/W. --- dlls/imm32/imm.c | 58 +++++++++++++++++++++++---------------------- dlls/imm32/tests/imm32.c | 51 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 28 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 00a7c6a..fe394e3 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1885,21 +1885,21 @@ BOOL WINAPI ImmIsUIMessageA( TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || - (msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) || - (msg == WM_MSIME_SERVICE) || - (msg == WM_MSIME_RECONVERTOPTIONS) || - (msg == WM_MSIME_MOUSE) || - (msg == WM_MSIME_RECONVERTREQUEST) || - (msg == WM_MSIME_RECONVERT) || - (msg == WM_MSIME_QUERYPOSITION) || - (msg == WM_MSIME_DOCUMENTFEED)) - - { - if (!IMM_GetThreadData()->hwndDefault) - ImmGetDefaultIMEWnd(NULL); - - if (hWndIME == NULL) - PostMessageA(IMM_GetThreadData()->hwndDefault, msg, wParam, lParam); + (msg == WM_IME_SETCONTEXT) || + (msg == WM_IME_NOTIFY) || + (msg == WM_IME_COMPOSITIONFULL) || + (msg == WM_IME_SELECT) || + (msg == WM_IME_SELECT) || + (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || + (msg == WM_MSIME_RECONVERTOPTIONS) || + (msg == WM_MSIME_MOUSE) || + (msg == WM_MSIME_RECONVERTREQUEST) || + (msg == WM_MSIME_RECONVERT) || + (msg == WM_MSIME_QUERYPOSITION) || + (msg == WM_MSIME_DOCUMENTFEED)) + { + if (hWndIME) + SendMessageA(hWndIME, msg, wParam, lParam); rc = TRUE; } @@ -1913,22 +1913,24 @@ BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { BOOL rc = FALSE; - TRACE("(%p, %d, %ld, %ld):\n", hWndIME, msg, wParam, lParam); + + TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || - (msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) || - (msg == WM_MSIME_SERVICE) || - (msg == WM_MSIME_RECONVERTOPTIONS) || - (msg == WM_MSIME_MOUSE) || - (msg == WM_MSIME_RECONVERTREQUEST) || - (msg == WM_MSIME_RECONVERT) || - (msg == WM_MSIME_QUERYPOSITION) || - (msg == WM_MSIME_DOCUMENTFEED)) - { - if (!IMM_GetThreadData()->hwndDefault) - ImmGetDefaultIMEWnd(NULL); - - if (hWndIME == NULL) - PostMessageW(IMM_GetThreadData()->hwndDefault, msg, wParam, lParam); + (msg == WM_IME_SETCONTEXT) || + (msg == WM_IME_NOTIFY) || + (msg == WM_IME_COMPOSITIONFULL) || + (msg == WM_IME_SELECT) || + (msg == WM_IME_SELECT) || + (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || + (msg == WM_MSIME_RECONVERTOPTIONS) || + (msg == WM_MSIME_MOUSE) || + (msg == WM_MSIME_RECONVERTREQUEST) || + (msg == WM_MSIME_RECONVERT) || + (msg == WM_MSIME_QUERYPOSITION) || + (msg == WM_MSIME_DOCUMENTFEED)) + { + if (hWndIME) + SendMessageW(hWndIME, msg, wParam, lParam); rc = TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 9f40953..39bedb2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -28,6 +28,7 @@ #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); +static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); /* * msgspy - record and analyse message traces sent to a certain window @@ -156,6 +157,7 @@ static BOOL init(void) { hmod = GetModuleHandleA("imm32.dll"); pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); + pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -507,6 +509,54 @@ static void test_ImmThreads(void) todo_wine ok(himc == NULL, "Should not be able to get himc from other process window\n"); } +static void test_ImmIsUIMessage(void) +{ + struct test + { + UINT msg; + BOOL ret; + }; + + static const struct test tests[] = + { + { WM_MOUSEMOVE, FALSE }, + { WM_IME_STARTCOMPOSITION, TRUE }, + { WM_IME_ENDCOMPOSITION, TRUE }, + { WM_IME_COMPOSITION, TRUE }, + { WM_IME_SETCONTEXT, TRUE }, + { WM_IME_NOTIFY, TRUE }, + { WM_IME_CONTROL, FALSE }, + { WM_IME_COMPOSITIONFULL, TRUE }, + { WM_IME_SELECT, TRUE }, + { WM_IME_CHAR, FALSE }, + { 0x287 /* FIXME */, TRUE }, + { WM_IME_REQUEST, FALSE }, + { WM_IME_KEYDOWN, FALSE }, + { WM_IME_KEYUP, FALSE }, + { 0, FALSE } /* mark the end */ + }; + + const struct test *test; + BOOL ret; + + if (!pImmIsUIMessageA) return; + + for (test = tests; test->msg; test++) + { + msg_spy_flush_msgs(); + ret = pImmIsUIMessageA(NULL, test->msg, 0, 0); + ok(ret == test->ret, "ImmIsUIMessageA returned %x for %x\n", ret, test->msg); + ok(!msg_spy_find_msg(test->msg), "Windows does not send 0x%x for NULL hwnd\n", test->msg); + + ret = pImmIsUIMessageA(hwnd, test->msg, 0, 0); + ok(ret == test->ret, "ImmIsUIMessageA returned %x for %x\n", ret, test->msg); + if (ret) + ok(msg_spy_find_msg(test->msg) != NULL, "Windows does send 0x%x\n", test->msg); + else + ok(!msg_spy_find_msg(test->msg), "Windows does not send 0x%x\n", test->msg); + } +} + START_TEST(imm32) { if (init()) { @@ -516,6 +566,7 @@ START_TEST(imm32) { test_ImmIME(); test_ImmAssociateContextEx(); test_ImmThreads(); + test_ImmIsUIMessage(); } cleanup(); }

1 0