November 2021 - Wine-Commits

Alexandre Julliard : mountmgr: Build with msvcrt.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 406309e133ece4ae0d1b64e6808a7e16e6e2a052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=406309e133ece4ae0d1b64e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:12:47 2021 +0100 mountmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/device.c | 68 ++++++++++++++++++++----------------------- dlls/mountmgr.sys/mountmgr.c | 20 +++++-------- 3 files changed, 40 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=406309e133ece4ae0d1b…

1 0

Alexandre Julliard : mountmgr: Move the macOS device access check to the Unix library.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: fd5acd68b07d749d9e98633d2b1b46e734454135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5acd68b07d749d9e98633d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:10:44 2021 +0100 mountmgr: Move the macOS device access check to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 8 +------- dlls/mountmgr.sys/unixlib.c | 10 ++++++++++ dlls/mountmgr.sys/unixlib.h | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index a657cf19d29..724c618be20 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -915,13 +915,7 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; -#ifdef __APPLE__ - if (access( unix_device, R_OK )) - { - WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); - return FALSE; - } -#endif + if (MOUNTMGR_CALL( check_device_access, volume->device->unix_device )) return FALSE; if (!(name = wine_get_dos_file_name( unix_device ))) { diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index e45b6696ae6..52a3fce66d6 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -319,6 +319,15 @@ static NTSTATUS match_unixdev( void *args ) return !stat( params->device, &st ) && st.st_rdev == params->unix_dev; } +static NTSTATUS check_device_access( void *args ) +{ +#ifdef __APPLE__ + const char *unix_device = args; + if (access( unix_device, R_OK )) return STATUS_ACCESS_DENIED; +#endif + return STATUS_SUCCESS; +} + static NTSTATUS detect_serial_ports( void *args ) { const struct detect_ports_params *params = args; @@ -434,6 +443,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_volume_dos_devices, read_volume_file, match_unixdev, + check_device_access, detect_serial_ports, detect_parallel_ports, set_shell_folder, diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index 08f7e313236..e7846a764da 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -145,6 +145,7 @@ enum mountmgr_funcs unix_get_volume_dos_devices, unix_read_volume_file, unix_match_unixdev, + unix_check_device_access, unix_detect_serial_ports, unix_detect_parallel_ports, unix_set_shell_folder,

1 0

Jan Sikorski : wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding before calling wined3d_texture_gl_upload_bo().
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: d2ceed3904b96576ccb370f196bf6fe6d77b3537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ceed3904b96576ccb370f1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Nov 29 11:34:19 2021 +0100 wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding before calling wined3d_texture_gl_upload_bo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52116 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1ab50a27596..48202c2142c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2532,6 +2532,9 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, WINED3D_MAP_READ); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) { if (decompress) @@ -2561,6 +2564,11 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); offset += bo.buffer_object->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, update_w, update_h, update_d, offset, srgb, dst_texture, gl_info);

1 0

Jinoh Kang : msi: Wrap around to first record at end of view in MSI_ViewFetch.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 547492007e17ed7fe3c2e5ffd5f58f0d46a40048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547492007e17ed7fe3c2e5ff… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:54:42 2021 +0900 msi: Wrap around to first record at end of view in MSI_ViewFetch. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 5 +++++ dlls/msi/tests/db.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index c217ee7c8f5..b3a499a0788 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -394,6 +394,11 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) (*prec)->cookie = (UINT64)(ULONG_PTR)query; MSI_RecordSetInteger(*prec, 0, 1); } + else if (r == ERROR_NO_MORE_ITEMS) + { + /* end of view; reset cursor to first row */ + query->row = 0; + } return r; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eb087eb9711..447f2cdd0ee 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9343,7 +9343,7 @@ static void test_viewfetch_wraparound(void) winetest_push_context( "Record #%d", i ); r = MsiViewFetch( view, &rec ); - todo_wine_if(tries > 0) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); if (r != ERROR_SUCCESS) { winetest_pop_context();

1 0

Huw Davies : winecoreaudio: Move midi_in_start and midi_in_stop to the unixlib.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 05731b14d30107e73027aad2d9480a2f31450cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05731b14d30107e73027aad2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:44 2021 +0000 winecoreaudio: Move midi_in_start and midi_in_stop to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 33 +++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 28 ---------------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index eae68ec153e..0e146ce86f6 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -851,6 +851,33 @@ static DWORD midi_in_get_num_devs(void) return num_srcs; } +static DWORD midi_in_start(WORD dev_id) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + srcs[dev_id].state = 1; + srcs[dev_id].startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + +static DWORD midi_in_stop(WORD dev_id) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + srcs[dev_id].state = 0; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -938,6 +965,12 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = midi_in_get_num_devs(); break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6456568be85..559aae2f939 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,30 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_Start(WORD wDevID) -{ - TRACE("%d\n", wDevID); - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - sources[wDevID].state = 1; - sources[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - -static DWORD MIDIIn_Stop(WORD wDevID) -{ - TRACE("%d\n", wDevID); - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - sources[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Reset(WORD wDevID) { DWORD dwTime = GetTickCount(); @@ -414,10 +390,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_START: - return MIDIIn_Start(wDevID); - case MIDM_STOP: - return MIDIIn_Stop(wDevID); case MIDM_RESET: return MIDIIn_Reset(wDevID); }

1 0

Huw Davies : winecoreaudio: Move midi_in_get_num_devs to the unixlib.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 15bb0e79d64b00f5a51d78acd922c65dab6eb9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bb0e79d64b00f5a51d78ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:43 2021 +0000 winecoreaudio: Move midi_in_get_num_devs to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 9 +++++++++ dlls/winecoreaudio.drv/midi.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 983d0676b16..eae68ec153e 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -845,6 +845,12 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; } +static DWORD midi_in_get_num_devs(void) +{ + TRACE("\n"); + return num_srcs; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -929,6 +935,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETDEVCAPS: *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); break; + case MIDM_GETNUMDEVS: + *params->err = midi_in_get_num_devs(); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 35da144c927..6456568be85 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,12 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_GetNumDevs(void) -{ - TRACE("\n"); - return MIDIIn_NumDevs; -} - static DWORD MIDIIn_Start(WORD wDevID) { TRACE("%d\n", wDevID); @@ -420,8 +414,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETNUMDEVS: - return MIDIIn_GetNumDevs(); case MIDM_START: return MIDIIn_Start(wDevID); case MIDM_STOP:

1 0

Huw Davies : winecoreaudio: Move midi_in_get_devcaps to the unixlib.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 6f0b73a68d3df3a4749432b408ceec9b04bdee4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f0b73a68d3df3a4749432b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:42 2021 +0000 winecoreaudio: Move midi_in_get_devcaps to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 22 ++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 19 ------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 38608b0851c..983d0676b16 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -826,6 +826,25 @@ static DWORD midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; } +static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) +{ + TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size); + + if (!caps) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + + memcpy(caps, &srcs[dev_id].caps, min(size, sizeof(*caps))); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -907,6 +926,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_UNPREPARE: *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MIDM_GETDEVCAPS: + *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 9adf10953f9..35da144c927 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,23 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) -{ - TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); - - if (lpCaps == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - memcpy(lpCaps, &sources[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_GetNumDevs(void) { TRACE("\n"); @@ -437,8 +420,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETDEVCAPS: - return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS: return MIDIIn_GetNumDevs(); case MIDM_START:

1 0

Jinoh Kang : msi/tests: Add tests for MsiViewFetch wraparound behaviour.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: f26a9d093dff052e1db0c68db8801219d409cb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26a9d093dff052e1db0c68d… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:53:42 2021 +0900 msi/tests: Add tests for MsiViewFetch wraparound behaviour. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b42cc90a955..eb087eb9711 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9293,6 +9293,88 @@ static void test_view_get_error(void) DeleteFileA(msifile); } +static void test_viewfetch_wraparound(void) +{ + MSIHANDLE db = 0, view = 0, rec = 0; + UINT r, i, idset, tries; + const char *query; + + DeleteFileA(msifile); + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabaseW( msifileW, MSIDBOPEN_CREATE, &db ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "CREATE TABLE `phone` ( " + "`id` INT, `name` CHAR(32), `number` CHAR(32) " + "PRIMARY KEY `id`)"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('1', 'Alan', '5030581')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('2', 'Barry', '928440')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('3', 'Cindy', '2937550')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "SELECT * FROM `phone`"; + r = MsiDatabaseOpenViewA( db, query, &view ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + for (tries = 0; tries < 3; tries++) + { + winetest_push_context( "Wraparound attempt #%d", tries ); + idset = 0; + + for (i = 0; i < 3; i++) + { + winetest_push_context( "Record #%d", i ); + + r = MsiViewFetch( view, &rec ); + todo_wine_if(tries > 0) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + if (r != ERROR_SUCCESS) + { + winetest_pop_context(); + break; + } + + r = MsiRecordGetInteger(rec, 1); + ok(r >= 1 && r <= 3, "Expected 1 <= id <= 3, got %d\n", r); + if (r < sizeof(idset) * 8) + { + ok(!(idset & (1 << r)), "Duplicate id %d\n", r); + idset |= 1 << r; + } + + MsiCloseHandle(rec); + + winetest_pop_context(); + } + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + winetest_pop_context(); + } + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle(db); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9352,4 +9434,5 @@ START_TEST(db) test_viewmodify_merge(); test_viewmodify_insert(); test_view_get_error(); + test_viewfetch_wraparound(); }

1 0

Alexandre Julliard : strmbase: Move to the libs directory.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 83d7b1d3122b02ca448911587673a5513d3c16a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83d7b1d3122b02ca44891158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:49:18 2021 +0100 strmbase: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/strmbase/Makefile.in | 0 {dlls => libs}/strmbase/dispatch.c | 0 {dlls => libs}/strmbase/filter.c | 0 {dlls => libs}/strmbase/mediatype.c | 0 {dlls => libs}/strmbase/outputqueue.c | 0 {dlls => libs}/strmbase/pin.c | 0 {dlls => libs}/strmbase/pospass.c | 0 {dlls => libs}/strmbase/renderer.c | 0 {dlls => libs}/strmbase/seeking.c | 0 {dlls => libs}/strmbase/strmbase_private.h | 0 12 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8a11db9e360..a0df1a68c3d 100755 --- a/configure +++ b/configure @@ -1649,7 +1649,6 @@ enable_sspicli enable_stdole2_tlb enable_stdole32_tlb enable_sti -enable_strmbase enable_strmdll enable_svrapi enable_sxs @@ -1820,6 +1819,7 @@ enable_lcms2 enable_mfuuid enable_mpg123 enable_png +enable_strmbase enable_strmiids enable_tiff enable_uuid @@ -21604,7 +21604,6 @@ wine_fn_config_makefile dlls/sti enable_sti wine_fn_config_makefile dlls/sti/tests enable_tests wine_fn_config_makefile dlls/storage.dll16 enable_win16 wine_fn_config_makefile dlls/stress.dll16 enable_win16 -wine_fn_config_makefile dlls/strmbase enable_strmbase wine_fn_config_makefile dlls/strmdll enable_strmdll wine_fn_config_makefile dlls/svrapi enable_svrapi wine_fn_config_makefile dlls/sxs enable_sxs @@ -21852,6 +21851,7 @@ wine_fn_config_makefile libs/lcms2 enable_lcms2 wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/mpg123 enable_mpg123 wine_fn_config_makefile libs/png enable_png +wine_fn_config_makefile libs/strmbase enable_strmbase wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/tiff enable_tiff wine_fn_config_makefile libs/uuid enable_uuid diff --git a/configure.ac b/configure.ac index 1f597756e5f..1e779508828 100644 --- a/configure.ac +++ b/configure.ac @@ -3321,7 +3321,6 @@ WINE_CONFIG_MAKEFILE(dlls/sti) WINE_CONFIG_MAKEFILE(dlls/sti/tests) WINE_CONFIG_MAKEFILE(dlls/storage.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/stress.dll16,enable_win16) -WINE_CONFIG_MAKEFILE(dlls/strmbase) WINE_CONFIG_MAKEFILE(dlls/strmdll) WINE_CONFIG_MAKEFILE(dlls/svrapi) WINE_CONFIG_MAKEFILE(dlls/sxs) @@ -3569,6 +3568,7 @@ WINE_CONFIG_MAKEFILE(libs/lcms2) WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/mpg123) WINE_CONFIG_MAKEFILE(libs/png) +WINE_CONFIG_MAKEFILE(libs/strmbase) WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/tiff) WINE_CONFIG_MAKEFILE(libs/uuid) diff --git a/dlls/strmbase/Makefile.in b/libs/strmbase/Makefile.in similarity index 100% rename from dlls/strmbase/Makefile.in rename to libs/strmbase/Makefile.in diff --git a/dlls/strmbase/dispatch.c b/libs/strmbase/dispatch.c similarity index 100% rename from dlls/strmbase/dispatch.c rename to libs/strmbase/dispatch.c diff --git a/dlls/strmbase/filter.c b/libs/strmbase/filter.c similarity index 100% rename from dlls/strmbase/filter.c rename to libs/strmbase/filter.c diff --git a/dlls/strmbase/mediatype.c b/libs/strmbase/mediatype.c similarity index 100% rename from dlls/strmbase/mediatype.c rename to libs/strmbase/mediatype.c diff --git a/dlls/strmbase/outputqueue.c b/libs/strmbase/outputqueue.c similarity index 100% rename from dlls/strmbase/outputqueue.c rename to libs/strmbase/outputqueue.c diff --git a/dlls/strmbase/pin.c b/libs/strmbase/pin.c similarity index 100% rename from dlls/strmbase/pin.c rename to libs/strmbase/pin.c diff --git a/dlls/strmbase/pospass.c b/libs/strmbase/pospass.c similarity index 100% rename from dlls/strmbase/pospass.c rename to libs/strmbase/pospass.c diff --git a/dlls/strmbase/renderer.c b/libs/strmbase/renderer.c similarity index 100% rename from dlls/strmbase/renderer.c rename to libs/strmbase/renderer.c diff --git a/dlls/strmbase/seeking.c b/libs/strmbase/seeking.c similarity index 100% rename from dlls/strmbase/seeking.c rename to libs/strmbase/seeking.c diff --git a/dlls/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h similarity index 100% rename from dlls/strmbase/strmbase_private.h rename to libs/strmbase/strmbase_private.h

1 0

Alexandre Julliard : wineqtdecoder: Remove the QuickTime decoder.
by Alexandre Julliard Nov. 29, 2021

Nov. 29, 2021

Module: wine Branch: master Commit: 34289e749f44703997e8d904aaf12ac20b691b24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34289e749f44703997e8d904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:41:41 2021 +0100 wineqtdecoder: Remove the QuickTime decoder. QuickTime is deprecated on macOS, so remove the module instead of doing the work to convert it to msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 75 +- configure.ac | 34 +- dlls/wineqtdecoder/Makefile.in | 24 - dlls/wineqtdecoder/main.c | 245 ----- dlls/wineqtdecoder/qtdatahandler.c | 792 ---------------- dlls/wineqtdecoder/qtprivate.h | 28 - dlls/wineqtdecoder/qtsplitter.c | 1241 -------------------------- dlls/wineqtdecoder/qtutils.c | 159 ---- dlls/wineqtdecoder/qtvdecoder.c | 649 -------------- dlls/wineqtdecoder/rsrc.rc | 28 - dlls/wineqtdecoder/wineqtdecoder.rgs | 14 - dlls/wineqtdecoder/wineqtdecoder.spec | 4 - dlls/wineqtdecoder/wineqtdecoder_classes.idl | 37 - include/config.h.in | 3 - 14 files changed, 5 insertions(+), 3328 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34289e749f44703997e8…

1 0