February 2022 - Wine-commits

Zebediah Figura : d3dx9: Implement D3DXSHProjectCubeMap().
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: d049e5dc1cfc3ad54fbac7ed53d808f5177c1994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d049e5dc1cfc3ad54fbac7ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 20:03:21 2022 -0600 d3dx9: Implement D3DXSHProjectCubeMap(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_private.h | 2 + dlls/d3dx9_36/math.c | 147 +++++++++++++++++++++++++++++ dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/math.c | 208 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 25 files changed, 379 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d049e5dc1cfc3ad54fba…

1 0

Eric Pouech : msi: Use correct integral type.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 337d7911bfb83b0e775a34c96b67b4e67c1fa871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=337d7911bfb83b0e775a34c9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:49:54 2022 +0100 msi: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 5 +++-- dlls/msi/appsearch.c | 6 ++++-- dlls/msi/assembly.c | 4 ++-- dlls/msi/custom.c | 4 ++-- dlls/msi/database.c | 3 ++- dlls/msi/files.c | 5 +++-- dlls/msi/msi.c | 3 ++- dlls/msi/storages.c | 3 ++- dlls/msi/streams.c | 6 ++++-- dlls/msi/suminfo.c | 7 ++++--- dlls/msi/table.c | 16 ++++++++++------ 11 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8ee9420af55..a1b4eba0b8a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1953,7 +1953,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = ARRAY_SIZE( tmp ); + DWORD len = ARRAY_SIZE( tmp ); if (msi_get_property( db, L"TempFolder", tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -7188,7 +7188,8 @@ static UINT ACTION_InstallAdminPackage( MSIPACKAGE *package ) static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) { MSIQUERY *view; - UINT r, count; + UINT r; + DWORD count; r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `ODBCDriver`", &view ); if (r == ERROR_SUCCESS) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index abd3c9d3fd9..d3a8ccc03f3 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -157,7 +157,8 @@ static void free_signature( MSISIGNATURE *sig ) static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, MSISIGNATURE *sig ) { VS_FIXEDFILEINFO *info; - DWORD attr, size; + DWORD attr; + UINT size; LPWSTR val = NULL; LPBYTE buffer; @@ -622,7 +623,8 @@ static BOOL match_languages( const void *version, const WCHAR *languages ) USHORT id; USHORT codepage; } *lang; - DWORD len, num_ids, i, j; + UINT len, j; + DWORD num_ids, i; BOOL found = FALSE; LANGID *ids; diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 1007979827a..9cddfd2e68d 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -152,7 +152,7 @@ static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) struct assembly_name { - UINT count; + DWORD count; UINT index; WCHAR **attrs; }; @@ -268,7 +268,7 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ IAssemblyName *name; IAssemblyEnum *ret; WCHAR *str; - UINT len = 0; + DWORD len = 0; if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 94c159c6a2a..2f2eedebc31 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -212,7 +212,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = ARRAY_SIZE( tmp ); + DWORD len = ARRAY_SIZE( tmp ); if (msi_get_property( db, L"TempFolder", tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -648,7 +648,7 @@ static DWORD WINAPI custom_client_thread(void *arg) HANDLE thread; HANDLE pipe; DWORD size; - UINT rc; + DWORD rc; CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c84fd1f6440..dd5a6977460 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1362,7 +1362,8 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) { MSIRECORD *colnames; LPWSTR str, val; - UINT r, i = 0, sz = 0; + UINT r, i = 0; + DWORD sz = 0; int cmp; r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &colnames); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 61694ee19ae..8cb876b2468 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -161,7 +161,8 @@ DWORD msi_get_file_version_info( MSIPACKAGE *package, const WCHAR *path, DWORD b VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *filename ) { VS_FIXEDFILEINFO *ptr, *ret; - DWORD version_size, size; + DWORD version_size; + UINT size; void *version; if (!(version_size = msi_get_file_version_info( package, filename, 0, NULL ))) return NULL; @@ -742,7 +743,7 @@ static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEP while ((IAssemblyEnum_GetNextAssembly( iter, NULL, &name, 0 ) == S_OK)) { WCHAR *displayname, *path; - UINT len = 0; + DWORD len = 0; HRESULT hr; hr = IAssemblyName_GetDisplayName( name, NULL, &len, 0 ); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c4c787da4e4..e91959e69f7 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3167,7 +3167,8 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, WCHAR *langbuf, DWORD *langlen ) { UINT ret = ERROR_MORE_DATA; - DWORD len, error; + UINT len; + DWORD error; LPVOID version; VS_FIXEDFILEINFO *ffi; USHORT *lang; diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 336b40a3ae1..8262f601693 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -466,7 +466,8 @@ static INT add_storages_to_table(MSISTORAGESVIEW *sv) IEnumSTATSTG *stgenum = NULL; STATSTG stat; HRESULT hr; - UINT count = 0, size; + UINT count = 0; + ULONG size; hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum); if (FAILED(hr)) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 8f6986039a9..53698f32872 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -448,7 +448,8 @@ static UINT load_streams( MSIDATABASE *db ) IEnumSTATSTG *stgenum; STATSTG stat; HRESULT hr; - UINT count, r = ERROR_SUCCESS; + ULONG count; + UINT r = ERROR_SUCCESS; IStream *stream; hr = IStorage_EnumElements( db->storage, 0, NULL, 0, &stgenum ); @@ -564,7 +565,8 @@ static HRESULT write_stream( IStream *dst, IStream *src ) char buf[4096]; STATSTG stat; LARGE_INTEGER pos; - UINT count, size; + ULONG count; + UINT size; hr = IStream_Stat( src, &stat, STATFLAG_NONAME ); if (FAILED( hr )) return hr; diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 82463be73cc..c0e1e3151ca 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -1103,12 +1103,12 @@ static UINT save_prop( MSISUMMARYINFO *si, HANDLE handle, UINT row ) static const char fmt_begin[] = "%u\t"; static const char data_end[] = "\r\n"; static const char fmt_int[] = "%u"; - UINT r, data_type, len; + UINT r, data_type; SYSTEMTIME system_time; FILETIME file_time; INT int_value; awstring str; - DWORD sz; + DWORD len, sz; str.unicode = FALSE; str.str.a = NULL; @@ -1246,7 +1246,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package ) { MSISUMMARYINFO *si; WCHAR *package_code; - UINT r, len; + UINT r; + DWORD len; awstring str; INT count; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bfddd6125e9..abffe75a1c9 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -66,7 +66,7 @@ struct tagMSITABLE MSICOLUMNINFO *colinfo; UINT col_count; MSICONDITION persistent; - INT ref_count; + LONG ref_count; WCHAR name[1]; }; @@ -2261,9 +2261,10 @@ static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec) return key; } -static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) +static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, DWORD *len ) { - UINT p = 0, l, i, r; + UINT p = 0, i, r; + DWORD l; l = wcslen( tv->name ); if (name && *len > l) @@ -2327,7 +2328,8 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT MSIRECORD *old_rec; MSIQUERY *q; WCHAR *key; - UINT i, p, r, len, qlen; + UINT i, p, r, qlen; + DWORD len; if (!wcscmp( tv->name, L"_Columns" )) { @@ -2503,7 +2505,8 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '"; WCHAR buf[256], *query = buf; - UINT i, p, len, r, qlen; + UINT i, p, r, qlen; + DWORD len; MSIQUERY *q; qlen = p = wcslen( query_pfx ); @@ -2946,7 +2949,8 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) { - UINT r, len; + UINT r; + DWORD len; WCHAR *name; TRACE("%p %p\n", tv, rec);

1 0

Hans Leidekker : msi: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: c3135c632f1df0091afd5d0d62855f3dc7abe247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3135c632f1df0091afd5d0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 7 17:47:05 2022 +0100 msi: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 1 - dlls/msi/action.c | 88 +++++++------- dlls/msi/appsearch.c | 4 +- dlls/msi/assembly.c | 22 ++-- dlls/msi/automation.c | 45 +++---- dlls/msi/classes.c | 16 +-- dlls/msi/custom.c | 42 +++---- dlls/msi/database.c | 51 ++++---- dlls/msi/dialog.c | 41 ++++--- dlls/msi/files.c | 22 ++-- dlls/msi/format.c | 7 +- dlls/msi/handle.c | 8 +- dlls/msi/insert.c | 2 +- dlls/msi/install.c | 64 +++++----- dlls/msi/media.c | 13 +- dlls/msi/msi.c | 323 ++++++++++++++++++++++---------------------------- dlls/msi/msiquery.c | 89 +++++++------- dlls/msi/package.c | 29 +++-- dlls/msi/record.c | 54 ++++----- dlls/msi/registry.c | 219 ++++++++++++++++------------------ dlls/msi/script.c | 6 +- dlls/msi/source.c | 140 ++++++++++------------ dlls/msi/streams.c | 12 +- dlls/msi/string.c | 6 +- dlls/msi/suminfo.c | 72 ++++++----- dlls/msi/table.c | 17 ++- dlls/msi/upgrade.c | 2 +- 27 files changed, 641 insertions(+), 754 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3135c632f1df0091afd…

1 0

Hans Leidekker : msi/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 54b8c8c7eaafd19780cb4d91b763fe2f20327f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b8c8c7eaafd19780cb4d91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 7 17:47:06 2022 +0100 msi/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/action.c | 472 ++++---- dlls/msi/tests/automation.c | 397 +++---- dlls/msi/tests/custom.c | 2 +- dlls/msi/tests/db.c | 164 +-- dlls/msi/tests/format.c | 207 ++-- dlls/msi/tests/install.c | 102 +- dlls/msi/tests/msi.c | 2651 +++++++++++++++++++++---------------------- dlls/msi/tests/package.c | 454 ++++---- dlls/msi/tests/patch.c | 25 +- dlls/msi/tests/record.c | 22 +- dlls/msi/tests/source.c | 654 +++++------ dlls/msi/tests/suminfo.c | 2 +- 13 files changed, 2577 insertions(+), 2576 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54b8c8c7eaafd19780cb…

1 0

Eric Pouech : wordpad: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: e7dda902a0626704bdab654346ece28e3f102e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dda902a0626704bdab6543… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:38 2022 +0100 wordpad: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/Makefile.in | 1 - programs/wordpad/olecallback.c | 8 ++++---- programs/wordpad/wordpad.c | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index e8fc1e38df8..265003a736a 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wordpad.exe IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 diff --git a/programs/wordpad/olecallback.c b/programs/wordpad/olecallback.c index dcfef5898e6..e3bee7f850b 100644 --- a/programs/wordpad/olecallback.c +++ b/programs/wordpad/olecallback.c @@ -107,7 +107,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInsertObject( LPSTORAGE lpstg, LONG cp) { - WINE_TRACE("(%p, %p, %p, %d)\n", This, lpclsid, lpstg, cp); + WINE_TRACE("(%p, %p, %p, %ld)\n", This, lpclsid, lpstg, cp); return S_OK; } @@ -127,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryAcceptData( BOOL fReally, HGLOBAL hMetaPict) { - WINE_TRACE("(%p, %p, %p, %x, %d, %p)\n", + WINE_TRACE("(%p, %p, %p, %lx, %d, %p)\n", This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict); return S_OK; } @@ -146,7 +146,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetClipboardData( DWORD reco, LPDATAOBJECT *lplpdataobj) { - WINE_TRACE("(%p, %p, %x, %p)\n", This, lpchrg, reco, lplpdataobj); + WINE_TRACE("(%p, %p, %lx, %p)\n", This, lpchrg, reco, lplpdataobj); return E_NOTIMPL; } @@ -156,7 +156,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetDragDropEffect( DWORD grfKeyState, LPDWORD pdwEffect) { - WINE_TRACE("(%p, %d, %x, %p)\n", This, fDrag, grfKeyState, pdwEffect); + WINE_TRACE("(%p, %d, %lx, %p)\n", This, fDrag, grfKeyState, pdwEffect); if (pdwEffect) *pdwEffect = DROPEFFECT_COPY; return S_OK; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e87475ad06b..7f79eccc8bb 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2023,7 +2023,7 @@ static LRESULT OnCreate( HWND hWnd ) if (!hEditorWnd) { - fprintf(stderr, "Error code %u\n", GetLastError()); + fprintf(stderr, "Error code %lu\n", GetLastError()); return -1; } assert(hEditorWnd); @@ -2164,7 +2164,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) update_font_list(); - sprintf( buf,"selection = %d..%d, line count=%ld", + sprintf( buf,"selection = %ld..%ld, line count=%Id", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); @@ -2451,7 +2451,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); - sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); + sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data);

1 0

Eric Pouech : wuauserv: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 2e11d97390ddbd52aa0b9ed9a3435e11eebfefe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11d97390ddbd52aa0b9ed9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:44 2022 +0100 wuauserv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wuauserv/Makefile.in | 1 - programs/wuauserv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in index 1e936127167..6bfaf71ddf4 100644 --- a/programs/wuauserv/Makefile.in +++ b/programs/wuauserv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wuauserv.exe IMPORTS = advapi32 diff --git a/programs/wuauserv/main.c b/programs/wuauserv/main.c index 8b360131112..79eb84e6703 100644 --- a/programs/wuauserv/main.c +++ b/programs/wuauserv/main.c @@ -53,7 +53,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

Eric Pouech : wusa: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 827988bd8a3bc2abd7de695c5f2cfdb65768056b URL: https://source.winehq.org/git/wine.git/?a=commit;h=827988bd8a3bc2abd7de695c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:50 2022 +0100 wusa: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 1 - programs/wusa/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index a5702bfe657..171377bc2f2 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wusa.exe IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 diff --git a/programs/wusa/main.c b/programs/wusa/main.c index bcb795a80fa..d1bb385cd06 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1035,7 +1035,7 @@ static void restart_as_x86_64(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); } - else ERR("Failed to restart 64-bit %s, err %u\n", wine_dbgstr_w(filename), GetLastError()); + else ERR("Failed to restart 64-bit %s, err %lu\n", wine_dbgstr_w(filename), GetLastError()); Wow64RevertWow64FsRedirection(redir); ExitProcess(exit_code);

1 0

Eric Pouech : xcopy: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 7dc8e9edc27d74f1820946231bb50a0ec9204a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc8e9edc27d74f182094623… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:56 2022 +0100 xcopy: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/Makefile.in | 1 - programs/xcopy/xcopy.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index f51370405da..b22ff7814ec 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xcopy.exe IMPORTS = shell32 user32 diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 809f24433a3..0f46a6c42ab 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -79,7 +79,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -121,7 +121,7 @@ static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); va_end(parms); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; } @@ -178,7 +178,7 @@ static void XCOPY_FailMessage(DWORD err) { NULL, err, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + WINE_FIXME("FIXME: Cannot display message for error %ld, status %ld\n", err, GetLastError()); } else { XCOPY_wprintf(L"%1\n", lpMsgBuf); @@ -397,7 +397,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if allowed to copy it */ srcAttribs = GetFileAttributesW(copyFrom); - WINE_TRACE("Source attribs: %d\n", srcAttribs); + WINE_TRACE("Source attribs: %ld\n", srcAttribs); if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { @@ -414,7 +414,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); - WINE_TRACE("Dest attribs: %d\n", srcAttribs); + WINE_TRACE("Dest attribs: %ld\n", srcAttribs); /* Check date ranges if a destination file already exists */ if (!skipFile && (flags & OPT_DATERANGE) && @@ -901,7 +901,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; } @@ -995,7 +995,7 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; }

1 0

Zhiyi Zhang : comctl32/treeview: Support HiDPI for unthemed item check boxes.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 35ed21d27aa23fb318a00a769b945f48193f23a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ed21d27aa23fb318a00a76… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 7 16:09:45 2022 +0800 comctl32/treeview: Support HiDPI for unthemed item check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 608ce489e33..e9e2cb37d47 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3011,30 +3011,34 @@ static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { + int nIndex, width, height; RECT rc; HBITMAP hbm, hbmOld; HDC hdc, hdcScreen; - int nIndex; if (TREEVIEW_InitThemedCheckboxes(infoPtr)) return; - infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + width = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + height = width; + infoPtr->himlState = ImageList_Create(width, height, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0); hdc = CreateCompatibleDC(hdcScreen); - hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); + hbm = CreateCompatibleBitmap(hdcScreen, width * 3, height); hbmOld = SelectObject(hdc, hbm); - SetRect(&rc, 0, 0, 48, 16); + SetRect(&rc, 0, 0, width * 3, height); FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); - SetRect(&rc, 18, 2, 30, 14); + rc.left = width; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT); - SetRect(&rc, 34, 2, 46, 14); + rc.left = width * 2; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); @@ -3047,8 +3051,8 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) DeleteDC(hdc); ReleaseDC(0, hdcScreen); - infoPtr->stateImageWidth = 16; - infoPtr->stateImageHeight = 16; + infoPtr->stateImageWidth = width; + infoPtr->stateImageHeight = height; } static void

1 0

Zhiyi Zhang : comctl32/treeview: Use DFCS_MONO style for item check boxes.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: e82d96ed5edaae67060ae9ac993dd29dca166ee0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82d96ed5edaae67060ae9ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 7 16:10:04 2022 +0800 comctl32/treeview: Use DFCS_MONO style for item check boxes. Keep it consistent with Windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e9e2cb37d47..d00bba8e625 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3034,13 +3034,11 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) rc.left = width; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO); rc.left = width * 2; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO | DFCS_CHECKED); SelectObject(hdc, hbmOld); nIndex = ImageList_AddMasked(infoPtr->himlState, hbm,

1 0