wine-devel

wine-devel@winehq.org

3 participants
84483 discussions

[PATCH] xcopy: Use wide-char string literals.
by Michael Stefaniuc 20 Oct '20

20 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/xcopy/xcopy.c | 57 +++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index bb255f85446..c2427f355aa 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -63,10 +63,6 @@ typedef struct _EXCLUDELIST static ULONG filesCopied = 0; /* Number of files copied */ static EXCLUDELIST *excludeList = NULL; /* Excluded strings list */ static FILETIME dateRange; /* Date range to copy after*/ -static const WCHAR wchr_slash[] = {'\\', 0}; -static const WCHAR wchr_star[] = {'*', 0}; -static const WCHAR wchr_dot[] = {'.', 0}; -static const WCHAR wchr_dotdot[] = {'.', '.', 0}; /* To minimize stack usage during recursion, some temporary variables @@ -81,11 +77,10 @@ static WCHAR copyTo[MAX_PATH]; * ========================================================================= */ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -186,8 +181,7 @@ static void XCOPY_FailMessage(DWORD err) { WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", err, GetLastError()); } else { - const WCHAR infostr[] = {'%', '1', '\n', 0}; - XCOPY_wprintf(infostr, lpMsgBuf); + XCOPY_wprintf(L"%1\n", lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); } } @@ -252,14 +246,13 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { WCHAR endChar = *endOfName; WCHAR buffer[MAXSTRING]; FILE *inFile = NULL; - const WCHAR readTextMode[] = {'r', 't', 0}; /* Null terminate the filename (temporarily updates the filename hence parms not const) */ *endOfName = 0x00; /* Open the file */ - inFile = _wfopen(filename, readTextMode); + inFile = _wfopen(filename, L"rt"); if (inFile == NULL) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_OPENFAIL), filename); *endOfName = endChar; @@ -371,8 +364,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, skipFile = FALSE; /* Ignore . and .. */ - if (lstrcmpW(finddata->cFileName, wchr_dot)==0 || - lstrcmpW(finddata->cFileName, wchr_dotdot)==0 || + if (lstrcmpW(finddata->cFileName, L".")==0 || + lstrcmpW(finddata->cFileName, L"..")==0 || finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { WINE_TRACE("Skipping directory, . or .. (%s)\n", wine_dbgstr_w(finddata->cFileName)); @@ -601,7 +594,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } lstrcpyW(inputpath, srcstem); - lstrcatW(inputpath, wchr_star); + lstrcatW(inputpath, L"*"); findres = TRUE; WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath)); @@ -610,20 +603,20 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Only looking for dirs */ if ((finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - (lstrcmpW(finddata->cFileName, wchr_dot) != 0) && - (lstrcmpW(finddata->cFileName, wchr_dotdot) != 0)) { + (lstrcmpW(finddata->cFileName, L".") != 0) && + (lstrcmpW(finddata->cFileName, L"..") != 0)) { WINE_TRACE("Handling subdir: %s\n", wine_dbgstr_w(finddata->cFileName)); /* Make up recursive information */ lstrcpyW(inputpath, srcstem); lstrcatW(inputpath, finddata->cFileName); - lstrcatW(inputpath, wchr_slash); + lstrcatW(inputpath, L"\\"); lstrcpyW(outputpath, deststem); if (*destspec == 0x00) { lstrcatW(outputpath, finddata->cFileName); - lstrcatW(outputpath, wchr_slash); + lstrcatW(outputpath, L"\\"); } XCOPY_DoCopy(inputpath, srcspec, outputpath, destspec, flags); @@ -708,7 +701,6 @@ static void strip_quotes(WCHAR *word, WCHAR **end) static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, WCHAR *supplieddestination, DWORD *pflags) { - const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; DWORD flags = *pflags; WCHAR *cmdline, *word, *end, *next; int rc = RC_INITERROR; @@ -776,10 +768,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, OPT_REMOVEARCH; break; /* E can be /E or /EXCLUDE */ - case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - &word[1], 8, - EXCLUDE, -1) == CSTR_EQUAL) { + case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + &word[1], 8, L"EXCLUDE:", -1) == CSTR_EQUAL) { if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); goto out; @@ -884,7 +874,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, /* Default the destination if not supplied */ if (supplieddestination[0] == 0x00) - lstrcpyW(supplieddestination, wchr_dot); + lstrcpyW(supplieddestination, L"."); *pflags = flags; rc = RC_OK; @@ -954,10 +944,9 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WINE_TRACE("Directory supplied\n"); lstrcpyW(stem, suppliedsource); lastChar = stem[lstrlenW(stem)-1]; - if (lastChar != '\\' && lastChar != ':') { - lstrcatW(stem, wchr_slash); - } - lstrcpyW(spec, wchr_star); + if (lastChar != '\\' && lastChar != ':') + lstrcatW(stem, L"\\"); + lstrcpyW(spec, L"*"); /* File or wildcard search: stem should be: @@ -1057,9 +1046,8 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR *spec = 0x00; /* Ensure ends with a '\' */ - if (stem[lstrlenW(stem)-1] != '\\') { - lstrcatW(stem, wchr_slash); - } + if (stem[lstrlenW(stem)-1] != '\\') + lstrcatW(stem, L"\\"); } else { WCHAR drive[MAX_PATH]; @@ -1092,16 +1080,11 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) WCHAR destinationspec[MAX_PATH] = {0}; /* Filespec of destination */ WCHAR copyCmd[MAXSTRING]; /* COPYCMD env var */ DWORD flags = 0; /* Option flags */ - const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; - const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; - const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; /* Preinitialize flags based on COPYCMD */ - if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) { - if (wcsstr(copyCmd, PROMPTSTR1) != NULL || - wcsstr(copyCmd, PROMPTSTR2) != NULL) { + if (GetEnvironmentVariableW(L"COPYCMD", copyCmd, MAXSTRING)) { + if (wcsstr(copyCmd, L"/Y") != NULL || wcsstr(copyCmd, L"/y") != NULL) flags |= OPT_NOPROMPT; - } } /* FIXME: On UNIX, files starting with a '.' are treated as hidden under -- 2.26.2

1 0

[PATCH] xcopy: Avoid an empty if-block.
by Michael Stefaniuc 20 Oct '20

20 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Didn't want to hide this in the L"string" change even though the if change itself is a no-op (same object files when compiled with -g0). programs/xcopy/xcopy.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index a8614f979ac..bb255f85446 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -533,16 +533,11 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Output a status message */ if (!skipFile) { - if (flags & OPT_QUIET) { - /* Skip message */ - } else if (flags & OPT_FULL) { - const WCHAR infostr[] = {'%', '1', ' ', '-', '>', ' ', - '%', '2', '\n', 0}; - - XCOPY_wprintf(infostr, copyFrom, copyTo); - } else { - const WCHAR infostr[] = {'%', '1', '\n', 0}; - XCOPY_wprintf(infostr, copyFrom); + if (!(flags & OPT_QUIET)) { + if (flags & OPT_FULL) + XCOPY_wprintf(L"%1 -> %2\n", copyFrom, copyTo); + else + XCOPY_wprintf(L"%1\n", copyFrom); } /* If allowing overwriting of read only files, remove any -- 2.26.2

1 0

[PATCH] quartz: Return the paused timestamp from IMediaSeeking::GetCurrentPosition() if the graph is running asynchronously.
by Zebediah Figura 20 Oct '20

20 Oct '20

In this case "graph->stream_start" has not yet been set. This fixes a regression with Blazblue Centralfiction, which incorrectly skipped a video. The application called IMediaControl::Run() and IMediaSeeking::GetCurrentPosition() in quick succession, received an incorrect value for the latter, and consequently believed that the video had already finished. Fixes: 114832224fc5babd1417562dbd64d489fabe1e01 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4cef1004bdd..e5ae12d9452 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2331,7 +2331,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG { ret = graph->stream_stop; } - else if (graph->state == State_Running && graph->refClock) + else if (graph->state == State_Running && !graph->needs_async_run && graph->refClock) { REFERENCE_TIME time; IReferenceClock_GetTime(graph->refClock, &time); -- 2.28.0

1 0

[PATCH 1/5] evr/mixer: Keep dxva device handle around.
by Nikolay Sivov 20 Oct '20

20 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 90 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index fd7596eeadf..42e0ca42f91 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -81,12 +81,14 @@ struct video_mixer unsigned int input_count; struct output_stream output; - COLORREF bkgnd_color; IDirect3DDeviceManager9 *device_manager; + HANDLE device_handle; + IMediaEventSink *event_sink; IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + COLORREF bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -266,6 +268,17 @@ static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface) return refcount; } +static void video_mixer_release_device_manager(struct video_mixer *mixer) +{ + if (mixer->device_manager) + { + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + IDirect3DDeviceManager9_Release(mixer->device_manager); + } + mixer->device_handle = NULL; + mixer->device_manager = NULL; +} + static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) { struct video_mixer *mixer = impl_from_IUnknown(iface); @@ -282,8 +295,7 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) IMFAttributes_Release(mixer->inputs[i].attributes); } video_mixer_clear_types(mixer); - if (mixer->device_manager) - IDirect3DDeviceManager9_Release(mixer->device_manager); + video_mixer_release_device_manager(mixer); if (mixer->attributes) IMFAttributes_Release(mixer->attributes); if (mixer->internal_attributes) @@ -695,6 +707,33 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const return count ? S_OK : hr; } +static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDirectXVideoProcessorService **service) +{ + HRESULT hr; + + if (!mixer->device_handle) + { + if (FAILED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + return hr; + } + + for (;;) + { + hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, mixer->device_handle, + &IID_IDirectXVideoProcessorService, (void **)service); + if (hr == DXVA2_E_NEW_VIDEO_DEVICE) + { + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + mixer->device_handle = NULL; + if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + continue; + } + break; + } + + return hr; +} + static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *media_type, DWORD flags) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -702,7 +741,6 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW DXVA2_VideoDesc video_desc; HRESULT hr = E_NOTIMPL; unsigned int count; - HANDLE handle; GUID *guids; TRACE("%p, %u, %p, %#x.\n", iface, id, media_type, flags); @@ -716,37 +754,33 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW hr = MF_E_NOT_INITIALIZED; else { - if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &handle))) + if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) { - if (SUCCEEDED(hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, handle, - &IID_IDirectXVideoProcessorService, (void **)&service))) + if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) { - if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) + if (!id) { - if (!id) + if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, + &count, &guids))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, - &count, &guids))) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, + guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, - guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) - { - if (mixer->inputs[0].media_type) - IMFMediaType_Release(mixer->inputs[0].media_type); - mixer->inputs[0].media_type = media_type; - IMFMediaType_AddRef(mixer->inputs[0].media_type); - } - CoTaskMemFree(guids); + if (mixer->inputs[0].media_type) + IMFMediaType_Release(mixer->inputs[0].media_type); + mixer->inputs[0].media_type = media_type; + IMFMediaType_AddRef(mixer->inputs[0].media_type); } + CoTaskMemFree(guids); } - else - { - FIXME("Unimplemented for substreams.\n"); - hr = E_NOTIMPL; - } + } + else + { + FIXME("Unimplemented for substreams.\n"); + hr = E_NOTIMPL; } } - IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, handle); + IDirectXVideoProcessorService_Release(service); } } @@ -897,9 +931,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, EnterCriticalSection(&mixer->cs); - if (mixer->device_manager) - IDirect3DDeviceManager9_Release(mixer->device_manager); - mixer->device_manager = NULL; + video_mixer_release_device_manager(mixer); if (param) hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager); -- 2.28.0

2 5

[PATCH v2 1/3] user32/tests: Add color tests for static controls.
by Jeff Smith 20 Oct '20

20 Oct '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: - Moved tests in with existing static tests. - Quit using macro for shortening CLR_INVALID. - Added const char *'s for common class names in tests. - Created struct for style tests. dlls/user32/tests/static.c | 191 ++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0c453d08a67..d42fc757c5d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -52,9 +52,14 @@ static void flush_events(void) } } -static HWND build_static(DWORD style) +static const char *CLS_STATIC = "static"; +static const char *CLS_BUTTON = "button"; + +#define build_static(style) build_child(CLS_STATIC, style) +static HWND build_child(const char *class, DWORD style) { - return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); + return CreateWindowA(class, "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, + (HMENU)CTRL_ID, NULL, 0); } static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -189,6 +194,187 @@ static void test_set_image(void) DeleteObject(image); } +struct color_values +{ + HBRUSH brush; + COLORREF brushcolor; + COLORREF altbrushcolor; + COLORREF pencolor; + COLORREF textcolor; + COLORREF bkcolor; + int bkmode; +}; + +struct user_data +{ + UINT msg_expect; + struct color_values *color_test; +}; + +static LRESULT CALLBACK styles_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + struct user_data *ud = (struct user_data *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (!ud || !ud->color_test) + return DefWindowProcA(hwnd, msg, wparam, lparam); + + switch (msg) + { + case WM_CTLCOLORBTN: + case WM_CTLCOLORSTATIC: + ok(msg == ud->msg_expect, "Expected message %#x got %#x\n", msg, ud->msg_expect); + if (msg == ud->msg_expect) + { + HDC hdc = (HDC)wparam; + if (ud->color_test->bkmode) + SetBkMode(hdc, ud->color_test->bkmode); + if (ud->color_test->altbrushcolor != CLR_INVALID) + SetDCBrushColor(hdc, ud->color_test->altbrushcolor); + if (ud->color_test->pencolor != CLR_INVALID) + SetDCPenColor(hdc, ud->color_test->pencolor); + if (ud->color_test->textcolor != CLR_INVALID) + SetTextColor(hdc, ud->color_test->textcolor); + if (ud->color_test->bkcolor != CLR_INVALID) + SetBkColor(hdc, ud->color_test->bkcolor); + + return (LRESULT)ud->color_test->brush; + } + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_style_colors(const char *class, int style, POINT *inside, POINT *outside) +{ + struct color_values color_tests[] = + { + /* wndproc will return NULL */ + {NULL, CLR_INVALID, CLR_INVALID, CLR_INVALID, CLR_INVALID, CLR_INVALID}, + /* wndproc will return non-object */ + {(HBRUSH)(COLOR_HIGHLIGHT+1), CLR_INVALID, CLR_INVALID, CLR_INVALID, CLR_INVALID, CLR_INVALID}, + /* wndproc will return object */ + {NULL, RGB(255,0,0), CLR_INVALID, CLR_INVALID, CLR_INVALID, CLR_INVALID}, + {NULL, RGB(255,0,0), CLR_INVALID, CLR_INVALID, CLR_INVALID, CLR_INVALID, TRANSPARENT}, + {NULL, RGB(255,0,0), RGB(0,255,0), RGB(0,0,255), RGB(255,255,0), RGB(255,0,255)}, + {NULL, RGB(255,0,0), RGB(0,255,0), RGB(0,0,255), RGB(255,255,0), RGB(255,0,255), TRANSPARENT}, + }; + struct user_data ud; + COLORREF icolor0, ocolor0; + COLORREF icolor, ocolor; + COLORREF icolor_exp, ocolor_exp; + HWND hChild; + HDC hdc; + int i; + + int is_simple = (class == CLS_STATIC) && (style == SS_SIMPLE); + int is_groupbox = (class == CLS_BUTTON) && (style == BS_GROUPBOX); + int is_pushbutton = (class == CLS_BUTTON) && + (style == BS_PUSHBUTTON || style == BS_DEFPUSHBUTTON || style == BS_USERBUTTON); + + /* Setup child window */ + hChild = build_child(class, style); + SetWindowTextA(hChild, "____"); + ud.msg_expect = is_pushbutton ? WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + ud.color_test = NULL; + SetWindowLongPtrA(hMainWnd, GWLP_USERDATA, (LONG_PTR)&ud); + + /* Get system colors for child window */ + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + hdc = GetDC(hChild); + icolor0 = GetPixel(hdc, inside->x, inside->y); + ocolor0 = GetPixel(hdc, outside->x, outside->y); + ReleaseDC(hChild, hdc); + + ocolor_exp = (is_simple || is_groupbox) ? RGB(255, 255, 255) : icolor0; + ok(ocolor0 == ocolor_exp, "(%s,%#x) Expected color %#x outside text area, got %#x\n", + class, style, ocolor_exp, ocolor0); + + for (i = 0; i < ARRAY_SIZE(color_tests); i++) + { + /* Update child window with default colors */ + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + + /* Update child window to exercise control color message */ + if (color_tests[i].brushcolor != CLR_INVALID) + color_tests[i].brush = CreateSolidBrush(color_tests[i].brushcolor); + ud.color_test = &color_tests[i]; + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + ud.color_test = NULL; + if (color_tests[i].brushcolor != CLR_INVALID) + DeleteObject(color_tests[i].brush); + + /* Get updated colors for child window */ + hdc = GetDC(hChild); + icolor = GetPixel(hdc, inside->x, inside->y); + ocolor = GetPixel(hdc, outside->x, outside->y); + ReleaseDC(hChild, hdc); + + icolor_exp = + (color_tests[i].brushcolor == CLR_INVALID || is_pushbutton) ? icolor0 : + (is_simple && color_tests[i].bkmode == TRANSPARENT) ? icolor0 : + (color_tests[i].bkmode == TRANSPARENT) ? color_tests[i].brushcolor : + (color_tests[i].bkcolor != CLR_INVALID) ? color_tests[i].bkcolor : + RGB(255, 255, 255); + ocolor_exp = + (color_tests[i].brushcolor == CLR_INVALID || is_pushbutton) ? ocolor0 : + (is_simple || is_groupbox) ? ocolor0 : + color_tests[i].brushcolor; + todo_wine_if(color_tests[i].brush != NULL && color_tests[i].brushcolor == CLR_INVALID && !is_pushbutton) + ok(icolor == icolor_exp, "(%s,%#x,%d) Expected color %#x inside text area, got %#x\n", + class, style, i, icolor_exp, icolor); + todo_wine_if(color_tests[i].brush != NULL && color_tests[i].brushcolor == CLR_INVALID && !is_pushbutton && + !is_simple && !is_groupbox) + ok(ocolor == ocolor_exp, "(%s,%#x,%d) Expected color %#x outside text area, got %#x\n", + class, style, i, ocolor_exp, ocolor); + } + + DestroyWindow(hChild); +} + +static void test_styles(void) +{ + struct { + const char *class; + int style; + /* A point that should always land inside the text area */ + POINT test_point_inside; + /* A point that should always land outside the text area */ + POINT test_point_outside; + } style_tests[] = { + /* Test basic static styles */ + {CLS_STATIC, SS_SIMPLE, {5, 5}, {90, 90}}, + {CLS_STATIC, SS_LEFT, {5, 5}, {90, 90}}, + {CLS_STATIC, SS_RIGHT, {95, 5}, {90, 90}}, + {CLS_STATIC, SS_CENTER, {50, 5}, {90, 90}}, + {CLS_STATIC, SS_LEFTNOWORDWRAP, {5, 5}, {90, 90}}, + /* Test the static area inside push-buttons */ + {CLS_BUTTON, BS_PUSHBUTTON, {50, 50}, {90, 90}}, + {CLS_BUTTON, BS_DEFPUSHBUTTON, {50, 50}, {90, 90}}, + {CLS_BUTTON, BS_USERBUTTON, {50, 50}, {90, 90}}, + /* Test the static area beside checkbox and radio buttons */ + {CLS_BUTTON, BS_CHECKBOX, {25, 50}, {90, 90}}, + {CLS_BUTTON, BS_AUTOCHECKBOX, {25, 50}, {90, 90}}, + {CLS_BUTTON, BS_RADIOBUTTON, {25, 50}, {90, 90}}, + {CLS_BUTTON, BS_AUTORADIOBUTTON, {25, 50}, {90, 90}}, + {CLS_BUTTON, BS_3STATE, {25, 50}, {90, 90}}, + {CLS_BUTTON, BS_AUTO3STATE, {25, 50}, {90, 90}}, + {CLS_BUTTON, BS_GROUPBOX, {20, 5}, {90, 90}}, + }; + int i; + WNDPROC oldwndproc; + + oldwndproc = (WNDPROC)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (LONG_PTR)styles_wndproc); + for (i = 0; i < ARRAY_SIZE(style_tests); i++) + { + test_style_colors(style_tests[i].class, style_tests[i].style, + &style_tests[i].test_point_inside, &style_tests[i].test_point_outside); + } + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (LONG_PTR)oldwndproc); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -222,6 +408,7 @@ START_TEST(static) test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); test_set_image(); + test_styles(); DestroyWindow(hMainWnd); } -- 2.23.0

2 4

[PATCH 1/4] wintrust/tests: Add more tests for CryptCATOpen() file modes.
by Zebediah Figura 20 Oct '20

20 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wintrust/tests/crypt.c | 76 ++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 5a4344bc931..dfa411548f9 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -401,33 +401,65 @@ static void test_calchash(void) static void test_CryptCATOpen(void) { - HANDLE hcat; - char empty[MAX_PATH]; - WCHAR emptyW[MAX_PATH]; - HANDLE file; + WCHAR filename[MAX_PATH], temp_path[MAX_PATH]; + HANDLE cat; + DWORD flags; BOOL ret; + FILE *file; + char buffer[10]; - SetLastError(0xdeadbeef); - hcat = pCryptCATOpen(NULL, 0, 0, 0, 0); - ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - - if (!GetTempFileNameA(CURR_DIR, "cat", 0, empty)) return; + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + GetTempFileNameW(temp_path, L"cat", 0, filename); - file = CreateFileA(empty, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); - CloseHandle(file); - MultiByteToWideChar(CP_ACP, 0, empty, -1, emptyW, MAX_PATH); + SetLastError(0xdeadbeef); + cat = pCryptCATOpen(NULL, 0, 0, 0, 0); + ok(cat == INVALID_HANDLE_VALUE, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); - hcat = pCryptCATOpen(emptyW, 0, 0, 0, 0); - todo_wine - ok(hcat != INVALID_HANDLE_VALUE, "Expected a correct handle\n"); + for (flags = 0; flags < 8; ++flags) + { + SetLastError(0xdeadbeef); + cat = pCryptCATOpen(filename, flags, 0, 0, 0); + if (flags == CRYPTCAT_OPEN_EXISTING) + { + ok(cat == INVALID_HANDLE_VALUE, "flags %#x: expected failure\n", flags); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "flags %#x: got error %u\n", flags, GetLastError()); + ret = DeleteFileW(filename); + ok(!ret, "flags %#x: expected failure\n", flags); + } + else + { + todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ret = pCryptCATClose(cat); + todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ret = DeleteFileW(filename); + todo_wine_if (flags & (CRYPTCAT_OPEN_ALWAYS | CRYPTCAT_OPEN_CREATENEW)) + ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + } + + file = _wfopen(filename, L"w"); + fputs("test text", file); + fclose(file); - ret = pCryptCATClose(hcat); - todo_wine - ok(ret, "CryptCATClose failed\n"); - DeleteFileA(empty); + SetLastError(0xdeadbeef); + cat = pCryptCATOpen(filename, flags, 0, 0, 0); + todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ret = pCryptCATClose(cat); + todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + + file = _wfopen(filename, L"r"); + ret = fread(buffer, 1, sizeof(buffer), file); + if (flags & CRYPTCAT_OPEN_CREATENEW) + todo_wine ok(!ret, "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + else + ok(ret == 9 && !strncmp(buffer, "test text", ret), "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + fclose(file); + + ret = DeleteFileW(filename); + ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + } } static DWORD error_area; -- 2.28.0

1 5

[PATCH v2] mfplat: Fix asynchronous object creation from URL.
by Derek Lesho 20 Oct '20

20 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/main.c | 2 ++ dlls/mfplat/tests/mfplat.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a6ff97ae04a..452426d055f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5750,6 +5750,8 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu if (!(queued_result = heap_alloc_zero(sizeof(*queued_result)))) return E_OUTOFMEMORY; + queued_result->origin = origin; + IRtwqAsyncResult_GetObject(inner_result, &handler.handler); switch (origin) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 55c07adb1fe..a5388840bc5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -343,12 +343,10 @@ static HRESULT WINAPI test_create_from_url_callback_Invoke(IMFAsyncCallback *ifa object = NULL; hr = IMFSourceResolver_EndCreateObjectFromURL(resolver, result, &obj_type, &object); -todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); hr = IMFAsyncResult_GetObject(result, &object2); ok(hr == S_OK, "Failed to get result object, hr %#x.\n", hr); -todo_wine ok(object2 == object, "Unexpected object.\n"); if (object) -- 2.28.0

3 2

[PATCH 1/5] mfplat: Fix asynchronous object creation from URL.
by Derek Lesho 20 Oct '20

20 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/main.c | 4 +++- dlls/mfplat/tests/mfplat.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a6ff97ae04a..8ed18b1b87f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5750,6 +5750,8 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu if (!(queued_result = heap_alloc_zero(sizeof(*queued_result)))) return E_OUTOFMEMORY; + queued_result->origin = origin; + IRtwqAsyncResult_GetObject(inner_result, &handler.handler); switch (origin) @@ -5788,8 +5790,8 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu if (SUCCEEDED(RtwqCreateAsyncResult(queued_result->object, data->pCallback, caller_state, &caller_result))) { + queued_result->inner_result = caller_result; RtwqInvokeCallback(caller_result); - IRtwqAsyncResult_Release(caller_result); } } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 55c07adb1fe..a5388840bc5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -343,12 +343,10 @@ static HRESULT WINAPI test_create_from_url_callback_Invoke(IMFAsyncCallback *ifa object = NULL; hr = IMFSourceResolver_EndCreateObjectFromURL(resolver, result, &obj_type, &object); -todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); hr = IMFAsyncResult_GetObject(result, &object2); ok(hr == S_OK, "Failed to get result object, hr %#x.\n", hr); -todo_wine ok(object2 == object, "Unexpected object.\n"); if (object) -- 2.28.0

3 10

[PATCH] mscoree: Implement GetTokenForVTableEntry.
by Esme Povirk 20 Oct '20

20 Oct '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 40 +++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree.spec | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a5b378b9251..f50eb5a0cd7 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -56,6 +56,16 @@ struct DomainEntry static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute permission */ +static CRITICAL_SECTION fixup_list_cs; +static CRITICAL_SECTION_DEBUG fixup_list_cs_debug = +{ + 0, 0, &fixup_list_cs, + { &fixup_list_cs_debug.ProcessLocksList, + &fixup_list_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": fixup_list_cs") } +}; +static CRITICAL_SECTION fixup_list_cs = { &fixup_list_cs_debug, -1, 0, 0, 0, 0 }; + static struct list dll_fixups; WCHAR **private_path = NULL; @@ -1222,6 +1232,34 @@ static const struct vtable_fixup_thunk thunk_template = {0}; #endif +DWORD WINAPI GetTokenForVTableEntry(HINSTANCE hinst, BYTE **ppVTEntry) +{ + struct dll_fixup *fixup; + DWORD result = 0; + DWORD rva; + int i; + + TRACE("%p,%p\n", hinst, ppVTEntry); + + rva = (BYTE*)ppVTEntry - (BYTE*)hinst; + + EnterCriticalSection(&fixup_list_cs); + LIST_FOR_EACH_ENTRY(fixup, &dll_fixups, struct dll_fixup, entry) + { + if (fixup->dll != hinst) + continue; + if (rva < fixup->fixup->rva || (rva - fixup->fixup->rva >= fixup->fixup->count * sizeof(ULONG_PTR))) + continue; + i = (rva - fixup->fixup->rva) / sizeof(ULONG_PTR); + result = ((ULONG_PTR*)fixup->tokens)[i]; + break; + } + LeaveCriticalSection(&fixup_list_cs); + + TRACE("<-- %x\n", result); + return result; +} + static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) { HRESULT hr=S_OK; @@ -1356,7 +1394,9 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) return; } + EnterCriticalSection(&fixup_list_cs); list_add_tail(&dll_fixups, &fixup->entry); + LeaveCriticalSection(&fixup_list_cs); } static void FixupVTable_Assembly(HMODULE hmodule, ASSEMBLY *assembly) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 7fa68bf8b13..92dcfd89677 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -64,7 +64,7 @@ @ stub GetRequestedRuntimeVersionForCLSID @ stub GetStartupFlags @ stub GetTargetForVTableEntry -@ stub GetTokenForVTableEntry +@ stdcall GetTokenForVTableEntry(ptr ptr) @ stdcall GetVersionFromProcess(ptr ptr long ptr) @ stub GetXMLElement @ stub GetXMLElementAttribute -- 2.25.1

1 0

[PATCH 5/5] riched20: Don't split the paragraph at the first \intbl.
by Huw Davies 20 Oct '20

20 Oct '20

The whole of the current paragraph should be included in the table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 51a6e33aef4..c91d47302cf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -658,14 +658,10 @@ void ME_RTFParAttrHook(RTF_Info *info) para = para->member.para.next_para; para = ME_InsertTableRowStartAtParagraph(info->editor, para); tableDef->tableRowStart = para; - } else { - ME_Cursor cursor; - WCHAR endl = '\r'; - cursor = info->editor->pCursors[0]; - if (cursor.nOffset || cursor.pRun->member.run.nCharOfs) - ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); - tableDef->tableRowStart = ME_InsertTableRowStartFromCursor(info->editor); } + else + tableDef->tableRowStart = ME_InsertTableRowStartAtParagraph( info->editor, + info->editor->pCursors[0].pPara ); info->nestingLevel = 1; info->canInheritInTbl = TRUE; } -- 2.23.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel