October 2019 - Wine-commits

Piotr Caban : msvcrt/tests: Add overlapped memory move sprintf test.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 70b3e2b0e8af02232b003e8e57edde1c0a1bf89a URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b3e2b0e8af02232b003e8e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 11:37:30 2019 +0200 msvcrt/tests: Add overlapped memory move sprintf test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5e15989d1c..6f7ebde512 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -802,6 +802,11 @@ static void test_sprintf( void ) ok(r==2, "r = %d\n", r); ok(!strcmp(buffer, "\x82\xa0"), "failed: \"%s\"\n", buffer); + strcpy(buffer, " string to copy"); + r = p_sprintf(buffer, buffer+1); + ok(r==14, "r = %d\n", r); + ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); + setlocale(LC_ALL, "C"); }

1 0

Zebediah Figura : strmbase: Get rid of the unused BaseWindowImpl_GetDefaultRect() function.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 0854f67d0936ecc09082e19e10e53a5ab455dc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0854f67d0936ecc09082e19e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 16:00:16 2019 -0500 strmbase: Get rid of the unused BaseWindowImpl_GetDefaultRect() function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 6 ------ include/wine/strmbase.h | 1 - 2 files changed, 7 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 7f4dd40248..a7c2201c64 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -147,12 +147,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This) -{ - static RECT defRect = {0, 0, 800, 600}; - return defRect; -} - BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) { BaseControlWindow* pControlWindow = impl_from_BaseWindow(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index de5c875105..518db8de3f 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -391,7 +391,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width);

1 0

Zebediah Figura : strmbase: Get rid of the "pfnPossiblyEatMessage" callback.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 55b2251fefc1ba845616adeb4054f3e26c989d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b2251fefc1ba845616adeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 16:00:17 2019 -0500 strmbase: Get rid of the "pfnPossiblyEatMessage" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 1 - dlls/quartz/vmr9.c | 1 - dlls/strmbase/window.c | 88 ++++++++++++++++++++------------------------- include/wine/strmbase.h | 2 -- 4 files changed, 38 insertions(+), 54 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 43aef9ffbe..0e49f27f15 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -444,7 +444,6 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VideoRenderer_GetClassWindowStyles, VideoRenderer_GetDefaultRect, NULL, - BaseControlWindowImpl_PossiblyEatMessage, VideoRenderer_OnSize }; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 0e04fef366..413f334d99 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -607,7 +607,6 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VMR9_GetClassWindowStyles, VMR9_GetDefaultRect, NULL, - BaseControlWindowImpl_PossiblyEatMessage, VMR9_OnSize, }; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index a7c2201c64..3d91b05ead 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -45,21 +45,49 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa return BaseWindowImpl_OnReceiveMessage(This, hwnd, uMsg, wParam, lParam); } -LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT message, WPARAM wparam, LPARAM lparam) { - if (This->pFuncsTable->pfnPossiblyEatMessage && This->pFuncsTable->pfnPossiblyEatMessage(This, uMsg, wParam, lParam)) - return 0; + BaseControlWindow *window = impl_from_BaseWindow(This); - switch (uMsg) + switch (message) { - case WM_SIZE: - if (This->pFuncsTable->pfnOnSize) - return This->pFuncsTable->pfnOnSize(This, LOWORD(lParam), HIWORD(lParam)); - else - return BaseWindowImpl_OnSize(This, LOWORD(lParam), HIWORD(lParam)); + case WM_KEYDOWN: + case WM_KEYUP: + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONDBLCLK: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEACTIVATE: + case WM_MOUSEMOVE: + case WM_NCLBUTTONDBLCLK: + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONUP: + case WM_NCMBUTTONDBLCLK: + case WM_NCMBUTTONDOWN: + case WM_NCMBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCRBUTTONDBLCLK: + case WM_NCRBUTTONDOWN: + case WM_NCRBUTTONUP: + case WM_RBUTTONDBLCLK: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + if (window->hwndDrain) + { + PostMessageW(window->hwndDrain, message, wparam, lparam); + return 0; + } + break; + case WM_SIZE: + if (This->pFuncsTable->pfnOnSize) + return This->pFuncsTable->pfnOnSize(This, LOWORD(lparam), HIWORD(lparam)); + else + return BaseWindowImpl_OnSize(This, LOWORD(lparam), HIWORD(lparam)); } - return DefWindowProcW(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, message, wparam, lparam); } BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Width, LONG Height) @@ -147,46 +175,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - BaseControlWindow* pControlWindow = impl_from_BaseWindow(This); - - if (pControlWindow->hwndDrain) - { - switch(uMsg) - { - case WM_KEYDOWN: - case WM_KEYUP: - case WM_LBUTTONDBLCLK: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_MBUTTONDBLCLK: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEACTIVATE: - case WM_MOUSEMOVE: - case WM_NCLBUTTONDBLCLK: - case WM_NCLBUTTONDOWN: - case WM_NCLBUTTONUP: - case WM_NCMBUTTONDBLCLK: - case WM_NCMBUTTONDOWN: - case WM_NCMBUTTONUP: - case WM_NCMOUSEMOVE: - case WM_NCRBUTTONDBLCLK: - case WM_NCRBUTTONDOWN: - case WM_NCRBUTTONUP: - case WM_RBUTTONDBLCLK: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - PostMessageW(pControlWindow->hwndDrain, uMsg, wParam, lParam); - return TRUE; - default: - break; - } - } - return FALSE; -} - HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const IVideoWindowVtbl *lpVtbl, struct strmbase_filter *owner, CRITICAL_SECTION *lock, struct strmbase_pin *pPin, const BaseWindowFuncTable *pFuncsTable) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 518db8de3f..2213f79b97 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -371,7 +371,6 @@ typedef struct tagBaseWindow typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); -typedef BOOL (WINAPI *BaseWindow_PossiblyEatMessage)(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam); typedef LRESULT (WINAPI *BaseWindow_OnReceiveMessage)(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); @@ -382,7 +381,6 @@ typedef struct BaseWindowFuncTable BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ BaseWindow_OnReceiveMessage pfnOnReceiveMessage; - BaseWindow_PossiblyEatMessage pfnPossiblyEatMessage; BaseWindow_OnSize pfnOnSize; } BaseWindowFuncTable;

1 0

Zebediah Figura : strmbase: Get rid of BaseWindowImpl_OnReceiveMessage().
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: a29b1d58b77b446e4098b11e1e21279f4eea666a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29b1d58b77b446e4098b11e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 16:00:18 2019 -0500 strmbase: Get rid of BaseWindowImpl_OnReceiveMessage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 14 ++++---------- include/wine/strmbase.h | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 3d91b05ead..fed1002128 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -32,22 +32,16 @@ static inline BaseControlWindow *impl_from_BaseWindow(BaseWindow *iface) return CONTAINING_RECORD(iface, BaseControlWindow, baseWindow); } -static LRESULT CALLBACK WndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { BaseWindow* This = (BaseWindow*)GetWindowLongPtrW(hwnd, 0); + BaseControlWindow *window = impl_from_BaseWindow(This); if (!This) - return DefWindowProcW(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, message, wparam, lparam); if (This->pFuncsTable->pfnOnReceiveMessage) - return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, uMsg, wParam, lParam); - else - return BaseWindowImpl_OnReceiveMessage(This, hwnd, uMsg, wParam, lParam); -} - -LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT message, WPARAM wparam, LPARAM lparam) -{ - BaseControlWindow *window = impl_from_BaseWindow(This); + return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, message, wparam, lparam); switch (message) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 2213f79b97..166a60171b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -389,7 +389,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); enum strmbase_type_id

1 0

Zebediah Figura : strmbase: Get rid of the "pfnOnReceiveMessage" callback.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: a0aa542a26da07ee2fd4099faeca0f6e29f97c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0aa542a26da07ee2fd4099f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 16:00:19 2019 -0500 strmbase: Get rid of the "pfnOnReceiveMessage" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 1 - dlls/quartz/vmr9.c | 1 - dlls/strmbase/window.c | 3 --- include/wine/strmbase.h | 2 -- 4 files changed, 7 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 0e49f27f15..87491d8851 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -443,7 +443,6 @@ static const BaseRendererFuncTable BaseFuncTable = static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VideoRenderer_GetClassWindowStyles, VideoRenderer_GetDefaultRect, - NULL, VideoRenderer_OnSize }; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 413f334d99..d3fdfb13a3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -606,7 +606,6 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VMR9_GetClassWindowStyles, VMR9_GetDefaultRect, - NULL, VMR9_OnSize, }; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index fed1002128..3135de066a 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -40,9 +40,6 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM if (!This) return DefWindowProcW(hwnd, message, wparam, lparam); - if (This->pFuncsTable->pfnOnReceiveMessage) - return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, message, wparam, lparam); - switch (message) { case WM_KEYDOWN: diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 166a60171b..34a558ab8e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -371,7 +371,6 @@ typedef struct tagBaseWindow typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); -typedef LRESULT (WINAPI *BaseWindow_OnReceiveMessage)(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); typedef struct BaseWindowFuncTable @@ -380,7 +379,6 @@ typedef struct BaseWindowFuncTable BaseWindow_GetClassWindowStyles pfnGetClassWindowStyles; BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ - BaseWindow_OnReceiveMessage pfnOnReceiveMessage; BaseWindow_OnSize pfnOnSize; } BaseWindowFuncTable;

1 0

Zebediah Figura : strmbase: Properly implement IVideoWindow::get_WindowStyle().
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: d1a879fb9d6357bc6897d3fd4fb776c79468f29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a879fb9d6357bc6897d3fd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 16:00:20 2019 -0500 strmbase: Properly implement IVideoWindow::get_WindowStyle(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 3135de066a..fbf0edc78c 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -310,13 +310,13 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_get_WindowStyle(IVideoWindow *iface, LONG *WindowStyle) +HRESULT WINAPI BaseControlWindowImpl_get_WindowStyle(IVideoWindow *iface, LONG *style) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, WindowStyle); + TRACE("window %p, style %p.\n", window, style); - *WindowStyle = This->baseWindow.WindowStyles; + *style = GetWindowLongW(window->baseWindow.hWnd, GWL_STYLE); return S_OK; }

1 0

Dmitry Timoshkov : winspool: Implement IsValidDevmodeW.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: bd7ba264b65fed67a68c9c06c7686af8c192b2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7ba264b65fed67a68c9c06… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 10:59:41 2019 +0800 winspool: Implement IsValidDevmodeW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 58 ++++++++++++++++++++++++++++++---- dlls/winspool.drv/tests/info.c | 70 ++++++++++++++++++++++++++++-------------- include/winspool.h | 3 ++ 3 files changed, 102 insertions(+), 29 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1ab5e43aef..0065801d90 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -104,6 +104,9 @@ #undef UnionRect #endif +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "wine/library.h" #include "windef.h" #include "winbase.h" @@ -2449,7 +2452,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, * Validate a DEVMODE structure and fix errors if possible. * */ -BOOL WINAPI IsValidDevmodeA(PDEVMODEA *pDevMode, SIZE_T size) +BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size) { FIXME("(%p,%ld): stub\n", pDevMode, size); @@ -2465,12 +2468,55 @@ BOOL WINAPI IsValidDevmodeA(PDEVMODEA *pDevMode, SIZE_T size) * Validate a DEVMODE structure and fix errors if possible. * */ -BOOL WINAPI IsValidDevmodeW(PDEVMODEW *pDevMode, SIZE_T size) -{ - FIXME("(%p,%ld): stub\n", pDevMode, size); +BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) +{ + static const struct + { + DWORD flag; + SIZE_T size; + } map[] = + { +#define F_SIZE(field) FIELD_OFFSET(DEVMODEW, field) + sizeof(dm->field) + { DM_ORIENTATION, F_SIZE(u1.s1.dmOrientation) }, + { DM_PAPERSIZE, F_SIZE(u1.s1.dmPaperSize) }, + { DM_PAPERLENGTH, F_SIZE(u1.s1.dmPaperLength) }, + { DM_PAPERWIDTH, F_SIZE(u1.s1.dmPaperWidth) }, + { DM_SCALE, F_SIZE(u1.s1.dmScale) }, + { DM_COPIES, F_SIZE(u1.s1.dmCopies) }, + { DM_DEFAULTSOURCE, F_SIZE(u1.s1.dmDefaultSource) }, + { DM_PRINTQUALITY, F_SIZE(u1.s1.dmPrintQuality) }, + { DM_POSITION, F_SIZE(u1.s2.dmPosition) }, + { DM_DISPLAYORIENTATION, F_SIZE(u1.s2.dmDisplayOrientation) }, + { DM_DISPLAYFIXEDOUTPUT, F_SIZE(u1.s2.dmDisplayFixedOutput) }, + { DM_COLOR, F_SIZE(dmColor) }, + { DM_DUPLEX, F_SIZE(dmDuplex) }, + { DM_YRESOLUTION, F_SIZE(dmYResolution) }, + { DM_TTOPTION, F_SIZE(dmTTOption) }, + { DM_COLLATE, F_SIZE(dmCollate) }, + { DM_FORMNAME, F_SIZE(dmFormName) }, + { DM_LOGPIXELS, F_SIZE(dmLogPixels) }, + { DM_BITSPERPEL, F_SIZE(dmBitsPerPel) }, + { DM_PELSWIDTH, F_SIZE(dmPelsWidth) }, + { DM_PELSHEIGHT, F_SIZE(dmPelsHeight) }, + { DM_DISPLAYFLAGS, F_SIZE(u2.dmDisplayFlags) }, + { DM_NUP, F_SIZE(u2.dmNup) }, + { DM_DISPLAYFREQUENCY, F_SIZE(dmDisplayFrequency) }, + { DM_ICMMETHOD, F_SIZE(dmICMMethod) }, + { DM_ICMINTENT, F_SIZE(dmICMIntent) }, + { DM_MEDIATYPE, F_SIZE(dmMediaType) }, + { DM_DITHERTYPE, F_SIZE(dmDitherType) }, + { DM_PANNINGWIDTH, F_SIZE(dmPanningWidth) }, + { DM_PANNINGHEIGHT, F_SIZE(dmPanningHeight) } +#undef F_SIZE + }; + int i; - if(!pDevMode) - return FALSE; + if (!dm) return FALSE; + if (size < FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dm->dmFields)) return FALSE; + + for (i = 0; i < ARRAY_SIZE(map); i++) + if ((dm->dmFields & map[i].flag) && size < map[i].size) + return FALSE; return TRUE; } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 03a2e3cd32..f102bb11d9 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -75,8 +75,6 @@ static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, static BOOL (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); -static BOOL (WINAPI * pIsValidDevmodeW)(PDEVMODEW, SIZE_T); - /* ################################ */ @@ -2905,26 +2903,6 @@ static void test_DeviceCapabilities(void) GlobalFree(prn_dlg.hDevNames); } -static void test_IsValidDevmodeW(void) -{ - BOOL br; - - if (!pIsValidDevmodeW) - { - win_skip("IsValidDevmodeW not implemented.\n"); - return; - } - - br = pIsValidDevmodeW(NULL, 0); - ok(br == FALSE, "Got %d\n", br); - - br = pIsValidDevmodeW(NULL, 1); - ok(br == FALSE, "Got %d\n", br); - - br = pIsValidDevmodeW(NULL, sizeof(DEVMODEW)); - ok(br == FALSE, "Got %d\n", br); -} - static void test_OpenPrinter_defaults(void) { HANDLE printer; @@ -3044,6 +3022,53 @@ todo_wine ClosePrinter( printer ); } +static void test_IsValidDevmodeW(void) +{ + static const struct + { + DWORD dmFields; + WORD dmSize; + BOOL ret; + } test[] = + { + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 0, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 1, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 2, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 3, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 4, TRUE }, + + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 0, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 1, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 2, TRUE }, + + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 0, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 1, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 2, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 3, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 4, TRUE }, + + }; + DEVMODEW dm; + int i; + BOOL ret; + + ret = IsValidDevmodeW(NULL, 0); + ok(!ret, "got %d\n", ret); + + ret = IsValidDevmodeW(NULL, sizeof(DEVMODEW)); + ok(!ret, "got %d\n", ret); + + memset(&dm, 0, sizeof(dm)); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + dm.dmSize = test[i].dmSize; + dm.dmFields = test[i].dmFields; + ret = IsValidDevmodeW(&dm, dm.dmSize); + ok(ret == test[i].ret, "%d: got %d\n", i, ret); + } +} + START_TEST(info) { hwinspool = LoadLibraryA("winspool.drv"); @@ -3055,7 +3080,6 @@ START_TEST(info) pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); - pIsValidDevmodeW = (void *) GetProcAddress(hwinspool, "IsValidDevmodeW"); on_win9x = check_win9x(); if (on_win9x) diff --git a/include/winspool.h b/include/winspool.h index d9e8f404cd..4c170b861e 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1761,6 +1761,9 @@ BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus); +BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size); +BOOL WINAPI IsValidDevmodeW(PDEVMODEW pDevMode, SIZE_T size); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Alexandre Julliard : winebuild: Add support for excluding a specific CPU architecture.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 6306a1730a9ff52cde122946063dc91ca729ecf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6306a1730a9ff52cde122946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 14:28:38 2019 +0200 winebuild: Add support for excluding a specific CPU architecture. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/parser.c | 8 +++++--- tools/winebuild/winebuild.man.in | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 3191efaf9e..be705c25f0 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -470,7 +470,7 @@ static int parse_spec_extern( ORDDEF *odp, DLLSPEC *spec ) */ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) { - unsigned int i; + unsigned int i, cpu_mask = 0; const char *token; do @@ -493,13 +493,14 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) odp->flags |= FLAG_CPU_WIN64; else { - int cpu = get_cpu_from_name( cpu_name ); + int cpu = get_cpu_from_name( cpu_name + (cpu_name[0] == '!') ); if (cpu == -1) { error( "Unknown architecture '%s'\n", cpu_name ); return NULL; } - odp->flags |= FLAG_CPU( cpu ); + if (cpu_name[0] == '!') cpu_mask |= FLAG_CPU( cpu ); + else odp->flags |= FLAG_CPU( cpu ); } cpu_name = strtok( NULL, "," ); } @@ -537,6 +538,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) token = GetToken(0); } while (token && *token == '-'); + if (cpu_mask) odp->flags |= FLAG_CPU_MASK & ~cpu_mask; return token; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 12bafd72d3..367121544d 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -326,13 +326,14 @@ of a specification when an application expects to find the function's implementation inside the dll. .TP -.RE -.BI -arch= cpu\fR[\fB,\fIcpu\fR] +.B -arch=\fR[\fB!\fR]\fIcpu\fR[\fB,\fIcpu\fR] The entry point is only available on the specified CPU architecture(s). The names \fBwin32\fR and \fBwin64\fR match all 32-bit or 64-bit CPU architectures respectively. In 16-bit dlls, specifying \fB-arch=win32\fR causes the entry point to be exported -from the 32-bit wrapper module. +from the 32-bit wrapper module. A CPU name can be prefixed with +\fB!\fR to exclude only that specific architecture. +.RE .SS "Function ordinals" Syntax: .br

1 0

Alexandre Julliard : ntoskrnl: Export some functions on all architecture except i386.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 2d25263a3195567a3ab233226b4f02db35f64395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d25263a3195567a3ab23322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 14:33:54 2019 +0200 ntoskrnl: Export some functions on all architecture except i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fca06884a0..d47a706054 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,4 +1,4 @@ -@ stdcall -arch=arm,arm64,x86_64 ExAcquireFastMutex(ptr) +@ stdcall -arch=!i386 ExAcquireFastMutex(ptr) @ stdcall -fastcall ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection @ stub ExAcquireRundownProtectionEx @@ -9,7 +9,7 @@ @ stdcall -fastcall -arch=i386 ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection -@ stdcall -arch=arm,arm64,x86_64 ExReleaseFastMutex(ptr) +@ stdcall -arch=!i386 ExReleaseFastMutex(ptr) @ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr) @ stdcall -fastcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @@ -33,7 +33,7 @@ @ stdcall -arch=win64 ExpInterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList @ stdcall -arch=win64 ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stub HalExamineMBR -@ stdcall -arch=arm,arm64,x86_64 InitializeSListHead(ptr) RtlInitializeSListHead +@ stdcall -arch=!i386 InitializeSListHead(ptr) RtlInitializeSListHead @ stdcall -fastcall InterlockedCompareExchange(ptr long long) NTOSKRNL_InterlockedCompareExchange @ stdcall -fastcall InterlockedDecrement(ptr) NTOSKRNL_InterlockedDecrement @ stdcall -fastcall InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange @@ -48,13 +48,13 @@ @ stub IoWritePartitionTable @ stdcall -fastcall IofCallDriver(ptr ptr) @ stdcall -fastcall IofCompleteRequest(ptr long) -@ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) +@ stdcall -arch=!i386 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -fastcall KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ stdcall KeEnterGuardedRegion() @ stdcall KeExpandKernelStackAndCallout(ptr ptr long) @ stdcall KeExpandKernelStackAndCalloutEx(ptr ptr long long ptr) @ stdcall KeLeaveGuardedRegion() -@ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) +@ stdcall -arch=!i386 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -fastcall KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @@ -522,7 +522,7 @@ @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) -@ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) +@ stdcall -arch=!i386 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stdcall KeAreApcsDisabled() @ stub KeAttachProcess @@ -604,7 +604,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) -@ stdcall -arch=arm,arm64,x86_64 KeReleaseSpinLock(ptr long) +@ stdcall -arch=!i386 KeReleaseSpinLock(ptr long) @ stdcall KeReleaseSpinLockFromDpcLevel(ptr) @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Alexandre Julliard : msvcrt: Export some functions on all architecture except i386.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 2199be1c0f592a0981977a7c26033b6495ea0515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2199be1c0f592a0981977a7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 14:34:19 2019 +0200 msvcrt: Export some functions on all architecture except i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 42 +++++++++--------- dlls/msvcr100/msvcr100.spec | 46 ++++++++++---------- dlls/msvcr110/msvcr110.spec | 48 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 44 +++++++++---------- dlls/msvcr120_app/msvcr120_app.spec | 44 +++++++++---------- dlls/msvcr80/msvcr80.spec | 46 ++++++++++---------- dlls/msvcr90/msvcr90.spec | 44 +++++++++---------- dlls/msvcrt/math.c | 5 ++- dlls/msvcrt/msvcrt.spec | 50 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 42 +++++++++--------- 10 files changed, 206 insertions(+), 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2199be1c0f592a098197…

1 0