November 2017 - Wine-Devel - list.winehq.org

[PATCH 01/29] ANNOUNCE: move WineHQ URLs to https
by Austin English Dec. 2, 2017

Dec. 2, 2017

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- ANNOUNCE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 16368ac168..6450ac35d5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -10,17 +10,17 @@ What's new in this release (see below for details): The source is available from the following locations: - http://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz + https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz http://mirrors.ibiblio.org/wine/source/2.x/wine-2.22.tar.xz Binary packages for various distributions will be available from: - http://www.winehq.org/download + https://www.winehq.org/download -You will find documentation on http://www.winehq.org/documentation +You will find documentation on https://www.winehq.org/documentation You can also get the current source directly from the git -repository. Check http://www.winehq.org/git for details. +repository. Check https://wiki.winehq.org/Git_Wine_Tutorial for details. Wine is available thanks to the work of many people. See the file AUTHORS in the distribution for the complete list. -- 2.13.6

2 31

[PATCH 1/4] shell32/tests: Simplify and standardize test structure for progman_dde.
by Zebediah Figura Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 577 ++++++++++----------------------------- 1 file changed, 138 insertions(+), 439 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 6e1378f..6be7267 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -34,25 +34,6 @@ #include "winuser.h" #include "shlobj.h" -/* Timeout on DdeClientTransaction Call */ -#define MS_TIMEOUT_VAL 1000 -/* # of times to poll for window creation */ -#define PDDE_POLL_NUM 150 -/* time to sleep between polls */ -#define PDDE_POLL_TIME 300 - -/* Call Info */ -#define DDE_TEST_MISC 0x00010000 -#define DDE_TEST_CREATEGROUP 0x00020000 -#define DDE_TEST_DELETEGROUP 0x00030000 -#define DDE_TEST_SHOWGROUP 0x00040000 -#define DDE_TEST_ADDITEM 0x00050000 -#define DDE_TEST_DELETEITEM 0x00060000 -#define DDE_TEST_COMPOUND 0x00070000 -#define DDE_TEST_CALLMASK 0x00ff0000 - -#define DDE_TEST_NUMMASK 0x0000ffff - static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); @@ -231,411 +212,64 @@ static HDDEDATA CALLBACK DdeCallback(UINT type, UINT format, HCONV hConv, HSZ hs return NULL; } -/* - * Encoded String for Error Messages so that inner failures can determine - * what test is failing. Format is: [Code:TestNum] - */ -static const char * GetStringFromTestParams(int testParams) -{ - int testNum; - static char testParamString[64]; - const char *callId; - - testNum = testParams & DDE_TEST_NUMMASK; - switch (testParams & DDE_TEST_CALLMASK) - { - default: - case DDE_TEST_MISC: - callId = "MISC"; - break; - case DDE_TEST_CREATEGROUP: - callId = "C_G"; - break; - case DDE_TEST_DELETEGROUP: - callId = "D_G"; - break; - case DDE_TEST_SHOWGROUP: - callId = "S_G"; - break; - case DDE_TEST_ADDITEM: - callId = "A_I"; - break; - case DDE_TEST_DELETEITEM: - callId = "D_I"; - break; - case DDE_TEST_COMPOUND: - callId = "CPD"; - break; - } - - sprintf(testParamString, " [%s:%i]", callId, testNum); - return testParamString; -} - -/* Transfer DMLERR's into text readable strings for Error Messages */ -#define DMLERR_TO_STR(x) case x: return#x; -static const char * GetStringFromError(UINT err) +static UINT dde_execute(DWORD instance, HCONV hconv, const char *command_str) { - switch (err) - { - DMLERR_TO_STR(DMLERR_NO_ERROR); - DMLERR_TO_STR(DMLERR_ADVACKTIMEOUT); - DMLERR_TO_STR(DMLERR_BUSY); - DMLERR_TO_STR(DMLERR_DATAACKTIMEOUT); - DMLERR_TO_STR(DMLERR_DLL_NOT_INITIALIZED); - DMLERR_TO_STR(DMLERR_DLL_USAGE); - DMLERR_TO_STR(DMLERR_EXECACKTIMEOUT); - DMLERR_TO_STR(DMLERR_INVALIDPARAMETER); - DMLERR_TO_STR(DMLERR_LOW_MEMORY); - DMLERR_TO_STR(DMLERR_MEMORY_ERROR); - DMLERR_TO_STR(DMLERR_NOTPROCESSED); - DMLERR_TO_STR(DMLERR_NO_CONV_ESTABLISHED); - DMLERR_TO_STR(DMLERR_POKEACKTIMEOUT); - DMLERR_TO_STR(DMLERR_POSTMSG_FAILED); - DMLERR_TO_STR(DMLERR_REENTRANCY); - DMLERR_TO_STR(DMLERR_SERVER_DIED); - DMLERR_TO_STR(DMLERR_SYS_ERROR); - DMLERR_TO_STR(DMLERR_UNADVACKTIMEOUT); - DMLERR_TO_STR(DMLERR_UNFOUND_QUEUE_ID); - default: - return "Unknown DML Error"; - } -} + HDDEDATA command, hdata; + DWORD result; + UINT ret; -/* Helper Function to Transfer DdeGetLastError into a String */ -static const char * GetDdeLastErrorStr(DWORD instance) -{ - UINT err = DdeGetLastError(instance); + command = DdeCreateDataHandle(instance, (BYTE *)command_str, strlen(command_str)+1, 0, 0, 0, 0); + ok(command != NULL, "DdeCreateDataHandle() failed: %u\n", DdeGetLastError(instance)); - return GetStringFromError(err); -} + hdata = DdeClientTransaction((BYTE *)command, -1, hconv, 0, 0, XTYP_EXECUTE, 2000, &result); + ret = DdeGetLastError(instance); + /* PROGMAN always returns 1 on success */ + ok((UINT)hdata == !ret, "expected %o, got %p\n", !ret, hdata); -/* Execute a Dde Command and return the error & result */ -/* Note: Progman DDE always returns a pointer to 0x00000001 on a successful result */ -static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, HDDEDATA *hData, UINT *err, int testParams) -{ - HDDEDATA command; - - command = DdeCreateDataHandle(instance, (LPBYTE) strCmd, strlen(strCmd)+1, 0, 0L, 0, 0); - ok (command != NULL, "DdeCreateDataHandle Error %s.%s\n", - GetDdeLastErrorStr(instance), GetStringFromTestParams(testParams)); - *hData = DdeClientTransaction((void *) command, - -1, - hConv, - 0, - 0, - XTYP_EXECUTE, - MS_TIMEOUT_VAL, - NULL); - - /* hData is technically a pointer, but for Program Manager, - * it is NULL (error) or 1 (success) - * TODO: Check other versions of Windows to verify 1 is returned. - * While it is unlikely that anyone is actually testing that the result is 1 - * if all versions of windows return 1, Wine should also. - */ - if (*hData == NULL) - { - *err = DdeGetLastError(instance); - } - else - { - *err = DMLERR_NO_ERROR; - todo_wine - { - ok(*hData == (HDDEDATA) 1, "Expected HDDEDATA Handle == 1, actually %p.%s\n", - *hData, GetStringFromTestParams(testParams)); - } - } - DdeFreeDataHandle(command); + return ret; } -/* - * Check if Window is onscreen with the appropriate name. - * - * Windows are not created synchronously. So we do not know - * when and if the window will be created/shown on screen. - * This function implements a polling mechanism to determine - * creation. - * A more complicated method would be to use SetWindowsHookEx. - * Since polling worked fine in my testing, no reason to implement - * the other. Comments about other methods of determining when - * window creation happened were not encouraging (not including - * SetWindowsHookEx). - */ -static HWND CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) +static BOOL check_window_exists(const char *name) { HWND window = NULL; int i; - /* Poll for Window Creation */ - for (i = 0; window == NULL && i < PDDE_POLL_NUM; i++) - { - Sleep(PDDE_POLL_TIME); - /* Specify the window class name to make sure what we find is really an - * Explorer window. Explorer used two different window classes so try - * both. - */ - window = FindWindowA("ExplorerWClass", winName); - if (!window) - window = FindWindowA("CabinetWClass", winName); - } - ok (window != NULL, "Window \"%s\" was not created in %i seconds - assumed failure.%s\n", - winName, PDDE_POLL_NUM*PDDE_POLL_TIME/1000, GetStringFromTestParams(testParams)); - - /* Close Window as desired. */ - if (window != NULL && closeWindow) - { - SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); - window = NULL; - } - return window; -} - -/* Check for Existence (or non-existence) of a file or group - * When testing for existence of a group, groupName is not needed - */ -static void CheckFileExistsInProgramGroups(const char *nameToCheck, BOOL shouldExist, BOOL isGroup, - const char *groupName, int testParams) -{ - char path[MAX_PATH]; - DWORD attributes; - int len; - - lstrcpyA(path, ProgramsDir); - - len = strlen(path) + strlen(nameToCheck)+1; - if (groupName != NULL) + for (i = 0; i < 20; i++) { - len += strlen(groupName)+1; - } - ok (len <= MAX_PATH, "Path Too Long.%s\n", GetStringFromTestParams(testParams)); - if (len <= MAX_PATH) - { - if (groupName != NULL) - { - strcat(path, "\\"); - strcat(path, groupName); - } - strcat(path, "\\"); - strcat(path, nameToCheck); - attributes = GetFileAttributesA(path); - if (!shouldExist) + Sleep(100); + if ((window = FindWindowA("ExplorerWClass", name)) || + (window = FindWindowA("CabinetWClass", name))) { - ok (attributes == INVALID_FILE_ATTRIBUTES , "File exists and shouldn't %s.%s\n", - path, GetStringFromTestParams(testParams)); - } else { - if (attributes == INVALID_FILE_ATTRIBUTES) - { - ok (FALSE, "Created File %s doesn't exist.%s\n", path, GetStringFromTestParams(testParams)); - } else if (isGroup) { - ok (attributes & FILE_ATTRIBUTE_DIRECTORY, "%s is not a folder (attr=%x).%s\n", - path, attributes, GetStringFromTestParams(testParams)); - } else { - ok (attributes & FILE_ATTRIBUTE_ARCHIVE, "Created File %s has wrong attributes (%x).%s\n", - path, attributes, GetStringFromTestParams(testParams)); - } + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; } } -} - -/* Create Group Test. - * command and expected_result. - * if expected_result is DMLERR_NO_ERROR, test - * 1. group was created - * 2. window is open - */ -static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, int testParams) -{ - HDDEDATA hData; - UINT error; - - /* Execute Command & Check Result */ - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "CreateGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - /* No Error */ - if (error == DMLERR_NO_ERROR) - { - - /* Check if Group Now Exists */ - CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - /* Check if Window is Open (polling) */ - CheckWindowCreated(windowTitle, TRUE, testParams); - } -} - -/* Show Group Test. - * DDE command, expected_result, and the group name to check for existence - * if expected_result is DMLERR_NO_ERROR, test - * 1. window is open - */ -static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, BOOL closeAfterShowing, int testParams) -{ - HDDEDATA hData; - UINT error; - HWND hwnd = 0; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); -/* todo_wine... Is expected to fail, wine stubbed functions DO fail */ -/* TODO REMOVE THIS CODE!!! */ - todo_wine_if (expected_result != DMLERR_NOTPROCESSED) - ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - if (error == DMLERR_NO_ERROR) - { - /* Check if Window is Open (polling) */ - hwnd = CheckWindowCreated(windowTitle, closeAfterShowing, testParams); - } - return hwnd; + return (window != NULL); } -/* Delete Group Test. - * DDE command, expected_result, and the group name to check for existence - * if expected_result is DMLERR_NO_ERROR, test - * 1. group does not exist - */ -static void DeleteGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, int testParams) +static BOOL check_exists(const char *name) { - HDDEDATA hData; - UINT error; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "DeleteGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that Group does not exist */ - CheckFileExistsInProgramGroups(groupName, FALSE, TRUE, NULL, testParams); - } -} - -/* Add Item Test - * DDE command, expected result, and group and file name where it should exist. - * checks to make sure error code matches expected error code - * checks to make sure item exists if successful - */ -static void AddItemTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *fileName, const char *groupName, int testParams) -{ - HDDEDATA hData; - UINT error; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "AddItem %s: Expected Error %s, received %s.%s\n", - fileName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that File exists */ - CheckFileExistsInProgramGroups(fileName, TRUE, FALSE, groupName, testParams); - } -} - -/* Delete Item Test. - * DDE command, expected result, and group and file name where it should exist. - * checks to make sure error code matches expected error code - * checks to make sure item does not exist if successful - */ -static void DeleteItemTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *fileName, const char *groupName, int testParams) -{ - HDDEDATA hData; - UINT error; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "DeleteItem %s: Expected Error %s, received %s.%s\n", - fileName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that File does not exist */ - CheckFileExistsInProgramGroups(fileName, FALSE, FALSE, groupName, testParams); - } -} - -/* Compound Command Test. - * not really generic, assumes command of the form: - * [CreateGroup ...][AddItem ...][AddItem ...] - * All samples I've seen using Compound were of this form (CreateGroup, - * AddItems) so this covers minimum expected functionality. - */ -static HWND CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, const char *fileName1, - const char *fileName2, int testParams) -{ - HDDEDATA hData; - UINT error; - HWND hwnd = 0; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "Compound String %s: Expected Error %s, received %s.%s\n", - command, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that File exists */ - CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - hwnd = CheckWindowCreated(windowTitle, FALSE, testParams); - CheckFileExistsInProgramGroups(fileName1, TRUE, FALSE, groupName, testParams); - CheckFileExistsInProgramGroups(fileName2, TRUE, FALSE, groupName, testParams); - } - return hwnd; -} + char path[MAX_PATH]; -static void CreateAddItemText(char *itemtext, const char *cmdline, const char *name) -{ - lstrcpyA(itemtext, "[AddItem("); - lstrcatA(itemtext, cmdline); - lstrcatA(itemtext, ","); - lstrcatA(itemtext, name); - lstrcatA(itemtext, ")]"); + strcpy(path, ProgramsDir); + strcat(path, "\\"); + strcat(path, name); + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; } /* 1st set of tests */ -static int DdeTestProgman(DWORD instance, HCONV hConv) +static void test_progman_dde(DWORD instance, HCONV hConv) { - HDDEDATA hData; UINT error; - int testnum; char temppath[MAX_PATH]; char f1g1[MAX_PATH], f2g1[MAX_PATH], f3g1[MAX_PATH], f1g3[MAX_PATH], f2g3[MAX_PATH]; char itemtext[MAX_PATH + 20]; char comptext[2 * (MAX_PATH + 20) + 21]; - HWND hwnd; - testnum = 1; /* Invalid Command */ - DdeExecuteCommand(instance, hConv, "[InvalidCommand()]", &hData, &error, DDE_TEST_MISC|testnum++); - ok (error == DMLERR_NOTPROCESSED, "InvalidCommand(), expected error %s, received %s.\n", - GetStringFromError(DMLERR_NOTPROCESSED), GetStringFromError(error)); + error = dde_execute(instance, hConv, "[InvalidCommand()]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); /* On Vista+ the files have to exist when adding a link */ GetTempPathA(MAX_PATH, temppath); @@ -646,38 +280,96 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) GetTempFileNameA(temppath, "dde", 0, f2g3); /* CreateGroup Tests (including AddItem, DeleteItem) */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_CREATEGROUP|testnum++); - CreateAddItemText(itemtext, f1g1, "f1g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); - CreateAddItemText(itemtext, f2g1, "f2g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); - DeleteItemTest(instance, hConv, "[DeleteItem(f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); - CreateAddItemText(itemtext, f3g1, "f3g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_CREATEGROUP|testnum++); + error = dde_execute(instance, hConv, "[CreateGroup(Group1)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1"), "directory not created\n"); + ok(check_window_exists(Group1Title), "window not created\n"); + } + + sprintf(itemtext, "[AddItem(%s,f1g1Name)]", f1g1); + error = dde_execute(instance, hConv, itemtext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/f1g1Name.lnk"), "link not created\n"); + } + + sprintf(itemtext, "[AddItem(%s,f2g1Name)]", f2g1); + error = dde_execute(instance, hConv, itemtext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/f2g1Name.lnk"), "link not created\n"); + } + + error = dde_execute(instance, hConv, "[DeleteItem(f2g1Name)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/f2g1Name.lnk"), "link should not exist\n"); + + sprintf(itemtext, "[AddItem(%s,f3g1Name)]", f3g1); + error = dde_execute(instance, hConv, itemtext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/f3g1Name.lnk"), "link not created\n"); + } + + error = dde_execute(instance, hConv, "[CreateGroup(Group2)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group2"), "directory not created\n"); + ok(check_window_exists(Group2Title), "window not created\n"); + } + /* Create Group that already exists - same instance */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_CREATEGROUP|testnum++); + error = dde_execute(instance, hConv, "[CreateGroup(Group1)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1"), "directory not created\n"); + ok(check_window_exists(Group1Title), "window not created\n"); + } /* ShowGroup Tests */ - ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, "Group1", Group1Title, TRUE, DDE_TEST_SHOWGROUP|testnum++); - DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); - ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, "Startup", StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); - hwnd = ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); + error = dde_execute(instance, hConv, "[ShowGroup(Group1)]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); - /* DeleteGroup Test - Note that Window is Open for this test */ - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_DELETEGROUP|testnum++); - if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + error = dde_execute(instance, hConv, "[DeleteItem(f3g1Name)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n"); + + error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_window_exists(StartupTitle), "window not created\n"); + } + + error = dde_execute(instance, hConv, "[ShowGroup(Group1, 0)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_window_exists(Group1Title), "window not created\n"); + } + + /* DeleteGroup Test */ + error = dde_execute(instance, hConv, "[DeleteGroup(Group1)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1"), "directory should not exist\n"); /* Compound Execute String Command */ - lstrcpyA(comptext, "[CreateGroup(Group3)]"); - CreateAddItemText(itemtext, f1g3, "f1g3Name"); - lstrcatA(comptext, itemtext); - CreateAddItemText(itemtext, f2g3, "f2g3Name"); - lstrcatA(comptext, itemtext); - hwnd = CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); + sprintf(comptext, "[CreateGroup(Group3)][AddItem(%s,f1g3Name)][AddItem(%s,f2g3Name)]", f1g3, f2g3); + error = dde_execute(instance, hConv, comptext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group3"), "directory not created\n"); + ok(check_window_exists(Group3Title), "window not created\n"); + ok(check_exists("Group3/f1g3Name.lnk"), "link not created\n"); + ok(check_exists("Group3/f2g3Name.lnk"), "link not created\n"); + } - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); - if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + error = dde_execute(instance, hConv, "[DeleteGroup(Group3)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group3"), "directory should not exist\n"); /* Full Parameters of Add Item */ /* AddItem(CmdLine[,Name[,IconPath[,IconIndex[,xPos,yPos[,DefDir[,HotKey[,fMinimize[fSeparateSpace]]]]]]]) */ @@ -687,16 +379,25 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) DeleteFileA(f3g1); DeleteFileA(f1g3); DeleteFileA(f2g3); - - return testnum; } /* 2nd set of tests - 2nd connection */ -static void DdeTestProgman2(DWORD instance, HCONV hConv, int testnum) +static void test_progman_dde2(DWORD instance, HCONV hConv) { + UINT error; + /* Create Group that already exists on a separate connection */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_CREATEGROUP|testnum++); - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_DELETEGROUP|testnum++); + error = dde_execute(instance, hConv, "[CreateGroup(Group2)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group2"), "directory not created\n"); + ok(check_window_exists(Group2Title), "window not created\n"); + } + + error = dde_execute(instance, hConv, "[DeleteGroup(Group2)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group2"), "directory should not exist\n"); } START_TEST(progman_dde) @@ -705,20 +406,19 @@ START_TEST(progman_dde) UINT err; HSZ hszProgman; HCONV hConv; - int testnum; init_function_pointers(); init_strings(); /* Initialize DDE Instance */ err = DdeInitializeA(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); - ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err)); + ok(err == DMLERR_NO_ERROR, "DdeInitialize() failed: %u\n", err); /* Create Connection */ hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI); - ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance)); + ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n"); + ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */ if (hConv == NULL) { @@ -726,30 +426,29 @@ START_TEST(progman_dde) return; } - /* Run Tests */ - testnum = DdeTestProgman(instance, hConv); + test_progman_dde(instance, hConv); /* Cleanup & Exit */ - ok (DdeDisconnect(hConv), "DdeDisonnect Error %s\n", GetDdeLastErrorStr(instance)); - ok (DdeUninitialize(instance), "DdeUninitialize failed\n"); + ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); /* 2nd Instance (Followup Tests) */ /* Initialize DDE Instance */ instance = 0; err = DdeInitializeA(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); - ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err)); + ok (err == DMLERR_NO_ERROR, "DdeInitialize() failed: %u\n", err); /* Create Connection */ hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI); - ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance)); + ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok (hConv != NULL, "DdeConnect Error %s\n", GetDdeLastErrorStr(instance)); - ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n"); + ok(hConv != NULL, "DdeConnect() failed: %u\n", DdeGetLastError(instance)); + ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Run Tests */ - DdeTestProgman2(instance, hConv, testnum); + test_progman_dde2(instance, hConv); /* Cleanup & Exit */ - ok (DdeDisconnect(hConv), "DdeDisonnect Error %s\n", GetDdeLastErrorStr(instance)); - ok (DdeUninitialize(instance), "DdeUninitialize failed\n"); + ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); } -- 2.7.4

2 6

[PATCH] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml
by Alex Henrie Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42468 On September 8, Nikolay agreed to sign off on this patch if Wine Staging accepted it and there were no reported problems for two months.[1] On September 17, Wine Staging accepted the patch.[2] On September 20, Wine Staging 2.17 was released, which included the patch.[3] It has now been two months and there have been no reported problems. [1] https://www.winehq.org/pipermail/wine-devel/2017-September/118879.html [2] https://github.com/wine-compholio/wine-staging/commit/63a8a664c9a49361ecb67… [3] https://wine-staging.com/news/2017-09-20-release-2.17.html --- dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9a607e3d3c..f6df417471 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12101,34 +12101,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12712,6 +12826,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4bf62..abd89dbd6b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length( -- 2.15.0

2 2

[PATCH] wined3d: Unbind the FBOs before glDispatchCompute
by Fabian Maurer Dec. 1, 2017

Dec. 1, 2017

Fixes Bug 43406 Unbinding the FBO before executing the compute shader makes sure that it doesn't read garbage from it. This only an issue on open source drivers, since the proprietary drivers play safe and synchronize. But since this is undefined behavior, wine should avoid relying on that. Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wined3d/drawprim.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 404623c9ac..f39c9961e9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -858,6 +858,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state return; } + /* Unbind the FBOs to avoid have undefined behavior when reading data from it */ + GL_EXTCALL(glBindFramebuffer(GL_READ_FRAMEBUFFER, 0)); + GL_EXTCALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0)); + if (parameters->indirect) { const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; @@ -875,6 +879,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state } checkGLcall("dispatch compute"); + /* Now rebind the FBOs to restore the original state */ + GL_EXTCALL(glBindFramebuffer(GL_READ_FRAMEBUFFER, context->fbo_read_binding)); + GL_EXTCALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, context->fbo_draw_binding)); + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); -- 2.15.0

3 5

wdscore: Add stub DLL.
by Stefan Leichter Nov. 30, 2017

Nov. 30, 2017

The wdscore.dll is used from the Windows 10 MediaCreationTool.exe Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- configure.ac | 1 + dlls/wdscore/Makefile.in | 4 ++ dlls/wdscore/wdscore.spec | 161 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore_main.c | 43 ++++++++++++ 4 files changed, 209 insertions(+) create mode 100644 dlls/wdscore/Makefile.in create mode 100644 dlls/wdscore/wdscore.spec create mode 100644 dlls/wdscore/wdscore_main.c

1 0

[PATCH] gdiplus/tests: Check more return values (Coverity)
by Nikolay Sivov Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 6 ++++-- dlls/gdiplus/tests/graphics.c | 12 ++++++++---- dlls/gdiplus/tests/image.c | 5 +++-- dlls/gdiplus/tests/pathiterator.c | 15 ++++++++++----- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6c7738cf90..2c7b21b6e8 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -83,7 +83,8 @@ static void test_createfont(void) for (i = UnitWorld; i <=UnitMillimeter; i++) { if (i == UnitDisplay) continue; /* Crashes WindowsXP, wtf? */ - GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + stat = GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + expect(Ok, stat); GdipGetFontSize (font, &size); ok (size == 24, "Expected 24, got %f (with unit: %d)\n", size, i); GdipGetFontUnit (font, &unit); @@ -107,7 +108,8 @@ static void test_logfont(void) UINT16 em_height, line_spacing; Unit unit; - GdipCreateFromHDC(hdc, &graphics); + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index a96050b06d..96df1a2743 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -365,7 +365,8 @@ static void test_save_restore(void) log_state(state_a, &state_log); /* BeginContainer and SaveGraphics use the same stack. */ - GdipCreateFromHDC(hdc, &graphics1); + stat = GdipCreateFromHDC(hdc, &graphics1); + expect(Ok, stat); GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); stat = GdipBeginContainer2(graphics1, &state_a); expect(Ok, stat); @@ -731,7 +732,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix(&transform); expect(Ok, status); GdipGetWorldTransform(graphics, transform); - GdipGetMatrixElements(transform, elems); + status = GdipGetMatrixElements(transform, elems); + expect(Ok, status); ok(fabs(defTrans[0] - elems[0]) < 0.0001 && fabs(defTrans[1] - elems[1]) < 0.0001 && fabs(defTrans[2] - elems[2]) < 0.0001 && @@ -1600,10 +1602,12 @@ static void test_Get_Release_DC(void) status = GdipCreateMatrix(&m); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); GdipCreatePath(FillModeAlternate, &path); - GdipCreateRegion(&clip); + status = GdipCreateRegion(&clip); + expect(Ok, status); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b444effb1..28f0fcec93 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -367,7 +367,8 @@ static void test_GdipImageGetFrameDimensionsCount(void) /* SelectActiveFrame has no effect on image data of memory bitmaps */ color = 0xdeadbeef; - GdipBitmapGetPixel(bm, 0, 0, &color); + stat = GdipBitmapGetPixel(bm, 0, 0, &color); + expect(Ok, stat); expect(0xffffffff, color); GdipDisposeImage((GpImage*)bm); @@ -2724,7 +2725,7 @@ static void test_multiframegif(void) expect(Ok, stat); color = 0xdeadbeef; - GdipBitmapGetPixel(bmp, 0, 0, &color); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); expect(0xffffffff, color); diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 3f6292c6cc..9bd3ac5452 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -80,7 +80,8 @@ static void test_hascurve(void) GdipDeletePathIter(iter); - GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + expect(Ok, stat); stat = GdipCreatePathIter(&iter, path); expect(Ok, stat); @@ -330,9 +331,12 @@ static void test_isvalid(void) GdipDeletePathIter(iter); /* no markers */ - GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); - GdipCreatePathIter(&iter, path); - GdipPathIterNextMarker(iter, &result, &start, &end); + stat = GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); + expect(Ok, stat); + stat = GdipCreatePathIter(&iter, path); + expect(Ok, stat); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); isvalid = FALSE; stat = GdipPathIterIsValid(iter, &isvalid); expect(Ok, stat); @@ -527,7 +531,8 @@ static void test_nextpathtype(void) todo_wine expect(0, result); GdipDeletePathIter(iter); - GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + expect(Ok, stat); GdipCreatePathIter(&iter, path); start = end = result = (INT)0xdeadbeef; type = 255; /* out of range */ -- 2.15.0

2 1

[PATCH v6 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer Nov. 30, 2017

Nov. 30, 2017

v4 remove global variable don't check if functions are available fix RemoveFontResourceExA test properly release dc add another test for completeness sake v6 Don't truncate strings, instead only compare up to LF_FACESIZE - 1 characters Also fix copying of the strings if they should be too long Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 45 +++++++++++-------------- dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 142 insertions(+), 26 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..7c5a7ef979 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1027,7 +1027,7 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { const struct list *face_list; - if(face_name && strcmpiW(face_name, family->FamilyName)) + if(face_name && strncmpiW(face_name, family->FamilyName, LF_FACESIZE - 1)) continue; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) @@ -1053,7 +1053,7 @@ static Family *find_family_from_name(const WCHAR *name) LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { - if(!strcmpiW(family->FamilyName, name)) + if(!strncmpiW(family->FamilyName, name, LF_FACESIZE -1)) return family; } @@ -1066,9 +1066,9 @@ static Family *find_family_from_any_name(const WCHAR *name) LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { - if(!strcmpiW(family->FamilyName, name)) + if(!strncmpiW(family->FamilyName, name, LF_FACESIZE - 1)) return family; - if(family->EnglishName && !strcmpiW(family->EnglishName, name)) + if(family->EnglishName && !strncmpiW(family->EnglishName, name, LF_FACESIZE - 1)) return family; } @@ -2141,13 +2141,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); - if (strlenW(family->FamilyName) >= LF_FACESIZE) - { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; - } if (insert_face_in_family_list( face, family )) { @@ -2471,7 +2464,7 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, name)) + if(!strncmpiW(font_link->font_name, name, LF_FACESIZE - 1)) return font_link; } @@ -4320,7 +4313,7 @@ static BOOL move_to_front(const WCHAR *name) Family *family, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(family, cursor2, &font_list, Family, entry) { - if(!strcmpiW(family->FamilyName, name)) + if(!strncmpiW(family->FamilyName, name, LF_FACESIZE - 1)) { list_remove(&family->entry); list_add_head(&font_list, &family->entry); @@ -5476,8 +5469,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) or if that's unavailable the first charset that the font supports. */ LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if (!strcmpiW(family->FamilyName, FaceName) || - (psub && !strcmpiW(family->FamilyName, psub->to.name))) + if (!strncmpiW(family->FamilyName, FaceName, LF_FACESIZE - 1) || + (psub && !strncmpiW(family->FamilyName, psub->to.name, LF_FACESIZE - 1))) { font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); @@ -5499,7 +5492,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->FullName && !strcmpiW(face->FullName, FaceName) && + if(face->FullName && !strncmpiW(face->FullName, FaceName, LF_FACESIZE - 1) && (face->scalable || can_use_bitmap)) { if (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || !csi.fs.fsCsb[0]) @@ -5518,8 +5511,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) */ LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, FaceName) || - (psub && !strcmpiW(font_link->font_name,psub->to.name))) + if(!strncmpiW(font_link->font_name, FaceName, LF_FACESIZE - 1) || + (psub && !strncmpiW(font_link->font_name,psub->to.name, LF_FACESIZE - 1))) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) @@ -5569,7 +5562,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) else strcpyW(lf.lfFaceName, defSans); LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if(!strcmpiW(family->FamilyName, lf.lfFaceName)) { + if(!strncmpiW(family->FamilyName, lf.lfFaceName, LF_FACESIZE - 1)) { font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { @@ -6037,20 +6030,20 @@ static BOOL family_matches(Family *family, const WCHAR *face_name) Face *face; const struct list *face_list; - if (!strcmpiW(face_name, family->FamilyName)) return TRUE; + if (!strncmpiW(face_name, family->FamilyName, LF_FACESIZE - 1)) return TRUE; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) - if (face->FullName && !strcmpiW(face_name, face->FullName)) return TRUE; + if (face->FullName && !strncmpiW(face_name, face->FullName, LF_FACESIZE - 1)) return TRUE; return FALSE; } static BOOL face_matches(const WCHAR *family_name, Face *face, const WCHAR *face_name) { - if (!strcmpiW(face_name, family_name)) return TRUE; + if (!strncmpiW(face_name, family_name, LF_FACESIZE - 1)) return TRUE; - return (face->FullName && !strcmpiW(face_name, face->FullName)); + return (face->FullName && !strncmpiW(face_name, face->FullName, LF_FACESIZE - 1)); } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, @@ -6082,11 +6075,11 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha /* Font Replacement */ if (family != face->family) { - strcpyW(elf.elfLogFont.lfFaceName, family->FamilyName); + lstrcpynW(elf.elfLogFont.lfFaceName, family->FamilyName, LF_FACESIZE); if (face->FullName) - strcpyW(elf.elfFullName, face->FullName); + lstrcpynW(elf.elfFullName, face->FullName, LF_FULLFACESIZE); else - strcpyW(elf.elfFullName, family->FamilyName); + lstrcpynW(elf.elfFullName, family->FamilyName, LF_FULLFACESIZE); } if (subst) strcpyW(elf.elfLogFont.lfFaceName, subst); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..bd04a8b6b1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,6 +6679,59 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + BOOL *found_font = (BOOL *)lparam; + *found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + BOOL found_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + dc = GetDC(NULL); + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_1_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == FALSE, "EnumFontFamiliesExA must not find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + START_TEST(font) { init(); @@ -6742,6 +6795,7 @@ START_TEST(font) test_fake_bold_font(); test_bitmap_font_glyph_index(); test_GetCharWidthI(); + test_long_names(); /* These tests should be last test until RemoveFontResource * is properly implemented. diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+(a)4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p(a)gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#X<P zGYZ^mp7eaHlioTG(a)dD{@Nl&-qx{r0-puI`@sg8fEhikY%`8CpJ*Y5=DvzvRAf5PLx z>c#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD(a)Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES(a)9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr(a)u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg(a)U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj(a)vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

3 5

[PATCH] msvcrt: Don't report error in fclose on already closed stream
by Piotr Caban Nov. 30, 2017

Nov. 30, 2017

For bug #44091. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 ++++++ dlls/msvcrt/tests/file.c | 3 +++ 2 files changed, 9 insertions(+)

1 0

[PATCH] msvcrt: Change how fread splits reading into chunks
by Piotr Caban Nov. 30, 2017

Nov. 30, 2017

It affects fd stream position and buffer content on unsuccessul reads. For bug #43116. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/tests/file.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-)

1 0

[PATCH 01/1] dlls/wined3d/: remove outdated comment
by Austin English Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0ff9ee44bb..317152ceec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2715,8 +2715,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /***************************************************************************** * Functions to generate GLSL strings from DirectX Shader bytecode begin here. - * - * For more information, see http://wiki.winehq.org/DirectX-Shaders ****************************************************************************/ /* Prototypes */ -- 2.13.6

1 0