August 2009 - Wine-Commits - list.winehq.org

Detlef Riekenberg : ws2_32: Set WSAEINVAL on invalid levels in set+getsockopt.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 3d326eb5a84b16081b1613485143e34177dbfd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d326eb5a84b16081b1613485… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 24 23:39:18 2009 +0200 ws2_32: Set WSAEINVAL on invalid levels in set+getsockopt. --- dlls/ws2_32/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 273f84a..0f6e254 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2126,7 +2126,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; default: - FIXME("Unknown level: 0x%08x\n", level); + WARN("Unknown level: 0x%08x\n", level); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } /* end switch(level) */ } @@ -3277,7 +3278,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; default: - FIXME("Unknown level: 0x%08x\n", level); + WARN("Unknown level: 0x%08x\n", level); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } /* end switch(level) */

1 0

Detlef Riekenberg : ws2_32: Use only the lower 16 bit as level when calling [g|s]etsockopt from 16 bit .
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 3e87a054764f5d1aa99387767dd21be77c712c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e87a054764f5d1aa99387767… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 24 22:32:53 2009 +0200 ws2_32: Use only the lower 16 bit as level when calling [g|s]etsockopt from 16 bit. --- dlls/ws2_32/socket16.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket16.c b/dlls/ws2_32/socket16.c index b4b3fe8..3cd500f 100644 --- a/dlls/ws2_32/socket16.c +++ b/dlls/ws2_32/socket16.c @@ -294,8 +294,9 @@ INT16 WINAPI getsockopt16(SOCKET16 s, INT16 level, INT16 optname, char *optval, INT optlen32; INT *p = &optlen32; INT retVal; + if( optlen ) optlen32 = *optlen; else p = NULL; - retVal = WS_getsockopt( s, level, optname, optval, p ); + retVal = WS_getsockopt( s, (WORD)level, optname, optval, p ); if( optlen ) *optlen = optlen32; return retVal; } @@ -397,7 +398,7 @@ INT16 WINAPI setsockopt16(SOCKET16 s, INT16 level, INT16 optname, char *optval, INT16 optlen) { if( !optval ) return SOCKET_ERROR; - return WS_setsockopt( s, level, optname, optval, optlen ); + return WS_setsockopt( s, (WORD)level, optname, optval, optlen ); } /***********************************************************************

1 0

Alexandre Julliard : winemp3: Include wine/port.h.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 1b3027f3004f35d4b9d01094bf3de75cca14d41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3027f3004f35d4b9d01094b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 11:30:07 2009 +0200 winemp3: Include wine/port.h. --- dlls/winemp3.acm/mpegl3.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 9b4e2ac..eb97e75 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <stdarg.h>

1 0

Michael Stefaniuc : winefile: Compile with -DWINE_NO_UNICODE_MACROS.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: e80b36e7c50d61bf0542583132cefe0e030d6699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80b36e7c50d61bf054258313… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:58 2009 +0200 winefile: Compile with -DWINE_NO_UNICODE_MACROS. --- programs/winefile/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index bd808b5..c5c12c4 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D__WINE__ -DUNICODE +EXTRADEFS = -D__WINE__ -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@

1 0

Michael Stefaniuc : winefile: Use the explicit W-form for the rest of the types.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 9b62d9df20d4fa1cc4a111aee89605385ad7958b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b62d9df20d4fa1cc4a111aee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:52 2009 +0200 winefile: Use the explicit W-form for the rest of the types. --- programs/winefile/winefile.c | 78 +++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b62d9df20d4fa1cc4a11…

1 0

Michael Stefaniuc : winefile: Replace the TSTR types with WSTR.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: e75b496d00c6c32413972478a293556fe794dabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75b496d00c6c32413972478a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:46 2009 +0200 winefile: Replace the TSTR types with WSTR. --- programs/winefile/winefile.c | 132 +++++++++++++++++++++--------------------- 1 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e75b496d00c6c32413972…

1 0

Michael Stefaniuc : winefile: Replace TCHAR with WCHAR.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 21049ffb1fcc9d87fc6570a524729bd302fe923a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21049ffb1fcc9d87fc6570a52… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:41 2009 +0200 winefile: Replace TCHAR with WCHAR. --- programs/winefile/winefile.c | 170 +++++++++++++++++++++--------------------- programs/winefile/winefile.h | 4 +- 2 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21049ffb1fcc9d87fc657…

1 0

Michael Stefaniuc : winefile: Convert the rest of the functions to use the explicit W-form.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 575b7bf36cdf94a91438696cf147d3db46ce634f URL: http://source.winehq.org/git/wine.git/?a=commit;h=575b7bf36cdf94a91438696cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:36 2009 +0200 winefile: Convert the rest of the functions to use the explicit W-form. --- programs/winefile/winefile.c | 100 +++++++++++++++++++++--------------------- programs/winefile/winefile.h | 2 +- 2 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=575b7bf36cdf94a914386…

1 0

Michael Stefaniuc : winefile: Use the explicit W-form for the file IO related functions.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 4d512dbe32df3d09277944f5b8a224ea9407f42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d512dbe32df3d09277944f5b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:30 2009 +0200 winefile: Use the explicit W-form for the file IO related functions. --- programs/winefile/winefile.c | 50 +++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 800c043..46da97e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -381,7 +381,7 @@ static void read_directory_win(Entry* dir, LPCTSTR path) p[0] = '*'; p[1] = '\0'; - hFind = FindFirstFile(buffer, &w32fd); + hFind = FindFirstFileW(buffer, &w32fd); if (hFind != INVALID_HANDLE_VALUE) { do { @@ -415,7 +415,7 @@ static void read_directory_win(Entry* dir, LPCTSTR path) lstrcpyW(p, entry->data.cFileName); - hFile = CreateFile(buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + hFile = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if (hFile != INVALID_HANDLE_VALUE) { @@ -427,7 +427,7 @@ static void read_directory_win(Entry* dir, LPCTSTR path) #endif last = entry; - } while(FindNextFile(hFind, &w32fd)); + } while(FindNextFileW(hFind, &w32fd)); if (last) last->next = NULL; @@ -884,7 +884,7 @@ static Entry* read_tree_shell(Root* root, LPITEMIDLIST pidl, SORT_ORDER sortOrde static void fill_w32fdata_shell(IShellFolder* folder, LPCITEMIDLIST pidl, SFGAOF attribs, WIN32_FIND_DATA* w32fdata) { if (!(attribs & SFGAO_FILESYSTEM) || - FAILED(SHGetDataFromIDList(folder, pidl, SHGDFIL_FINDDATA, w32fdata, sizeof(WIN32_FIND_DATA)))) { + FAILED(SHGetDataFromIDListW(folder, pidl, SHGDFIL_FINDDATA, w32fdata, sizeof(WIN32_FIND_DATAW)))) { WIN32_FILE_ATTRIBUTE_DATA fad; IDataObject* pDataObj; @@ -902,7 +902,7 @@ static void fill_w32fdata_shell(IShellFolder* folder, LPCITEMIDLIST pidl, SFGAOF LPCTSTR path = (LPCTSTR)GlobalLock(medium.UNION_MEMBER(hGlobal)); UINT sem_org = SetErrorMode(SEM_FAILCRITICALERRORS); - if (GetFileAttributesEx(path, GetFileExInfoStandard, &fad)) { + if (GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) { w32fdata->dwFileAttributes = fad.dwFileAttributes; w32fdata->ftCreationTime = fad.ftCreationTime; w32fdata->ftLastAccessTime = fad.ftLastAccessTime; @@ -1309,8 +1309,8 @@ static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, #if !defined(_NO_EXTENSIONS) && defined(__WINE__) if (*path == '/') { - /* read unix file system tree */ - root->drive_type = GetDriveType(path); + /* read unix file system tree */ + root->drive_type = GetDriveTypeW(path); lstrcatW(drv, sSlash); load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); @@ -1324,10 +1324,10 @@ static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, #endif /* read WIN32 file system tree */ - root->drive_type = GetDriveType(path); + root->drive_type = GetDriveTypeW(path); lstrcatW(drv, sBackslash); - GetVolumeInformation(drv, root->volname, _MAX_FNAME, 0, 0, &root->fs_flags, root->fs, _MAX_DIR); + GetVolumeInformationW(drv, root->volname, _MAX_FNAME, 0, 0, &root->fs_flags, root->fs, _MAX_DIR); lstrcpyW(root->path, drv); @@ -1850,12 +1850,12 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCTSTR st static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - DWORD dwVersionDataLen = GetFileVersionInfoSize(strFilename, NULL); + DWORD dwVersionDataLen = GetFileVersionInfoSizeW(strFilename, NULL); if (dwVersionDataLen) { dlg->pVersionData = HeapAlloc(GetProcessHeap(), 0, dwVersionDataLen); - if (GetFileVersionInfo(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { + if (GetFileVersionInfoW(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { LPVOID pVal; UINT nValLen; @@ -2200,12 +2200,12 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM _wsplitpath(root, drv, 0, 0, 0); - if (!SetCurrentDirectory(drv)) { + if (!SetCurrentDirectoryW(drv)) { display_error(hwnd, GetLastError()); return 0; } - GetCurrentDirectory(MAX_PATH, path); /*TODO: store last directory per drive */ + GetCurrentDirectoryW(MAX_PATH, path); /*TODO: store last directory per drive */ child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) @@ -2219,7 +2219,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM TCHAR path[MAX_PATH]; ChildWnd* child; - GetCurrentDirectory(MAX_PATH, path); + GetCurrentDirectoryW(MAX_PATH, path); child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) @@ -2346,7 +2346,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM if (activate_fs_window(RS(b1,IDS_SHELL))) break; - GetCurrentDirectory(MAX_PATH, path); + GetCurrentDirectoryW(MAX_PATH, path); child = alloc_child_window(path, get_path_pidl(path,hwnd), hwnd); if (!create_child_window(child)) @@ -2804,7 +2804,7 @@ static void set_space_status(void) ULARGE_INTEGER ulFreeBytesToCaller, ulTotalBytes, ulFreeBytes; TCHAR fmt[64], b1[64], b2[64], buffer[BUFFER_LEN]; - if (GetDiskFreeSpaceEx(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { + if (GetDiskFreeSpaceExW(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { format_bytes(b1, ulFreeBytesToCaller.QuadPart); format_bytes(b2, ulTotalBytes.QuadPart); wsprintfW(buffer, RS(fmt,IDS_FREE_SPACE_FMT), b1, b2); @@ -3678,7 +3678,7 @@ static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd) SetWindowTextW(child->hwnd, path); if (path[0]) - if (SetCurrentDirectory(path)) + if (SetCurrentDirectoryW(path)) set_space_status(); } @@ -3731,7 +3731,7 @@ static void create_drive_bar(void) int btn = 1; PTSTR p; - GetLogicalDriveStrings(BUFFER_LEN, Globals.drives); + GetLogicalDriveStringsW(BUFFER_LEN, Globals.drives); Globals.hdrivebar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn, @@ -3772,7 +3772,7 @@ static void create_drive_bar(void) TCHAR b[3] = {tolower(*p)}; SendMessageW(Globals.hdrivebar, TB_ADDSTRINGW, 0, (LPARAM)b); #endif - switch(GetDriveType(p)) { + switch(GetDriveTypeW(p)) { case DRIVE_REMOVABLE: drivebarBtn.iBitmap = 1; break; case DRIVE_CDROM: drivebarBtn.iBitmap = 3; break; case DRIVE_REMOTE: drivebarBtn.iBitmap = 4; break; @@ -3980,7 +3980,7 @@ static void update_view_menu(ChildWnd* child) static BOOL is_directory(LPCTSTR target) { /*TODO correctly handle UNIX paths */ - DWORD target_attr = GetFileAttributes(target); + DWORD target_attr = GetFileAttributesW(target); if (target_attr == INVALID_FILE_ATTRIBUTES) return FALSE; @@ -4278,7 +4278,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM #endif /* _NO_EXTENSIONS */ case WM_SETFOCUS: - if (SetCurrentDirectory(child->path)) + if (SetCurrentDirectoryW(child->path)) set_space_status(); SetFocus(child->focus_pane? child->right.hwnd: child->left.hwnd); break; @@ -4313,7 +4313,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM source[lstrlenW(source)+1] = '\0'; target[lstrlenW(target)+1] = '\0'; - if (!SHFileOperation(&shfo)) + if (!SHFileOperationW(&shfo)) refresh_child(child); } break;} @@ -4327,7 +4327,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM source[lstrlenW(source)+1] = '\0'; target[lstrlenW(target)+1] = '\0'; - if (!SHFileOperation(&shfo)) + if (!SHFileOperationW(&shfo)) refresh_child(child); } break;} @@ -4340,7 +4340,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM path[lstrlenW(path)+1] = '\0'; - if (!SHFileOperation(&shfo)) + if (!SHFileOperationW(&shfo)) refresh_child(child); break;} @@ -4688,7 +4688,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) /*TODO: read paths from registry */ if (!path || !*path) { - GetCurrentDirectory(MAX_PATH, buffer); + GetCurrentDirectoryW(MAX_PATH, buffer); path = buffer; }

1 0

Michael Stefaniuc : winefile: Use the explicit W-form of the Load*() functions.
by Alexandre Julliard Aug. 25, 2009

Aug. 25, 2009

Module: wine Branch: master Commit: 05db8d5dd1621fe77060a544539631373a5c575b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05db8d5dd1621fe77060a5445… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:25 2009 +0200 winefile: Use the explicit W-form of the Load*() functions. --- programs/winefile/winefile.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7b6a7cf..800c043 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -213,7 +213,7 @@ static void format_longlong(LPWSTR ret, ULONGLONG val) /* load resource string */ static LPTSTR load_string(LPTSTR buffer, DWORD size, UINT id) { - LoadString(Globals.hInstance, id, buffer, size); + LoadStringW(Globals.hInstance, id, buffer, size); return buffer; } @@ -473,7 +473,7 @@ static Entry* read_tree_win(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWND LPCTSTR s = path; PTSTR d = buffer; - HCURSOR old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + HCURSOR old_cursor = SetCursor(LoadCursorW(0, (LPCWSTR)IDC_WAIT)); #ifndef _NO_EXTENSIONS entry->etype = ET_WINDOWS; @@ -634,7 +634,7 @@ static Entry* read_tree_unix(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWN LPCTSTR s = path; PTSTR d = buffer; - HCURSOR old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + HCURSOR old_cursor = SetCursor(LoadCursorW(0, (LPCWSTR)IDC_WAIT)); entry->etype = ET_UNIX; @@ -835,7 +835,7 @@ static Entry* read_tree_shell(Root* root, LPITEMIDLIST pidl, SORT_ORDER sortOrde IShellFolder* child = NULL; HRESULT hr; - HCURSOR old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + HCURSOR old_cursor = SetCursor(LoadCursorW(0, (LPCWSTR)IDC_WAIT)); #ifndef _NO_EXTENSIONS entry->etype = ET_SHELL; @@ -2359,7 +2359,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM case ID_ABOUT: ShellAbout(hwnd, RS(b1,IDS_WINEFILE), NULL, - LoadImage( Globals.hInstance, MAKEINTRESOURCE(IDI_WINEFILE), + LoadImageW( Globals.hInstance, MAKEINTRESOURCEW(IDI_WINEFILE), IMAGE_ICON, 48, 48, LR_SHARED )); break; @@ -3528,7 +3528,7 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) static void scan_entry(ChildWnd* child, Entry* entry, int idx, HWND hwnd) { TCHAR path[MAX_PATH]; - HCURSOR old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + HCURSOR old_cursor = SetCursor(LoadCursorW(0, (LPCWSTR)IDC_WAIT)); /* delete sub entries in left pane */ for(;;) { @@ -4169,7 +4169,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM ScreenToClient(hwnd, &pt); if (pt.x>=child->split_pos-SPLIT_WIDTH/2 && pt.x<child->split_pos+SPLIT_WIDTH/2+1) { - SetCursor(LoadCursor(0, IDC_SIZEWE)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_SIZEWE)); return TRUE; } } @@ -4226,7 +4226,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM resize_tree(child, rt.right, rt.bottom); last_split = -1; ReleaseCapture(); - SetCursor(LoadCursor(0, IDC_ARROW)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } break; @@ -4557,17 +4557,12 @@ static void InitInstance(HINSTANCE hinstance) wcFrame.cbClsExtra = 0; wcFrame.cbWndExtra = 0; wcFrame.hInstance = hinstance; - wcFrame.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDI_WINEFILE)); - wcFrame.hCursor = LoadCursor(0, IDC_ARROW); + wcFrame.hIcon = LoadIconW(hinstance, MAKEINTRESOURCEW(IDI_WINEFILE)); + wcFrame.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcFrame.hbrBackground = 0; wcFrame.lpszMenuName = 0; wcFrame.lpszClassName = sWINEFILEFRAME; - wcFrame.hIconSm = (HICON)LoadImage(hinstance, - MAKEINTRESOURCE(IDI_WINEFILE), - IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - LR_SHARED); + wcFrame.hIconSm = LoadImageW(hinstance, MAKEINTRESOURCEW(IDI_WINEFILE), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); Globals.hframeClass = RegisterClassEx(&wcFrame); @@ -4580,7 +4575,7 @@ static void InitInstance(HINSTANCE hinstance) wcChild.cbWndExtra = 0; wcChild.hInstance = hinstance; wcChild.hIcon = 0; - wcChild.hCursor = LoadCursor(0, IDC_ARROW); + wcChild.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcChild.hbrBackground = 0; wcChild.lpszMenuName = 0; wcChild.lpszClassName = sWINEFILETREE; @@ -4588,7 +4583,7 @@ static void InitInstance(HINSTANCE hinstance) hChildClass = RegisterClass(&wcChild); - Globals.haccel = LoadAccelerators(hinstance, MAKEINTRESOURCE(IDA_WINEFILE)); + Globals.haccel = LoadAcceleratorsW(hinstance, MAKEINTRESOURCEW(IDA_WINEFILE)); Globals.hfont = CreateFont(-MulDiv(8,GetDeviceCaps(hdc,LOGPIXELSY),72), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, sFont); @@ -4637,7 +4632,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) return TRUE; opts = load_registry_settings(); - hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); + hMenuFrame = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(IDM_WINEFILE)); hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); Globals.hMenuFrame = hMenuFrame; @@ -4719,7 +4714,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) SetWindowPlacement(child->hwnd, &child->pos); - Globals.himl = ImageList_LoadBitmap(Globals.hInstance, MAKEINTRESOURCE(IDB_IMAGES), 16, 0, RGB(0,255,0)); + Globals.himl = ImageList_LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDB_IMAGES), 16, 0, RGB(0,255,0), IMAGE_BITMAP, 0); Globals.prescan_node = FALSE;

1 0