wine-commits

wine-commits@winehq.org

1 participants
187673 discussions

Eric Pouech : riched20: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 63a643f7f42ecd0c2625a5f5704b5b9647349e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=63a643f7f42ecd0c2625a5f5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 07:58:07 2022 +0000 riched20: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/editor.c | 33 +++++++++++++++++++-------------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/richole.c | 6 ++++-- dlls/riched20/writer.c | 2 +- 7 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ebc137ebf85..cc5ce90ea42 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -39,14 +39,14 @@ static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL fin } -int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) +int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to) { *from = ME_GetCursorOfs(&editor->pCursors[0]); *to = ME_GetCursorOfs(&editor->pCursors[1]); if (*from > *to) { - int tmp = *from; + LONG tmp = *from; *from = *to; *to = tmp; return 1; @@ -160,7 +160,7 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) /* deselected and caret moved to end of the current selection */ if (from < 0) { - int start, end; + LONG start, end; ME_GetSelectionOfs(editor, &start, &end); if (start != end) { @@ -1353,7 +1353,7 @@ BOOL ME_IsSelection(ME_TextEditor *editor) void ME_DeleteSelection(ME_TextEditor *editor) { - int from, to; + LONG from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); int nEndCursor = nStartCursor ^ 1; ME_DeleteTextAtCursor(editor, nStartCursor, to - from); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 429f023ebe4..ddf619870f1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1567,7 +1567,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre { RTF_Info parser; ME_Style *style; - int from, to, nUndoMode; + LONG from, to; + int nUndoMode; int nEventMask = editor->nEventMask; ME_InStream inStream; BOOL invalidRTF = FALSE; @@ -2087,7 +2088,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) if (ex->flags & GT_SELECTION) { - int from, to; + LONG from, to; int nStartCur = ME_GetSelectionOfs(editor, &from, &to); start = editor->pCursors[nStartCur]; nChars = to - from; @@ -2366,7 +2367,7 @@ HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, i static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) { HRESULT hr; - int offs, count; + LONG offs, count; int start_cursor = ME_GetSelectionOfs( editor, &offs, &count ); ME_Cursor *sel_start = &editor->pCursors[start_cursor]; @@ -2412,7 +2413,7 @@ static BOOL handle_enter(ME_TextEditor *editor) { ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; - int from, to; + LONG from, to; ME_Style *style, *eop_style; if (editor->props & TXTBIT_READONLY) @@ -2689,7 +2690,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) { ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; - int from, to; + LONG from, to; BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; ME_GetSelectionOfs(editor, &from, &to); if (wstr == '\t' && @@ -2845,7 +2846,8 @@ void editor_set_cursor( ME_TextEditor *editor, int x, int y ) else if (ME_IsSelection( editor )) { - int start, end, offset = ME_GetCursorOfs( &pos ); + LONG start, end; + int offset = ME_GetCursorOfs( &pos ); ME_GetSelectionOfs( editor, &start, &end ); if (start <= offset && end >= offset) cursor = cursor_arrow; @@ -3144,7 +3146,8 @@ void link_notify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) { - int from, to, nStartCursor; + LONG from, to; + int nStartCursor; ME_Style *style; nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3279,10 +3282,10 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETSEL: { /* Note: wParam/lParam can be NULL */ - UINT from, to; - PUINT pfrom = wParam ? (PUINT)wParam : &from; - PUINT pto = lParam ? (PUINT)lParam : &to; - ME_GetSelectionOfs(editor, (int *)pfrom, (int *)pto); + LONG from, to; + LONG *pfrom = wParam ? (LONG *)wParam : &from; + LONG *pto = lParam ? (LONG *)lParam : &to; + ME_GetSelectionOfs(editor, pfrom, pto); if ((*pfrom|*pto) & 0xFFFF0000) return -1; return MAKELONG(*pfrom,*pto); @@ -3388,7 +3391,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, { LPWSTR wszText; SETTEXTEX *pStruct = (SETTEXTEX *)wParam; - int from, to, len; + LONG from, to; + int len; ME_Style *style; BOOL bRtf, bUnicode, bSelection, bUTF8; int oldModify = editor->nModifyStep; @@ -3545,7 +3549,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CLEAR: { - int from, to; + LONG from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); ME_CommitUndo(editor); @@ -3660,7 +3664,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam); case EM_GETSELTEXT: { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); + LONG nFrom, nTo; + int nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); ME_Cursor *from = &editor->pCursors[nStartCur]; return get_text_range( editor, (WCHAR *)lParam, from, nTo - nFrom ); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8a46e942581..e0df63ae92d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -182,7 +182,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN; int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) DECLSPEC_HIDDEN; +int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to) DECLSPEC_HIDDEN; int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DECLSPEC_HIDDEN; BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 22cfd74722c..889795de189 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -401,7 +401,7 @@ typedef struct tagME_TextEditor int nUndoLimit; ME_UndoMode nUndoMode; int nParagraphs; - int nLastSelStart, nLastSelEnd; + LONG nLastSelStart, nLastSelEnd; ME_Paragraph *last_sel_start_para, *last_sel_end_para; ME_FontCacheItem pFontCache[HFONT_CACHE_SIZE]; int nZoomNumerator, nZoomDenominator; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6ab7e4de76b..245afff77dc 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -459,7 +459,7 @@ static void draw_run( ME_Context *c, int x, int y, ME_Cursor *cursor ) ME_Row *row; ME_Run *run = cursor->run; int runofs = run_char_ofs( run, cursor->nOffset ); - int nSelFrom, nSelTo; + LONG nSelFrom, nSelTo; if (run->nFlags & MERF_HIDDEN) return; @@ -1248,7 +1248,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) { ME_Paragraph *sel_start, *sel_end; ME_Paragraph *repaint_start = NULL, *repaint_end = NULL; - int nStart, nEnd; + LONG nStart, nEnd; int len = ME_GetTextLength(editor); ME_GetSelectionOfs(editor, &nStart, &nEnd); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..47194096bdc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1254,7 +1254,8 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *iface, CHARRANGE *lpchrg, return E_INVALIDARG; if(!lpchrg) { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo ); + LONG nFrom, nTo; + int nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo ); start = services->editor->pCursors[nStartCur]; nChars = nTo - nFrom; } @@ -4661,7 +4662,8 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str) { struct text_selection *This = impl_from_ITextSelection(me); ME_TextEditor *editor; - int len, to, from; + int len; + LONG to, from; TRACE("(%p)->(%s)\n", This, debugstr_w(str)); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index d6c687daab9..c4f79ce6f5b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1198,7 +1198,7 @@ ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream) int nChars; if (dwFormat & SFF_SELECTION) { - int nStart, nTo; + LONG nStart, nTo; start = editor->pCursors[ME_GetSelectionOfs(editor, &nStart, &nTo)]; nChars = nTo - nStart; } else {

1 0

Eric Pouech : scrobj: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 6483bf162f9dbd5be2925eb2f83d07448b6221ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6483bf162f9dbd5be2925eb2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:39 2022 +0100 scrobj: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 228cfb14904..5537fbb7b88 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1598,7 +1598,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct XmlNodeType node_type; size_t buf_size, size; WCHAR *new_body; - DWORD read; + UINT read; HRESULT hres; TRACE("\n");

1 0

Eric Pouech : setupapi: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: fd8d0babe1ba8efde1d5a251deee43994d2d8eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd8d0babe1ba8efde1d5a251… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:45 2022 +0100 setupapi: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 7 ++++--- dlls/setupapi/queue.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index df39fd440b3..28ef0820ebf 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -826,7 +826,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) { WCHAR lnkpath[MAX_PATH]; LPWSTR cmdline=NULL, lnkpath_end; - unsigned int name_size; + DWORD name_size; INFCONTEXT name_context, context; int attrs=0; @@ -846,7 +846,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, L"SubDir", &context )) { - unsigned int subdir_size; + DWORD subdir_size; if (!SetupGetStringFieldW( &context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &subdir_size )) return TRUE; @@ -878,7 +878,8 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) /* calculate command line */ if (SetupFindFirstLineW( hinf, field, L"CmdLine", &context )) { - unsigned int dir_len=0, subdir_size=0, filename_size=0; + unsigned int dir_len=0; + DWORD subdir_size=0, filename_size=0; int dirid=0; LPCWSTR dir; LPWSTR cmdline_end; diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index dc718cc66fc..e0287f63593 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1275,7 +1275,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour { BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE)); WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH]; - unsigned int len; + DWORD len; TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), debugstr_w(dest), style, handler, context, in_use);

1 0

Eric Pouech : shell32: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: d183986adf3bad5d15accd58d467c2bd467924b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d183986adf3bad5d15accd58… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:51 2022 +0100 shell32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 10 +++++++--- dlls/shell32/shellpath.c | 8 ++++---- dlls/shell32/shlview.c | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 1ca4840dc58..1c61374a732 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -337,9 +337,13 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons static BOOL get_imagelist_icon_size(int list, SIZE *size) { + int cx, cy; if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE; - return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); + if (!ImageList_GetIconSize( shell_imagelists[list], &cx, &cy )) return FALSE; + size->cx = cx; + size->cy = cy; + return TRUE; } /**************************************************************************** @@ -358,8 +362,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) for (i = 0; i < ARRAY_SIZE(hicons); i++) { - get_imagelist_icon_size( i, &size ); - if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) + if (!get_imagelist_icon_size( i, &size ) || + !PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); if (!hicons[i]) goto fail; } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2f1573f8221..2c62f9d4b6a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3677,7 +3677,7 @@ static HRESULT get_known_folder_redirection_place( { HRESULT hr; LPWSTR lpRegistryPath = NULL; - KF_CATEGORY category; + DWORD category; /* first, get known folder's category */ hr = get_known_folder_registry_path(rfid, NULL, &lpRegistryPath); @@ -3918,7 +3918,7 @@ static HRESULT WINAPI knownfolder_GetCategory( hr = E_FAIL; if(SUCCEEDED(hr)) - hr = get_known_folder_dword(knownfolder->registryPath, L"Category", pCategory); + hr = get_known_folder_dword(knownfolder->registryPath, L"Category", (DWORD *)pCategory); return hr; } @@ -3943,7 +3943,7 @@ static HRESULT get_known_folder_path( DWORD dwSize, dwType; WCHAR path[MAX_PATH] = {0}; WCHAR parentGuid[39]; - KF_CATEGORY category; + DWORD category; LPWSTR parentRegistryPath, parentPath; HKEY hRedirectionRootKey = NULL; @@ -4138,7 +4138,7 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( ZeroMemory(pKFD, sizeof(*pKFD)); /* required fields */ - hr = get_known_folder_dword(knownfolder->registryPath, L"Category", &pKFD->category); + hr = get_known_folder_dword(knownfolder->registryPath, L"Category", (DWORD *)&pKFD->category); if(FAILED(hr)) return hr; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 0ffe2e4e9cf..463af7ab92c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3282,7 +3282,7 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedCount( if (FAILED(hr)) return hr; - hr = IShellItemArray_GetCount(selection, count); + hr = IShellItemArray_GetCount(selection, (DWORD *)count); IShellItemArray_Release(selection); return hr; }

1 0

Eric Pouech : taskschd: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 7a0fb40c78488bb0d3373b84d6061f788bc50335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a0fb40c78488bb0d3373b84… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:57 2022 +0100 taskschd: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/regtask.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 094f34d8f79..9a18fed8714 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -158,7 +158,7 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat if (!state) return E_POINTER; - return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, (DWORD *)state); } static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *v_enabled)

1 0

Eric Pouech : user32: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 10e0867f8600d4936a3b0ff0a8678ccbbe41d41a URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e0867f8600d4936a3b0ff0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:03 2022 +0100 user32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/spy.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index fde4b9965ed..eca8c3f115a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); -INT global_key_state_counter = 0; +LONG global_key_state_counter = 0; /*********************************************************************** * get_key_state diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 727094be05d..e4651661ae0 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2045,7 +2045,7 @@ typedef struct WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static int indent_tls_index = TLS_OUT_OF_INDEXES; +static LONG indent_tls_index = TLS_OUT_OF_INDEXES; /*********************************************************************** * get_indent_level diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d1016780658..9e65e9f1f66 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -120,7 +120,7 @@ struct rawinput_thread_data RAWINPUT buffer[1]; /* rawinput message data buffer */ }; -extern INT global_key_state_counter DECLSPEC_HIDDEN; +extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN; extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN; #define WM_IME_INTERNAL 0x287 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f1f70d9802..02891cd34ce 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4192,7 +4192,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) if (process_layout == ~0u) { WCHAR *str, buffer[MAX_PATH]; - DWORD i, len, version_layout = 0; + DWORD i, version_layout = 0; + UINT len; DWORD user_lang = GetUserDefaultLangID(); DWORD *languages; void *data = NULL;

1 0

Eric Pouech : mfplay: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 6c2d0bb9ae6c33e09a3cfecb561665dc83c1305e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2d0bb9ae6c33e09a3cfecb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 15:04:40 2022 +0300 mfplay: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 5abee9d7de8..d7ec7085def 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -657,16 +657,17 @@ static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags) { struct media_item *item = impl_from_IMFPMediaItem(iface); + DWORD value = 0; HRESULT hr; TRACE("%p, %p.\n", iface, flags); *flags = 0; - if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, flags))) + if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, &value))) { - *flags &= (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | - MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); + *flags = value & (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | + MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); } return hr;

1 0

Eric Pouech : mfmediaengine: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 223d2945b5724cc6aed3a458328dd970913d170b URL: https://source.winehq.org/git/wine.git/?a=commit;h=223d2945b5724cc6aed3a458… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:21 2022 +0100 mfmediaengine: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4b5a3f83446..fb8b4b8e9ae 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1074,8 +1074,8 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; - unsigned int stream_count = 0, i; IMFPresentationDescriptor *pd; + DWORD stream_count = 0, i; IMFTopology *topology; UINT64 duration; HRESULT hr;

1 0

Eric Pouech : mfreadwrite: Use correct integral types.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 715a6bfc633da493848ae2315501d465b2d593b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715a6bfc633da493848ae231… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 15:53:31 2022 +0300 mfreadwrite: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index be77e1c5b1d..8ba00e86ff6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -87,7 +87,7 @@ struct media_stream struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; - unsigned int id; + DWORD id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -162,9 +162,9 @@ struct source_reader unsigned int first_audio_stream_index; unsigned int first_video_stream_index; unsigned int last_read_index; - unsigned int stream_count; + DWORD stream_count; unsigned int flags; - unsigned int queue; + DWORD queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -368,8 +368,8 @@ static void source_reader_response_ready(struct source_reader *reader, struct st static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) { IMFMediaBuffer *buffer; - unsigned int flags; LONGLONG time; + DWORD flags; HRESULT hr; IMFSample_CopyAllItems(src, (IMFAttributes *)dst); @@ -1057,7 +1057,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index) { unsigned int i, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; @@ -1095,7 +1095,7 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } -static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) +static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, DWORD *stream_index) { BOOL selected; HRESULT hr; @@ -1814,7 +1814,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG { struct source_reader *reader = impl_from_IMFSourceReader(iface); struct source_reader_async_command *command; - unsigned int i, flags; + unsigned int i; + DWORD flags; HRESULT hr; TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), position); @@ -1871,8 +1872,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - unsigned int actual_index_tmp; struct media_stream *stream; + DWORD actual_index_tmp; LONGLONG timestamp_tmp; DWORD stream_index; HRESULT hr = S_OK; @@ -1931,7 +1932,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind } static HRESULT source_reader_read_sample_async(struct source_reader *reader, unsigned int index, unsigned int flags, - unsigned int *actual_index, unsigned int *stream_flags, LONGLONG *timestamp, IMFSample **sample) + DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { struct source_reader_async_command *command; HRESULT hr; @@ -2166,7 +2167,7 @@ static const IMFSourceReaderVtbl srcreader_vtbl = static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major) { - unsigned int count, i; + DWORD count, i; BOOL selected; HRESULT hr; GUID guid; @@ -2415,8 +2416,9 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { mp4vmagic, L".m4v", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; - unsigned int i, j, length = 0, caps = 0; IMFAttributes *attributes; + DWORD length = 0, caps = 0; + unsigned int i, j; QWORD position; HRESULT hr; @@ -2424,12 +2426,13 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { - IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &length); + UINT32 string_length = 0; + IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &string_length); IMFAttributes_Release(attributes); - } - if (length) - return S_OK; + if (string_length) + return S_OK; + } if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) return hr;

1 0

Eric Pouech : uxtheme: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 208c04111ecb0a2f5b8bd5c716ac592c281651d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=208c04111ecb0a2f5b8bd5c7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:09 2022 +0100 uxtheme: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c0f626d54aa..376d8bc6db9 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); */ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); +static BOOL MSSTYLES_GetNextLong(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LONG *value); static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); @@ -1159,10 +1160,10 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha return img->image; } -static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) +static BOOL MSSTYLES_GetNextLong(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LONG *value) { LPCWSTR cur = lpStringStart; - int total = 0; + LONG total = 0; BOOL gotNeg = FALSE; while(cur < lpStringEnd && (*cur < '0' || *cur > '9' || *cur == '-')) cur++; @@ -1183,6 +1184,11 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, return TRUE; } +static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) +{ + return MSSTYLES_GetNextLong(lpStringStart, lpStringEnd, lpValEnd, (LONG *)value); +} + static inline BOOL isSpace(WCHAR c) { return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; @@ -1377,10 +1383,10 @@ HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect) LPCWSTR lpCur = tp->lpValue; LPCWSTR lpEnd = tp->lpValue + tp->dwValueLen; - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->left); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->top); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->right); - if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->bottom)) { + MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->left); + MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->top); + MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->right); + if(!MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->bottom)) { TRACE("Could not parse rect property\n"); return E_PROP_ID_UNSUPPORTED; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits