From 74d2244e947f931407faaa0629c73c59837b0b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 17 Oct 2012 07:48:24 -0400 Subject: [PATCH] libwinpr-path: fix Windows build --- client/Windows/wf_event.c | 9 ++++-- .../libwinpr/path/include/PathAllocCombine.c | 2 +- winpr/libwinpr/path/include/PathCchAppend.c | 2 +- winpr/libwinpr/path/path.c | 32 ++++++++++++------- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c index 1840314c7..d12b972c3 100644 --- a/client/Windows/wf_event.c +++ b/client/Windows/wf_event.c @@ -119,7 +119,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam) return CallNextHookEx(NULL, nCode, wParam, lParam); } -static int xf_event_process_WM_MOUSEWHEEL(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +static int wf_event_process_WM_MOUSEWHEEL(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { int delta; int flags; @@ -127,7 +127,8 @@ static int xf_event_process_WM_MOUSEWHEEL(wfInfo* wfi, HWND hWnd, UINT Msg, WPAR DefWindowProc(hWnd, Msg, wParam, lParam); input = wfi->instance->input; - delta = ((signed short)HIWORD(wParam)); /* GET_WHEEL_DELTA_WPARAM(wParam); */ + delta = ((signed short) HIWORD(wParam)); /* GET_WHEEL_DELTA_WPARAM(wParam); */ + if (delta > 0) { flags = PTR_FLAGS_WHEEL | 0x0078; @@ -136,7 +137,9 @@ static int xf_event_process_WM_MOUSEWHEEL(wfInfo* wfi, HWND hWnd, UINT Msg, WPAR { flags = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; } + input->MouseEvent(input, flags, 0, 0); + return 0; } @@ -196,7 +199,7 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam break; case WM_MOUSEWHEEL: - xf_event_process_WM_MOUSEWHEEL(wfi, hWnd, Msg, wParam, lParam, FALSE); + wf_event_process_WM_MOUSEWHEEL(wfi, hWnd, Msg, wParam, lParam); break; case WM_SETCURSOR: diff --git a/winpr/libwinpr/path/include/PathAllocCombine.c b/winpr/libwinpr/path/include/PathAllocCombine.c index 06484cb7b..9db12126f 100644 --- a/winpr/libwinpr/path/include/PathAllocCombine.c +++ b/winpr/libwinpr/path/include/PathAllocCombine.c @@ -59,7 +59,7 @@ HRESULT PATH_ALLOC_COMBINE(PCWSTR pszPathIn, PCWSTR pszMore, unsigned long dwFla if (backslashIn) swprintf_s(pszPathOut, sizeOfBuffer, L"%s%s", pszPathIn, pszMore); else - swprintf_s(pszPathOut, sizeOfBuffer, L"%s" L _PATH_SEPARATOR_STR L"%s", pszPathIn, pszMore); + swprintf_s(pszPathOut, sizeOfBuffer, L"%s" _PATH_SEPARATOR_STR L"%s", pszPathIn, pszMore); *ppszPathOut = pszPathOut; diff --git a/winpr/libwinpr/path/include/PathCchAppend.c b/winpr/libwinpr/path/include/PathCchAppend.c index 6fe38ca0c..e1126321f 100644 --- a/winpr/libwinpr/path/include/PathCchAppend.c +++ b/winpr/libwinpr/path/include/PathCchAppend.c @@ -48,7 +48,7 @@ HRESULT PATH_CCH_APPEND(PWSTR pszPath, size_t cchPath, PCWSTR pszMore) { if ((pszPathLength + pszMoreLength + 1) < cchPath) { - swprintf_s(&pszPath[pszPathLength], cchPath - pszPathLength, L _PATH_SEPARATOR_STR L"%s", pszMore); + swprintf_s(&pszPath[pszPathLength], cchPath - pszPathLength, _PATH_SEPARATOR_STR L"%s", pszMore); return S_OK; } } diff --git a/winpr/libwinpr/path/path.c b/winpr/libwinpr/path/path.c index 59dcf5b1d..d46380635 100644 --- a/winpr/libwinpr/path/path.c +++ b/winpr/libwinpr/path/path.c @@ -27,18 +27,28 @@ #include -#define PATH_SLASH_STR "/" #define PATH_SLASH_CHR '/' +#define PATH_SLASH_STR "/" -#define PATH_BACKSLASH_STR "\\" #define PATH_BACKSLASH_CHR '\\' +#define PATH_BACKSLASH_STR "\\" #ifdef _WIN32 -#define PATH_SEPARATOR_STR PATH_BACKSLASH_STR -#define PATH_SEPARATOR_CHR PATH_BACKSLASH_CHR +#define PATH_SLASH_STR_W L"/" +#define PATH_BACKSLASH_STR_W L"\\" +#else +#define PATH_SLASH_STR_W "/" +#define PATH_BACKSLASH_STR_W "\\" +#endif + +#ifdef _WIN32 +#define PATH_SEPARATOR_CHR PATH_BACKSLASH_CHR +#define PATH_SEPARATOR_STR PATH_BACKSLASH_STR +#define PATH_SEPARATOR_STR_W PATH_BACKSLASH_STR_W #else -#define PATH_SEPARATOR_STR PATH_SLASH_STR #define PATH_SEPARATOR_CHR PATH_SLASH_CHR +#define PATH_SEPARATOR_STR PATH_SLASH_STR +#define PATH_SEPARATOR_STR_W PATH_SLASH_STR_W #endif #define SHARED_LIBRARY_EXT_DLL "dll" @@ -269,7 +279,7 @@ HRESULT PathCchRemoveBackslashExW(PWSTR pszPath, size_t cchPath, PWSTR* ppszEnd, #define DEFINE_UNICODE TRUE #define _PATH_SEPARATOR_CHR PATH_BACKSLASH_CHR -#define _PATH_SEPARATOR_STR PATH_BACKSLASH_STR +#define _PATH_SEPARATOR_STR PATH_BACKSLASH_STR_W #define PATH_CCH_APPEND PathCchAppendW #include "include/PathCchAppend.c" #undef DEFINE_UNICODE @@ -379,7 +389,7 @@ HRESULT PathCchCombineExW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, #define DEFINE_UNICODE TRUE #define _PATH_SEPARATOR_CHR PATH_BACKSLASH_CHR -#define _PATH_SEPARATOR_STR PATH_BACKSLASH_STR +#define _PATH_SEPARATOR_STR PATH_BACKSLASH_STR_W #define PATH_ALLOC_COMBINE PathAllocCombineW #include "include/PathAllocCombine.c" #undef DEFINE_UNICODE @@ -401,7 +411,7 @@ HRESULT PathCchCombineExW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, #define DEFINE_UNICODE TRUE #define _PATH_SEPARATOR_CHR PATH_SLASH_CHR -#define _PATH_SEPARATOR_STR PATH_SLASH_STR +#define _PATH_SEPARATOR_STR PATH_SLASH_STR_W #define PATH_ALLOC_COMBINE UnixPathAllocCombineW #include "include/PathAllocCombine.c" #undef DEFINE_UNICODE @@ -423,7 +433,7 @@ HRESULT PathCchCombineExW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, #define DEFINE_UNICODE TRUE #define _PATH_SEPARATOR_CHR PATH_SEPARATOR_CHR -#define _PATH_SEPARATOR_STR PATH_SEPARATOR_STR +#define _PATH_SEPARATOR_STR PATH_SEPARATOR_STR_W #define PATH_ALLOC_COMBINE NativePathAllocCombineW #include "include/PathAllocCombine.c" #undef DEFINE_UNICODE @@ -637,7 +647,7 @@ HRESULT PathCchRemoveFileSpecW(PWSTR pszPath, size_t cchPath) HRESULT PathCchConvertStyleA(PSTR pszPath, size_t cchPath, unsigned long dwFlags) { - int index; + size_t index; if (dwFlags & PATH_STYLE_WINDOWS) { @@ -694,7 +704,7 @@ HRESULT PathCchConvertStyleA(PSTR pszPath, size_t cchPath, unsigned long dwFlags HRESULT PathCchConvertStyleW(PWSTR pszPath, size_t cchPath, unsigned long dwFlags) { - int index; + size_t index; if (dwFlags & PATH_STYLE_WINDOWS) {