February 2022 - Wine-Commits

Eric Pouech : services/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 0f6184bf03534dab1280dac921530a96af42eaa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f6184bf03534dab1280dac9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:40 2022 +0100 services/tests: 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/services/tests/Makefile.in | 1 - programs/services/tests/service.c | 150 ++++++++++++++++++------------------ 2 files changed, 75 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f6184bf03534dab1280…

1 0

Eric Pouech : schtasks/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 6e41b512ec95def0f479f671cf6874218cdac74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e41b512ec95def0f479f671… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:34 2022 +0100 schtasks/tests: 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/schtasks/tests/Makefile.in | 1 - programs/schtasks/tests/schtasks.c | 42 ++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in index 23cb744ff15..dcf641c4b13 100644 --- a/programs/schtasks/tests/Makefile.in +++ b/programs/schtasks/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schtasks.exe IMPORTS = ole32 diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index c0f4ce78365..c1168d4b209 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -74,7 +74,7 @@ static DWORD _run_command(unsigned line, const char *cmd) strcpy(command, cmd); r = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); - ok_(__FILE__,line)(r, "CreateProcess failed: %u\n", GetLastError()); + ok_(__FILE__,line)(r, "CreateProcess failed: %lu\n", GetLastError()); if(!r) return -1; ret = WaitForSingleObject(pi.hProcess, 10000); @@ -83,7 +83,7 @@ static DWORD _run_command(unsigned line, const char *cmd) TerminateProcess(pi.hProcess, -1); r = GetExitCodeProcess(pi.hProcess, &ret); - ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %u\n", GetLastError()); + ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %lu\n", GetLastError()); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -107,7 +107,7 @@ static void _register_task(unsigned line, const char *task_name_a) hres = ITaskFolder_RegisterTask(root, task_name, xml, TASK_CREATE, empty, empty, TASK_LOGON_NONE, empty, &task); - ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08lx\n", hres); HeapFree(GetProcessHeap(), 0, task_name); HeapFree(GetProcessHeap(), 0, xml); @@ -123,7 +123,7 @@ static void _unregister_task(unsigned line, const char *task_name_a) task_name = a2w(task_name_a); hres = ITaskFolder_DeleteTask(root, task_name, 0); - ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08lx\n", hres); HeapFree(GetProcessHeap(), 0, task_name); } @@ -141,7 +141,7 @@ static void create_file(const char *file_name, const char *data) return; r = WriteFile(file, data, strlen(data), &size, NULL); - ok(r, "WriteFile failed: %u\n", GetLastError()); + ok(r, "WriteFile failed: %lu\n", GetLastError()); CloseHandle(file); } @@ -153,17 +153,17 @@ static BOOL initialize_task_service(void) hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if(hres != S_OK) { - ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08x\n", hres); + ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08lx\n", hres); win_skip("Task service not available\n"); return FALSE; } V_VT(&empty) = VT_EMPTY; hres = ITaskService_Connect(service, empty, empty, empty, empty); - ok(hres == S_OK, "Connect failed: %08x\n", hres); + ok(hres == S_OK, "Connect failed: %08lx\n", hres); hres = ITaskService_GetFolder(service, NULL, &root); - ok(hres == S_OK, "GetFolder error %08x\n", hres); + ok(hres == S_OK, "GetFolder error %08lx\n", hres); return TRUE; } @@ -180,51 +180,51 @@ START_TEST(schtasks) } r = run_command("schtasks"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); register_task("winetest"); r = run_command("schtasks /change /tn winetest /enable"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); unregister_task("winetest"); r = run_command("schtasks /change /tn winetest /enable"); - ok(r == 1, "r = %u\n", r); + ok(r == 1, "r = %lu\n", r); register_task("wine\\test\\winetest"); r = run_command("schtasks /CHANGE /tn wine\\test\\winetest /enable"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /delete /f /tn wine\\test\\winetest"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); - ok(r == 1, "r = %u\n", r); + ok(r == 1, "r = %lu\n", r); create_file("test.xml", xml_a); r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /change /tn wine\\winetest /enable"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /create /xml test.xml /f /tn wine\\winetest"); - ok(r == 0, "r = %u\n", r); /* task already exists, but /f argument provided */ + ok(r == 0, "r = %lu\n", r); /* task already exists, but /f argument provided */ r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); - ok(r == 1, "r = %u\n", r); /* task already exists */ + ok(r == 1, "r = %lu\n", r); /* task already exists */ r = run_command("schtasks /create /tn wine\\winetest"); - ok(r == E_FAIL, "r = %x\n", r); /* missing arguments */ + ok(r == E_FAIL, "r = %lx\n", r); /* missing arguments */ r = run_command("schtasks /Delete /f /tn wine\\winetest"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = DeleteFileA("test.xml"); - ok(r, "DeleteFileA failed: %u\n", GetLastError()); + ok(r, "DeleteFileA failed: %lu\n", GetLastError()); ITaskFolder_DeleteFolder(root, wine_testW, 0); ITaskFolder_DeleteFolder(root, wineW, 0);

1 0

Eric Pouech : regedit/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: acdbe6c2965268886e756c20586363afbc7ab36c URL: https://source.winehq.org/git/wine.git/?a=commit;h=acdbe6c2965268886e756c20… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:22 2022 +0100 regedit/tests: 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/regedit/tests/Makefile.in | 1 - programs/regedit/tests/regedit.c | 80 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acdbe6c2965268886e75…

1 0

Alistair Leslie-Hughes : dplayx: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 2a74dc51f254330be106331f64710cd2e12fc5d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a74dc51f254330be106331f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 3 20:43:50 2022 +1100 dplayx: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/Makefile.in | 1 - dlls/dplayx/dplay.c | 198 +++++++++++++++++++++--------------------- dlls/dplayx/dplaysp.c | 34 ++++---- dlls/dplayx/dplayx_global.c | 24 ++--- dlls/dplayx/dplayx_main.c | 2 +- dlls/dplayx/dplayx_messages.c | 18 ++-- dlls/dplayx/dplobby.c | 68 +++++++-------- dlls/dplayx/lobbysp.c | 4 +- 8 files changed, 174 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a74dc51f254330be106…

1 0

Eric Pouech : mfplat: Use correct integral types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 98c0f3dac4af52a172f202527a31fd4c80c661fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c0f3dac4af52a172f20252… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:25:42 2022 +0300 mfplat: 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/mfplat/buffer.c | 7 ++++--- dlls/mfplat/main.c | 8 +++++--- dlls/mfplat/mediatype.c | 26 +++++++++++++++----------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 9081dc39eab..f161bb29d80 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -49,7 +49,7 @@ struct buffer struct { BYTE *linear_buffer; - unsigned int plane_size; + DWORD plane_size; BYTE *scanline0; unsigned int width; @@ -1306,9 +1306,10 @@ static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc) static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - unsigned int stride, max_length, plane_size; - struct buffer *object; + unsigned int stride, max_length; unsigned int row_alignment; + struct buffer *object; + DWORD plane_size; GUID subtype; BOOL is_yuv; HRESULT hr; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e2f892ed91d..e79f59d41dd 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -702,9 +702,10 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; - DWORD size, ret; WCHAR str[250]; UINT8 *blob; + UINT32 size; + DWORD ret; guid_to_string(buffer, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); @@ -6094,8 +6095,9 @@ static const IRtwqAsyncCallbackVtbl source_resolver_callback_url_vtbl = static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler) { - unsigned int j = 0, name_length, type; + DWORD name_length, type; HRESULT hr = E_FAIL; + unsigned int j = 0; WCHAR clsidW[39]; CLSID clsid; @@ -9207,7 +9209,7 @@ static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom) { ULARGE_INTEGER q1, q0, rhat; ULARGE_INTEGER v, cmp1, cmp2; - unsigned int s = 0; + DWORD s = 0; v.QuadPart = llabs(denom); diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 4f24ccbd237..41dbda572d5 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2926,8 +2926,10 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) format->nChannels = value; - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec); - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value))) + format->nSamplesPerSec = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value))) + format->nAvgBytesPerSec = value; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) format->nBlockAlign = value; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) @@ -2939,7 +2941,8 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) format_ext->Samples.wSamplesPerBlock = value; - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &value))) + format_ext->dwChannelMask = value; memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat)); } @@ -3085,8 +3088,8 @@ HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaT return S_OK; } -static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, - UINT32 *denominator) +static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, DWORD *numerator, + DWORD *denominator) { UINT64 value; @@ -3102,7 +3105,7 @@ static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UIN */ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) { - UINT32 flags, palette_size = 0, avgrate; + UINT32 flags, palette_size = 0, value; MFVIDEOFORMAT *format; INT32 stride; GUID guid; @@ -3162,11 +3165,12 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)) && stride < 0) format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &avgrate))) - format->compressedInfo.AvgBitrate = avgrate; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &avgrate))) - format->compressedInfo.AvgBitErrorRate = avgrate; - IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &format->compressedInfo.MaxKeyFrameSpacing); + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &value))) + format->compressedInfo.AvgBitrate = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &value))) + format->compressedInfo.AvgBitErrorRate = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &value))) + format->compressedInfo.MaxKeyFrameSpacing = value; /* Palette. */ if (palette_size)

1 0

Eric Pouech : xcopy/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: a07882ecaca45e5aaed83f0c941aa76812d01c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07882ecaca45e5aaed83f0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:52 2022 +0100 xcopy/tests: 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/tests/Makefile.in | 1 - programs/xcopy/tests/xcopy.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/xcopy/tests/Makefile.in b/programs/xcopy/tests/Makefile.in index 5fb76fe2d20..3b3d5d5bdc5 100644 --- a/programs/xcopy/tests/Makefile.in +++ b/programs/xcopy/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xcopy.exe C_SRCS = \ diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c index 17b4406b74c..fa3d5328a1b 100644 --- a/programs/xcopy/tests/xcopy.c +++ b/programs/xcopy/tests/xcopy.c @@ -56,18 +56,18 @@ static void test_date_format(void) DWORD rc; rc = runcmd("xcopy /D:20-01-2000 xcopy1 xcopytest"); - ok(rc == 4, "xcopy /D:d-m-y test returned rc=%u\n", rc); + ok(rc == 4, "xcopy /D:d-m-y test returned rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, "xcopy should not have created xcopytest\\xcopy1\n"); rc = runcmd("xcopy /D:01-20-2000 xcopy1 xcopytest"); - ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, "xcopy did not create xcopytest\\xcopy1\n"); DeleteFileA("xcopytest\\xcopy1"); rc = runcmd("xcopy /D:1-20-2000 xcopy1 xcopytest"); - ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, "xcopy did not create xcopytest\\xcopy1\n"); DeleteFileA("xcopytest\\xcopy1"); @@ -78,12 +78,12 @@ static void test_parms_syntax(void) DWORD rc; rc = runcmd("xcopy /H/D:20-01-2000 xcopy1 xcopytest"); - ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%u\n", rc); + ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, "xcopy should not have created xcopytest\\xcopy1\n"); rc = runcmd("xcopy /D:01-20-2000/H xcopy1 xcopytest"); - ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, "xcopy did not create xcopytest\\xcopy1\n"); DeleteFileA("xcopytest\\xcopy1"); @@ -97,12 +97,12 @@ static void test_parms_syntax(void) DeleteFileA("xcopytest\\xcopy1"); */ rc = runcmd("xcopy /D/S xcopytest xcopytest2\\"); - ok(rc == 0, "xcopy /D/S test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D/S test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES, "xcopy copied empty directory incorrectly\n"); rc = runcmd("xcopy /D/S/E xcopytest xcopytest2\\"); - ok(rc == 0, "xcopy /D/S/E test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D/S/E test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES, "xcopy failed to copy empty directory\n"); RemoveDirectoryA("xcopytest2");

1 0

Zebediah Figura : shell32: Move SHCreateLinks() flags to shlfolder.c.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: c2f25d25b648b19481ea102530e4b245dce85104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f25d25b648b19481ea1025… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:39 2022 -0600 shell32: Move SHCreateLinks() flags to shlfolder.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfolder.c | 4 ++++ dlls/shell32/undocshell.h | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..2ea6af11271 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -48,6 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +/* SHCreateLinks flags */ +#define SHCLF_PREFIXNAME 0x01 +#define SHCLF_CREATEONDESKTOP 0x02 + /*************************************************************************** * SHELL32_GetCustomFolderAttribute (internal function) * diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index dd20090d7bd..e4ed7c3630a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -226,17 +226,6 @@ HRESULT WINAPI SHCreateDefClassObject( void WINAPI SHFreeUnusedLibraries(void); -/* SHCreateLinks flags */ -#define SHCLF_PREFIXNAME 0x01 -#define SHCLF_CREATEONDESKTOP 0x02 - -HRESULT WINAPI SHCreateLinks( - HWND hWnd, - LPCSTR lpszDir, - LPDATAOBJECT lpDataObject, - UINT uFlags, - LPITEMIDLIST *lppidlLinks); - DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len); DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len);

1 0

Zebediah Figura : shell32: Move RegisterShellHook() definitions to shellord.c.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 6abfd74a8bb17bb27944fc796622e07f82560ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6abfd74a8bb17bb27944fc79… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:38 2022 -0600 shell32: Move RegisterShellHook() definitions to shellord.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 6 ++++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a138f381a92..57308e1c988 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -55,6 +55,12 @@ WINE_DECLARE_DEBUG_CHANNEL(pidl); #define SHWFF_REMOVE 0x02 #define SHWFF_WAIT 0x04 +/* RegisterShellHook types */ +#define RSH_DEREGISTER 0 +#define RSH_REGISTER 1 +#define RSH_REGISTER_PROGMAN 2 +#define RSH_REGISTER_TASKMAN 3 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 459c51c8454..dd20090d7bd 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -211,16 +211,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids); -/* RegisterShellHook types */ -#define RSH_DEREGISTER 0 -#define RSH_REGISTER 1 -#define RSH_REGISTER_PROGMAN 2 -#define RSH_REGISTER_TASKMAN 3 - -BOOL WINAPI RegisterShellHook( - HWND hWnd, - DWORD dwType); - /* SHCreateDefClassObject callback function */ typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)( LPUNKNOWN pUnkOuter,

1 0

Zebediah Figura : shell32: Move SHWaitForFileToOpen() flags to shellord.c.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: e1aa67132721247050f39a126e9cdfda99dbdcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1aa67132721247050f39a12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:37 2022 -0600 shell32: Move SHWaitForFileToOpen() flags to shellord.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 5 +++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 2c73ce18940..a138f381a92 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -50,6 +50,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); +/* SHWaitForFileToOpen flags */ +#define SHWFF_ADD 0x01 +#define SHWFF_REMOVE 0x02 +#define SHWFF_WAIT 0x04 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 5ed8d25f234..459c51c8454 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -208,16 +208,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); * Misc Stuff */ -/* SHWaitForFileToOpen flags */ -#define SHWFF_ADD 0x01 -#define SHWFF_REMOVE 0x02 -#define SHWFF_WAIT 0x04 - -BOOL WINAPI SHWaitForFileToOpen( - LPCITEMIDLIST pidl, - DWORD dwFlags, - DWORD dwTimeout); - WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids);

1 0

Alex Henrie : winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity).
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 5a12c6a481c157a299821cb85874819c181081a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a12c6a481c157a299821cb8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:01 2022 -0700 winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 971eb654e6a..52edd362622 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1775,7 +1775,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, WCHAR *outputW; ret = DeviceCapabilitiesW(device_name, port, cap, NULL, devmode); - if (ret == -1) return ret; + if (ret == -1) goto cleanup; switch (cap) { case DC_BINNAMES: @@ -1795,6 +1795,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } else { ret = DeviceCapabilitiesW(device_name, port, cap, (WCHAR *)output, devmode); } +cleanup: HeapFree(GetProcessHeap(), 0, device_name); HeapFree(GetProcessHeap(), 0, devmode); HeapFree(GetProcessHeap(), 0, port);

1 0