April 2017 - Wine-Commits - list.winehq.org

Austin English : rstrtmgr: Add RmShutdown stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: d5573961d21a63e8872379385b09c3d38bbe6e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5573961d21a63e8872379385… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 28 02:18:13 2016 -0600 rstrtmgr: Add RmShutdown stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f0555c5ebc277d43089769e3568b1315d2fce852) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rstrtmgr/main.c | 9 +++++++++ dlls/rstrtmgr/rstrtmgr.spec | 2 +- include/restartmanager.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 2d45639..5c9a8dc 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -100,3 +100,12 @@ DWORD WINAPI RmEndSession(DWORD handle) FIXME("%u stub!\n", handle); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RmShutdown (rstrtmgr.@) + */ +DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) +{ + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index 0e1ba79..6c6a9c9 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -8,5 +8,5 @@ @ stub RmRemoveFilter @ stub RmReserveHeap @ stdcall RmRestart(long long ptr) -@ stub RmShutdown +@ stdcall RmShutdown(long long ptr) @ stdcall RmStartSession(ptr long ptr) diff --git a/include/restartmanager.h b/include/restartmanager.h index 27c1a92..9ee066d 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -64,6 +64,8 @@ typedef struct { BOOL bRestartable; } RM_PROCESS_INFO, *PRM_PROCESS_INFO; +typedef void (CDECL *RM_WRITE_STATUS_CALLBACK)(UINT); + #ifdef __cplusplus } #endif

1 0

Austin English : kernel32: Add BaseFlushAppcompatCache stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: fcafe0049de366b0f658b3d9bae975a62f37b218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcafe0049de366b0f658b3d9b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 16:38:26 2017 -0600 kernel32: Add BaseFlushAppcompatCache stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0df25df8288ca63d991545029b4ec28b8b512b38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-appcompat-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/process.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec index 92a96af..e37c525 100644 --- a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec @@ -2,7 +2,7 @@ @ stub BaseCheckAppcompatCacheEx @ stub BaseCleanupAppcompatCacheSupport @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() kernel32.BaseFlushAppcompatCache @ stub BaseFreeAppCompatDataForProcess @ stub BaseInitAppcompatCacheSupport @ stub BaseIsAppcompatInfrastructureDisabled diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 224e6ae..06b89de 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -167,11 +167,11 @@ @ stub BaseCheckAppcompatCache # @ stub BaseCheckAppcompatCacheEx # @ stub BaseCheckRunApp -@ stub BaseCleanupAppcompatCache +@ stub BaseCleanupAppcompatCache @ stub BaseCleanupAppcompatCacheSupport # @ stub BaseDllReadWriteIniFile @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() # @ stub BaseFormatObjectAttributes # @ stub BaseFormatTimeOut # @ stub BaseGenerateAppCompatData diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2130240..17cb1db 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4207,3 +4207,13 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li { return; } + +/********************************************************************** + * BaseFlushAppcompatCache (KERNEL32.@) + */ +BOOL WINAPI BaseFlushAppcompatCache(void) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Austin English : ntoskrnl.exe: Add stub KeClearEvent.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 54b883150e684bd9b22e923fa54f17946b560075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b883150e684bd9b22e923fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:31:34 2017 -0600 ntoskrnl.exe: Add stub KeClearEvent. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 23c95cabf38724f463954023a9d908b5c1838cdb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1ab3a4e..bc12788 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3171,3 +3171,11 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT FIXME(": stub\n"); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeClearEvent (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeClearEvent(PRKEVENT event) +{ + FIXME("stub: %p\n", event); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0b5aca4..078178b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,7 +515,7 @@ @ stub KeBugCheckEx @ stub KeCancelTimer @ stub KeCapturePersistentThreadState -@ stub KeClearEvent +@ stdcall KeClearEvent(ptr) @ stub KeConnectInterrupt @ stub KeDcacheFlushCount @ stdcall KeDelayExecutionThread(long long ptr)

1 0

Austin English : ntoskrnl.exe: Add IoCreateFile stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 52ba4223f1ec78bdc99058458c32253e80a641bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ba4223f1ec78bdc99058458… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:24:31 2017 -0600 ntoskrnl.exe: Add IoCreateFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8222a0437441fc3cb83413c869259b860faf46d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7527659..1ab3a4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3159,3 +3159,15 @@ BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDP FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); return TRUE; } + +/*********************************************************************** + * IoCreateFile (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, ULONG attributes, ULONG sharing, + ULONG disposition, ULONG create_options, VOID *ea_buffer, ULONG ea_length, + CREATE_FILE_TYPE file_type, VOID *parameters, ULONG options ) +{ + FIXME(": stub\n"); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40bf0d2..0b5aca4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -339,7 +339,7 @@ @ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) -@ stub IoCreateFile +@ stdcall IoCreateFile(ptr long ptr ptr long long long ptr long long ptr long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint @ stub IoCreateNotificationEvent @ stub IoCreateStreamFileObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 95de8d0..4c696f7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -737,6 +737,12 @@ typedef enum _BUS_QUERY_ID_TYPE { BusQueryDeviceSerialNumber } BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE; +typedef enum _CREATE_FILE_TYPE { + CreateFileTypeNone, + CreateFileTypeNamedPipe, + CreateFileTypeMailslot +} CREATE_FILE_TYPE; + typedef enum { DevicePropertyDeviceDescription, DevicePropertyHardwareID,

1 0

Bruno Jesus : notepad: Only skip valid command options.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: f0a2b5b7afbcefa6b9c7265440c9fd59878a36f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a2b5b7afbcefa6b9c726544… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 01:31:33 2017 -0200 notepad: Only skip valid command options. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd19402b6d3f6efa30e3b7d088c4bbebd716a2c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/notepad/main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 20e887b..6f567a9 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -615,7 +615,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) static void HandleCommandLine(LPWSTR cmdline) { - WCHAR delimiter; + WCHAR delimiter, *ptr; BOOL opt_print = FALSE; /* skip white space */ @@ -630,22 +630,29 @@ static void HandleCommandLine(LPWSTR cmdline) if (*cmdline == delimiter) cmdline++; - while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/') + ptr = cmdline; + while (*ptr == ' ' || *ptr == '-' || *ptr == '/') { WCHAR option; - if (*cmdline++ == ' ') continue; + if (*ptr++ == ' ') continue; - option = *cmdline; - if (option) cmdline++; - while (*cmdline == ' ') cmdline++; + option = *ptr; + if (option) ptr++; + while (*ptr == ' ') ptr++; switch(option) { case 'p': case 'P': - opt_print = TRUE; + { + if (!opt_print) + { + opt_print = TRUE; + cmdline = ptr; + } break; + } } }

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: b123472b25d1fe89ad07b3b70de52d028c6cc016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b123472b25d1fe89ad07b3b70… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 30 14:00:56 2017 +0200 d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 943ed2c3eba5e72a080417683b9a6ca6d7b7be65) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 10 ++++++++++ include/d3dx11tex.h | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f97ec24..815c162 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 217cad1..452e513 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 65598a6..fe291d9 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -25,6 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n", + device, data, data_size, load_info, pump, view, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index bd22f32..16b280a 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -86,6 +86,10 @@ typedef struct D3DX11_IMAGE_LOAD_INFO extern "C" { #endif +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0

Michael Müller : msvideo.dll16: Implement DrawDibProfileDisplay.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 776c16e16edde6169b0a656a743c7398acb76751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776c16e16edde6169b0a656a7… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jan 26 22:24:42 2017 -0200 msvideo.dll16: Implement DrawDibProfileDisplay. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 03435a55770927afcae84d3ee170b5fbe670c763) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvideo.dll16/msvideo.dll16.spec | 2 +- dlls/msvideo.dll16/msvideo16.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo.dll16.spec b/dlls/msvideo.dll16/msvideo.dll16.spec index f45f644..02e2c95 100644 --- a/dlls/msvideo.dll16/msvideo.dll16.spec +++ b/dlls/msvideo.dll16/msvideo.dll16.spec @@ -35,7 +35,7 @@ 111 stub DRAWDIBCHANGEPALETTE 112 pascal -ret16 DrawDibRealize(word word word) DrawDibRealize16 113 stub DRAWDIBTIME -114 stub DRAWDIBPROFILEDISPLAY +114 pascal -ret16 DrawDibProfileDisplay(ptr) DrawDibProfileDisplay16 115 stub STRETCHDIB 118 pascal -ret16 DrawDibStart(word long) DrawDibStart16 119 pascal -ret16 DrawDibStop(word) DrawDibStop16 diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 8f02cc1..28f126c 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -121,6 +121,15 @@ UINT16 VFWAPI DrawDibRealize16(HDRAWDIB16 hdd, HDC16 hdc, } /************************************************************************* + * DrawDibProfileDisplay [MSVIDEO.114] + */ +BOOL16 VFWAPI DrawDibProfileDisplay16(LPBITMAPINFOHEADER lpbi) +{ + TRACE("(%p)\n", lpbi); + return DrawDibProfileDisplay(lpbi); +} + +/************************************************************************* * DrawDibStart [MSVIDEO.118] */ BOOL16 VFWAPI DrawDibStart16(HDRAWDIB16 hdd, DWORD rate)

1 0

Masanori Kakura : winegstreamer: Avoid zero division in amt_from_gst_caps_video().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 2bb94dee706c7f8a9b44e329784e4a1db816595d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb94dee706c7f8a9b44e3297… Author: Masanori Kakura <kakurasan(a)gmail.com> Date: Wed Jan 25 23:02:20 2017 +0900 winegstreamer: Avoid zero division in amt_from_gst_caps_video(). Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 442653b94ef21fad97a6cd82fe01bc95a79a52a7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c33ed9e..759a5db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -233,9 +233,8 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) bih->biCompression = amt->subtype.Data1; } bih->biSizeImage = width * height * bih->biBitCount / 8; - vih->AvgTimePerFrame = 10000000; - vih->AvgTimePerFrame *= denom; - vih->AvgTimePerFrame /= nom; + if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) + vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ vih->rcSource.left = 0; vih->rcSource.right = width; vih->rcSource.top = height;

1 0

Bruno Jesus : winmm: Fix the ordinal number for function PlaySound.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: f8d44fcdbb7f2e50a86c9d2416e46c67bb33cf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d44fcdbb7f2e50a86c9d241… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 27 19:14:40 2017 -0200 winmm: Fix the ordinal number for function PlaySound. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00046b816ca0cacbbebe1957326ed45abe24c097) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 6 ++++++ dlls/winmm/winmm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d6019f9..a8a5e8d 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1656,6 +1656,12 @@ static void test_PlaySound(void) { BOOL br; char test_file[MAX_PATH], temp[MAX_PATH], *exts; + void *psound_ordinal, *psound_name; + HMODULE dll = GetModuleHandleA("winmm.dll"); + + psound_name = GetProcAddress(dll, "PlaySound"); + psound_ordinal = GetProcAddress(dll, (LPCSTR) 2); + ok(psound_name == psound_ordinal, "Expected ordinal 2 to be PlaySound function\n"); if(waveOutGetNumDevs() == 0) { skip("No output devices available\n"); diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index a1eaf81..87908b3 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -1,5 +1,5 @@ # ordinal exports -1 stdcall @(ptr long long) PlaySoundA +2 stdcall @(ptr long long) PlaySoundA 3 stub @ 4 stub @

1 0

Anton Romanov : user32: Add OCR_RDR* cursors.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 002e66739223d161d086647f10ea6d6a30210f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=002e66739223d161d086647f1… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sat Jan 28 00:08:42 2017 -0800 user32: Add OCR_RDR* cursors. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb4545eccdc4b15d0d3bd45dea57b2df4830c5d1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/resources/ocr_rdr2dim.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdreast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrhorz.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnortheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsoutheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrvert.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrwest.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 34 +++++++++++++++++++++++++++++ 12 files changed, 34 insertions(+) diff --git a/dlls/user32/resources/ocr_rdr2dim.cur b/dlls/user32/resources/ocr_rdr2dim.cur new file mode 100644 index 0000000..0685c97 Binary files /dev/null and b/dlls/user32/resources/ocr_rdr2dim.cur differ diff --git a/dlls/user32/resources/ocr_rdreast.cur b/dlls/user32/resources/ocr_rdreast.cur new file mode 100644 index 0000000..20a548c Binary files /dev/null and b/dlls/user32/resources/ocr_rdreast.cur differ diff --git a/dlls/user32/resources/ocr_rdrhorz.cur b/dlls/user32/resources/ocr_rdrhorz.cur new file mode 100644 index 0000000..31cffb4 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrhorz.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorth.cur b/dlls/user32/resources/ocr_rdrnorth.cur new file mode 100644 index 0000000..db00a53 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorth.cur differ diff --git a/dlls/user32/resources/ocr_rdrnortheast.cur b/dlls/user32/resources/ocr_rdrnortheast.cur new file mode 100644 index 0000000..9d31be5 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnortheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorthwest.cur b/dlls/user32/resources/ocr_rdrnorthwest.cur new file mode 100644 index 0000000..ab38893 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouth.cur b/dlls/user32/resources/ocr_rdrsouth.cur new file mode 100644 index 0000000..96909c2 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouth.cur differ diff --git a/dlls/user32/resources/ocr_rdrsoutheast.cur b/dlls/user32/resources/ocr_rdrsoutheast.cur new file mode 100644 index 0000000..53dbfe3 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsoutheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouthwest.cur b/dlls/user32/resources/ocr_rdrsouthwest.cur new file mode 100644 index 0000000..eb2a204 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrvert.cur b/dlls/user32/resources/ocr_rdrvert.cur new file mode 100644 index 0000000..019cf77 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrvert.cur differ diff --git a/dlls/user32/resources/ocr_rdrwest.cur b/dlls/user32/resources/ocr_rdrwest.cur new file mode 100644 index 0000000..d6bbe89 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrwest.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 28a6c74..01fe13a 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -266,6 +266,40 @@ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur /* @makedep: resources/ocr_pen.cur */ OCR_PEN CURSOR resources/ocr_pen.cur +/* @makedep: resources/ocr_rdrvert.cur */ +OCR_RDRVERT CURSOR resources/ocr_rdrvert.cur + +/* @makedep: resources/ocr_rdrhorz.cur */ +/* FIXME: OCR_DRAGOBJECT already uses same resource number even though cursor image + * is entirely different */ +/*OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur*/ + +/* @makedep: resources/ocr_rdr2dim.cur */ +OCR_RDR2DIM CURSOR resources/ocr_rdr2dim.cur + +/* @makedep: resources/ocr_rdrnorth.cur */ +OCR_RDRNORTH CURSOR resources/ocr_rdrnorth.cur + +/* @makedep: resources/ocr_rdrsouth.cur */ +OCR_RDRSOUTH CURSOR resources/ocr_rdrsouth.cur + +/* @makedep: resources/ocr_rdrwest.cur */ +OCR_RDRWEST CURSOR resources/ocr_rdrwest.cur + +/* @makedep: resources/ocr_rdreast.cur */ +OCR_RDREAST CURSOR resources/ocr_rdreast.cur + +/* @makedep: resources/ocr_rdrnorthwest.cur */ +OCR_RDRNORTHWEST CURSOR resources/ocr_rdrnorthwest.cur + +/* @makedep: resources/ocr_rdrnortheast.cur */ +OCR_RDRNORTHEAST CURSOR resources/ocr_rdrnortheast.cur + +/* @makedep: resources/ocr_rdrsouthwest.cur */ +OCR_RDRSOUTHWEST CURSOR resources/ocr_rdrsouthwest.cur + +/* @makedep: resources/ocr_rdrsoutheast.cur */ +OCR_RDRSOUTHEAST CURSOR resources/ocr_rdrsoutheast.cur /****************************************************************/ /* Icons */

1 0