September 2007 - Wine-commits

Juan Lang : crypt32: Partially implement CryptQueryObject.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 8e1151ec182a49c5b6641a928af3bf1b2429e143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1151ec182a49c5b6641a928… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 25 14:45:29 2007 -0700 crypt32: Partially implement CryptQueryObject. --- dlls/crypt32/Makefile.in | 2 + dlls/crypt32/main.c | 13 -- dlls/crypt32/object.c | 471 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 473 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e1151ec182a49c5b6641…

1 0

Alex Villacís Lasso : riched20: EM_SETCHARFORMAT must return 1 on success, not 0.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: fa5230fb54a2f0c57acf5ce800f6279b5b64b2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5230fb54a2f0c57acf5ce80… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Sep 25 15:11:14 2007 -0500 riched20: EM_SETCHARFORMAT must return 1 on success, not 0. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a10c954..f90c353 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1748,7 +1748,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_CommitUndo(editor); if (bRepaint) ME_RewrapRepaint(editor); - return 0; + return 1; } case EM_GETCHARFORMAT: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1c564ec..7a092c3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -366,7 +366,8 @@ static void test_EM_SETTEXTMODE(void) /*EM_SETCHARFORMAT is not yet fully implemented for all WPARAMs in wine; however, SCF_ALL has been implemented*/ - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "wine"); /*Select the string "wine"*/ @@ -379,7 +380,8 @@ static void test_EM_SETTEXTMODE(void) /*Reset the formatting to default*/ cf2.dwEffects = CFE_ITALIC^cf2.dwEffects; - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); /*Clear the text in the control*/ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) ""); @@ -472,6 +474,7 @@ static void test_TM_PLAINTEXT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2 cf2, cf2test; CHARRANGE cr; + int rc = 0; /*Switch to plain text mode*/ @@ -494,7 +497,10 @@ static void test_TM_PLAINTEXT(void) cf2.dwMask = CFM_BOLD | cf2.dwMask; cf2.dwEffects = CFE_BOLD ^ cf2.dwEffects; - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); + todo_wine { + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + } /*Get the formatting of those characters*/ @@ -534,7 +540,8 @@ static void test_TM_PLAINTEXT(void) SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, (LPARAM) &cf2); cf2.dwMask |= CFM_ITALIC; cf2.dwEffects ^= CFE_ITALIC; - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); /*Set the text in the control to "wine", which will be bold and italicized*/ @@ -1472,6 +1479,8 @@ static void test_EM_GETMODIFY(void) cf2.dwMask = CFM_ITALIC | cf2.dwMask; cf2.dwEffects = CFE_ITALIC ^ cf2.dwEffects; SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + result = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(result == 1, "EM_SETCHARFORMAT returned %ld instead of 1\n", result); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_SETCHARFORMAT\n");

1 0

Thomas Weidenmueller : shell32: Implement SHCreatePropSheetExtArrayEx.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 1244e8c7d4f433345e9a3ad5e285044ec61673d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1244e8c7d4f433345e9a3ad5e… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Tue Sep 25 11:58:40 2007 -0600 shell32: Implement SHCreatePropSheetExtArrayEx. --- dlls/shell32/shell32.spec | 4 ++-- dlls/shell32/shellord.c | 10 +++++++++- include/shlobj.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 9beb6d3..6928538 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -156,7 +156,7 @@ 165 stdcall -noname SHCreateDirectory(long ptr) 166 stdcall -noname CallCPLEntry16(long long long long long long) 167 stdcall -noname SHAddFromPropSheetExtArray(long long long) - 168 stdcall -noname SHCreatePropSheetExtArray(long str long) + 168 stdcall -noname SHCreatePropSheetExtArray(long wstr long) 169 stdcall -noname SHDestroyPropSheetExtArray(long) 170 stdcall -noname SHReplaceFromPropSheetExtArray(long long long long) 171 stdcall -noname PathCleanupSpec(ptr ptr) @@ -182,7 +182,7 @@ 191 stdcall -noname SHUpdateImageA(str long long long) 192 stdcall -noname SHUpdateImageW(wstr long long long) 193 stdcall -noname SHHandleUpdateImage(ptr) - 194 stub SHCreatePropSheetExtArrayEx + 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) 195 stdcall -noname SHFree(ptr) 196 stdcall -noname SHAlloc(long) 197 stub SHGlobalDefect diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 52c2934..e3b77cf 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1588,6 +1588,14 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd */ HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface) { + return SHCreatePropSheetExtArrayEx(hKey, pszSubKey, max_iface, NULL); +} + +/************************************************************************* + * SHCreatePropSheetExtArrayEx [SHELL32.194] + */ +HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj) +{ static const WCHAR szPropSheetSubKey[] = {'s','h','e','l','l','e','x','\\','P','r','o','p','e','r','t','y','S','h','e','e','t','H','a','n','d','l','e','r','s',0}; WCHAR szHandler[64]; DWORD dwHandlerLen; @@ -1652,7 +1660,7 @@ HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_if { if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, NULL, hKey))) + if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) { /* Add the IShellPropSheetExt instance to the array */ psxa->pspsx[psxa->uiCount++] = pspsx; diff --git a/include/shlobj.h b/include/shlobj.h index cd5562d..d93a69d 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -43,6 +43,7 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM LPVOID WINAPI SHAlloc(ULONG); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); +HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); #define SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString)

1 0

Andrew Talbot : itss: Fix a typo.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: edac40ad3c512168c44bbcf3d1e69992c627cc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edac40ad3c512168c44bbcf3d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 25 21:59:30 2007 +0100 itss: Fix a typo. --- dlls/itss/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index dd30c7d..d7f3f42 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -216,7 +216,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, res = chm_resolve_object(chm_file, object_name, &chm_object); if(res != CHM_RESOLVE_SUCCESS) { WARN("Could not resolve chm object\n"); - HeapFree(GetProcessHeap(), 0, object_name); + HeapFree(GetProcessHeap(), 0, file_name); chm_close(chm_file); return report_result(pOIProtSink, STG_E_FILENOTFOUND); }

1 0

Alexandre Julliard : wineps.drv: Fix end of list check in PSDRV_UpdateDevCaps().
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 000736ae116535728a3e99822da365cd8213bf80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000736ae116535728a3e99822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 12:11:51 2007 +0200 wineps.drv: Fix end of list check in PSDRV_UpdateDevCaps(). --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 82ed439..0d1ddd1 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -177,7 +177,7 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) break; } - if(!page) { + if(&page->entry == &physDev->pi->ppd->PageSizes) { FIXME("Can't find page\n"); physDev->ImageableArea.left = 0; physDev->ImageableArea.right = 0;

1 0

EA Durbin : winecfg: Implement audio test.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 70c20d7d4e06307647971072f387e10cf88a4931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c20d7d4e06307647971072f… Author: EA Durbin <ead1234(a)hotmail.com> Date: Tue Sep 25 00:00:35 2007 -0500 winecfg: Implement audio test. --- programs/winecfg/audio.c | 3 ++- programs/winecfg/idw_testsound.wav | Bin 0 -> 12348 bytes programs/winecfg/resource.h | 1 + programs/winecfg/winecfg.rc | 3 +++ 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 071c13d..89fee96 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -730,7 +730,8 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) configureAudioDriver(hDlg); break; case IDC_AUDIO_TEST: - MessageBox(NULL, "Audio Test not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); + if(!PlaySound(MAKEINTRESOURCE(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)) + MessageBox(NULL, "Audio test failed!", "Error", MB_OK | MB_ICONERROR); break; case IDC_AUDIO_CONTROL_PANEL: MessageBox(NULL, "Launching audio control panel not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); diff --git a/programs/winecfg/idw_testsound.wav b/programs/winecfg/idw_testsound.wav new file mode 100644 index 0000000..63574ae Binary files /dev/null and b/programs/winecfg/idw_testsound.wav differ diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 0166f71..3eadd19 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -173,6 +173,7 @@ #define IDS_AUDIO_MISSING 1309 #define IDC_DSOUND_RATES 1310 #define IDC_DSOUND_BITS 1311 +#define IDW_TESTSOUND 1312 #define IDS_ACCEL_FULL 8300 #define IDS_ACCEL_STANDARD 8301 #define IDS_ACCEL_BASIC 8302 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index a26a544..f11aa72 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -56,3 +56,6 @@ IDB_WINE BITMAP idb_wine.bmp /* @makedep: idb_checkbox.bmp */ IDB_CHECKBOX BITMAP idb_checkbox.bmp + +/* @makedep: idw_testsound.wav */ +IDW_TESTSOUND WAVE idw_testsound.wav

1 0

Mikołaj Zalewski : shell32: Make the shell view control Unicode.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 212c36048a381af11b424a6fe901d69de92a760b URL: http://source.winehq.org/git/wine.git/?a=commit;h=212c36048a381af11b424a6fe… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 25 23:56:57 2007 -0700 shell32: Make the shell view control Unicode. --- dlls/shell32/shlview.c | 55 ++++++++++++++++++++++++----------------------- include/shlobj.h | 1 - 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 6dd27da..f64e09e 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -68,6 +68,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static const WCHAR SV_CLASS_NAME[] = {'S','H','E','L','L','D','L','L','_','D','e','f','V','i','e','w',0}; + typedef struct { BOOL bIsAscending; INT nHeaderID; @@ -324,8 +326,8 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) if (This->FolderSettings.fFlags & FWF_NOCLIENTEDGE) dwExStyle &= ~WS_EX_CLIENTEDGE; - This->hWndList=CreateWindowExA( dwExStyle, - WC_LISTVIEWA, + This->hWndList=CreateWindowExW( dwExStyle, + WC_LISTVIEWW, NULL, dwStyle, 0,0,0,0, @@ -1257,7 +1259,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpnmh) { LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)lpnmh; - NMLVDISPINFOA *lpdi = (NMLVDISPINFOA *)lpnmh; + NMLVDISPINFOW *lpdi = (NMLVDISPINFOW *)lpnmh; LPITEMIDLIST pidl; TRACE("%p CtlID=%u lpnmh->code=%x\n",This,CtlID,lpnmh->code); @@ -1302,8 +1304,8 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn if (OnDefaultCommand(This) != S_OK) ShellView_OpenSelectedItems(This); break; - case HDN_ENDTRACKA: - TRACE("-- HDN_ENDTRACKA %p\n",This); + case HDN_ENDTRACKW: + TRACE("-- HDN_ENDTRACKW %p\n",This); /*nColumn1 = ListView_GetColumnWidth(This->hWndList, 0); nColumn2 = ListView_GetColumnWidth(This->hWndList, 1);*/ break; @@ -1338,7 +1340,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - SendMessageA(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); + SendMessageW(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; case LVN_GETDISPINFOA: @@ -1354,13 +1356,15 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd); if (lpnmh->code == LVN_GETDISPINFOA) { - StrRetToStrNA( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",lpdi->item.pszText); + /* shouldn't happen */ + NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; + StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n",lpdiA->item.pszText); } else /* LVN_GETDISPINFOW */ { - StrRetToStrNW( ((NMLVDISPINFOW *)lpdi)->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",debugstr_w((WCHAR*)(lpdi->item.pszText))); + StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n",debugstr_w(lpdi->item.pszText)); } } else @@ -1411,7 +1415,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } break; - case LVN_BEGINLABELEDITA: + case LVN_BEGINLABELEDITW: { DWORD dwAttr = SFGAO_CANRENAME; pidl = (LPITEMIDLIST)lpdi->item.lParam; @@ -1426,30 +1430,27 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn return TRUE; } - case LVN_ENDLABELEDITA: + case LVN_ENDLABELEDITW: { TRACE("-- LVN_ENDLABELEDITA %p\n",This); if (lpdi->item.pszText) { HRESULT hr; - WCHAR wszNewName[MAX_PATH]; - LVITEMA lvItem; + LVITEMW lvItem; lvItem.iItem = lpdi->item.iItem; lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); pidl = (LPITEMIDLIST)lpdi->item.lParam; - if (!MultiByteToWideChar( CP_ACP, 0, lpdi->item.pszText, -1, wszNewName, MAX_PATH )) - wszNewName[MAX_PATH-1] = 0; - hr = IShellFolder_SetNameOf(This->pSFParent, 0, pidl, wszNewName, SHGDN_INFOLDER, &pidl); + hr = IShellFolder_SetNameOf(This->pSFParent, 0, pidl, lpdi->item.pszText, SHGDN_INFOLDER, &pidl); if(SUCCEEDED(hr) && pidl) { lvItem.mask = LVIF_PARAM; lvItem.lParam = (LPARAM)pidl; - SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); return TRUE; } } @@ -1586,14 +1587,14 @@ static LRESULT ShellView_OnChange(IShellViewImpl * This, LPITEMIDLIST * Pidls, L static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); - LPCREATESTRUCTA lpcs; + LPCREATESTRUCTW lpcs; TRACE("(hwnd=%p msg=%x wparm=%lx lparm=%lx)\n",hWnd, uMessage, wParam, lParam); switch (uMessage) { case WM_NCCREATE: - lpcs = (LPCREATESTRUCTA)lParam; + lpcs = (LPCREATESTRUCTW)lParam; pThis = (IShellViewImpl*)(lpcs->lpCreateParams); SetWindowLongPtrW(hWnd, GWLP_USERDATA, (ULONG_PTR)pThis); pThis->hWnd = hWnd; /*set the window handle*/ @@ -1631,7 +1632,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara break; } - return DefWindowProcA (hWnd, uMessage, wParam, lParam); + return DefWindowProcW(hWnd, uMessage, wParam, lParam); } /********************************************************** * @@ -1847,7 +1848,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow( { IShellViewImpl *This = (IShellViewImpl *)iface; - WNDCLASSA wc; + WNDCLASSW wc; *phWnd = 0; @@ -1871,7 +1872,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow( } /*if our window class has not been registered, then do so*/ - if(!GetClassInfoA(shell32_hInstance, SV_CLASS_NAME, &wc)) + if(!GetClassInfoW(shell32_hInstance, SV_CLASS_NAME, &wc)) { ZeroMemory(&wc, sizeof(wc)); wc.style = CS_HREDRAW | CS_VREDRAW; @@ -1880,16 +1881,16 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow( wc.cbWndExtra = 0; wc.hInstance = shell32_hInstance; wc.hIcon = 0; - wc.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1); wc.lpszMenuName = NULL; wc.lpszClassName = SV_CLASS_NAME; - if(!RegisterClassA(&wc)) + if(!RegisterClassW(&wc)) return E_FAIL; } - *phWnd = CreateWindowExA(0, + *phWnd = CreateWindowExW(0, SV_CLASS_NAME, NULL, WS_CHILD | WS_TABSTOP, diff --git a/include/shlobj.h b/include/shlobj.h index 77e09cc..cd5562d 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -149,7 +149,6 @@ typedef struct */ typedef GUID SHELLVIEWID; -#define SV_CLASS_NAME ("SHELLDLL_DefView") #define FCIDM_SHVIEWFIRST 0x0000 /* undocumented */

1 0

Mikołaj Zalewski : shell32: shlview: Change some more ANSI calls to Unicode.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 4db3b1bba868924665258d80c138d4c9655b90a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db3b1bba868924665258d80c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 25 22:58:31 2007 -0700 shell32: shlview: Change some more ANSI calls to Unicode. --- dlls/shell32/shlview.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f64e09e..b1d8e34 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -292,8 +292,8 @@ static void SetStyle(IShellViewImpl * This, DWORD dwAdd, DWORD dwRemove) TRACE("(%p)\n", This); - tmpstyle = GetWindowLongA(This->hWndList, GWL_STYLE); - SetWindowLongA(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); + tmpstyle = GetWindowLongW(This->hWndList, GWL_STYLE); + SetWindowLongW(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); } /********************************************************** @@ -528,11 +528,11 @@ static int LV_FindItemByPidl( IShellViewImpl * This, LPCITEMIDLIST pidl) { - LVITEMA lvItem; + LVITEMW lvItem; lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; for(lvItem.iItem = 0; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); lvItem.iItem++) { LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam; @@ -550,7 +550,7 @@ static int LV_FindItemByPidl( */ static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) { - LVITEMA lvItem; + LVITEMW lvItem; TRACE("(%p)(pidl=%p)\n", This, pidl); @@ -558,9 +558,9 @@ static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) lvItem.iItem = ListView_GetItemCount(This->hWndList); /*add the item to the end of the list*/ lvItem.iSubItem = 0; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ - lvItem.pszText = LPSTR_TEXTCALLBACKA; /*get text on a callback basis*/ + lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - return (-1==ListView_InsertItemA(This->hWndList, &lvItem))? FALSE: TRUE; + return (-1==ListView_InsertItemW(This->hWndList, &lvItem))? FALSE: TRUE; } /********************************************************** @@ -582,7 +582,7 @@ static BOOLEAN LV_DeleteItem(IShellViewImpl * This, LPCITEMIDLIST pidl) static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCITEMIDLIST pidlNew ) { int nItem; - LVITEMA lvItem; + LVITEMW lvItem; TRACE("(%p)(pidlold=%p pidlnew=%p)\n", This, pidlOld, pidlNew); @@ -591,14 +591,14 @@ static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCIT { lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); SHFree((LPITEMIDLIST)lvItem.lParam); lvItem.mask = LVIF_PARAM; lvItem.iItem = nItem; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidlNew)); /* set the item's data */ - SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); - SendMessageA(This->hWndList, LVM_UPDATE, nItem, 0); + SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_UPDATE, nItem, 0); return TRUE; /* FIXME: better handling */ } return FALSE; @@ -721,8 +721,8 @@ static LRESULT ShellView_OnCreate(IShellViewImpl * This) * ShellView_BuildFileMenu() */ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) -{ CHAR szText[MAX_PATH]; - MENUITEMINFOA mii; +{ WCHAR szText[MAX_PATH]; + MENUITEMINFOW mii; int nTools,i; HMENU hSubMenu; @@ -736,7 +736,7 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) /*add the menu items*/ for(i = 0; i < nTools; i++) { - LoadStringA(shell32_hInstance, Tools[i].idMenuString, szText, MAX_PATH); + LoadStringW(shell32_hInstance, Tools[i].idMenuString, szText, MAX_PATH); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -754,7 +754,7 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) mii.fType = MFT_SEPARATOR; } /* tack This item onto the end of the menu */ - InsertMenuItemA(hSubMenu, (UINT)-1, TRUE, &mii); + InsertMenuItemW(hSubMenu, (UINT)-1, TRUE, &mii); } } TRACE("-- return (menu=%p)\n",hSubMenu); @@ -810,7 +810,7 @@ static void ShellView_MergeViewMenu(IShellViewImpl * This, HMENU hSubMenu) */ static UINT ShellView_GetSelections(IShellViewImpl * This) { - LVITEMA lvItem; + LVITEMW lvItem; UINT i = 0; SHFree(This->apidl); @@ -829,7 +829,7 @@ static UINT ShellView_GetSelections(IShellViewImpl * This) lvItem.iItem = 0; lvItem.iSubItem = 0; - while(ListView_GetItemA(This->hWndList, &lvItem) && (i < This->cidl)) + while(ListView_GetItemW(This->hWndList, &lvItem) && (i < This->cidl)) { if(lvItem.state & LVIS_SELECTED) { @@ -1980,7 +1980,7 @@ static HRESULT WINAPI IShellView_fnSelectItem( if (i != -1) { - LVITEMA lvItem; + LVITEMW lvItem; if(uFlags & SVSI_ENSUREVISIBLE) SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); @@ -1990,7 +1990,7 @@ static HRESULT WINAPI IShellView_fnSelectItem( lvItem.iItem = 0; lvItem.iSubItem = 0; - while(SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem)) + while(SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem)) { if (lvItem.iItem == i) { @@ -2007,7 +2007,7 @@ static HRESULT WINAPI IShellView_fnSelectItem( if (uFlags & SVSI_DESELECTOTHERS) lvItem.state &= ~LVIS_SELECTED; } - SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); lvItem.iItem++; } @@ -2213,7 +2213,7 @@ static HRESULT drag_notify_subitem(IShellViewImpl *This, DWORD grfKeyState, POIN DWORD *pdwEffect) { LVHITTESTINFO htinfo; - LVITEMA lvItem; + LVITEMW lvItem; LONG lResult; HRESULT hr; RECT clientRect; @@ -2271,7 +2271,7 @@ static HRESULT drag_notify_subitem(IShellViewImpl *This, DWORD grfKeyState, POIN lvItem.mask = LVIF_PARAM; lvItem.iItem = lResult; lvItem.iSubItem = 0; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1,

1 0

Mikolaj Zalewski : advapi32: Make ConvertSidToStringSid use helper functions of ConvertSecurityDescriptorToStringSecurityDescriptor .
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 6d5d0eaafa26e245bbbde725bbbb2c7c0f82fb7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5d0eaafa26e245bbbde725b… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Sep 25 13:13:38 2007 -0700 advapi32: Make ConvertSidToStringSid use helper functions of ConvertSecurityDescriptorToStringSecurityDescriptor. --- dlls/advapi32/security.c | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3dfe504..9323c07 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4000,37 +4000,19 @@ BOOL WINAPI ConvertStringSidToSidA(LPCSTR StringSid, PSID* Sid) */ BOOL WINAPI ConvertSidToStringSidW( PSID pSid, LPWSTR *pstr ) { - DWORD sz, i; - LPWSTR str; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; - SID* pisid=pSid; + DWORD len = 0; + LPWSTR wstr, wptr; TRACE("%p %p\n", pSid, pstr ); - if( !IsValidSid( pSid ) ) - return FALSE; - - if (pisid->Revision != SDDL_REVISION) - return FALSE; - if (pisid->IdentifierAuthority.Value[0] || - pisid->IdentifierAuthority.Value[1]) - { - FIXME("not matching MS' bugs\n"); + len = 0; + if (!DumpSidNumeric(pSid, NULL, &len)) return FALSE; - } - - sz = 14 + pisid->SubAuthorityCount * 11; - str = LocalAlloc( 0, sz*sizeof(WCHAR) ); - sprintfW( str, fmt, pisid->Revision, MAKELONG( - MAKEWORD( pisid->IdentifierAuthority.Value[5], - pisid->IdentifierAuthority.Value[4] ), - MAKEWORD( pisid->IdentifierAuthority.Value[3], - pisid->IdentifierAuthority.Value[2] ) ) ); - for( i=0; i<pisid->SubAuthorityCount; i++ ) - sprintfW( str + strlenW(str), subauthfmt, pisid->SubAuthority[i] ); - *pstr = str; + wstr = wptr = LocalAlloc(0, (len+1) * sizeof(WCHAR)); + DumpSidNumeric(pSid, &wptr, NULL); + *wptr = 0; + *pstr = wstr; return TRUE; }

1 0

Mikolaj Zalewski : wine.inf: add four keys found on Windows XP to Active Setup\Installed Components.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 74bc7c091f91d95c4087e3df0b7c601bd510cc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bc7c091f91d95c4087e3df0… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Sep 25 14:22:07 2007 -0700 wine.inf: add four keys found on Windows XP to Active Setup\Installed Components. --- tools/wine.inf | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index b051aa0..cfad301 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -335,6 +335,28 @@ HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" +; Some apps requires at least four subkeys of Active Setup\Installed Components +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,""

1 0