June 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : shlwapi/tests: Skip if test ini file wasn't created.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 31fb427737f189b7a1750b0c3c5059614955e0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fb427737f189b7a1750b0c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:56:13 2014 +0400 shlwapi/tests: Skip if test ini file wasn't created. --- dlls/shlwapi/tests/ordinal.c | 66 +++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6833095..531844f 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2667,7 +2667,7 @@ static void test_SHIShellFolder_EnumObjects(void) IShellFolder_Release(folder); } -static void write_inifile(LPCWSTR filename) +static BOOL write_inifile(LPCWSTR filename) { DWORD written; HANDLE file; @@ -2678,12 +2678,16 @@ static void write_inifile(LPCWSTR filename) "AnotherKey=asdf\r\n"; file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(file == INVALID_HANDLE_VALUE) - return; + if(file == INVALID_HANDLE_VALUE) { + win_skip("failed to create ini file at %s\n", wine_dbgstr_w(filename)); + return FALSE; + } WriteFile(file, data, sizeof(data), &written, NULL); CloseHandle(file); + + return TRUE; } #define verify_inifile(f, e) r_verify_inifile(__LINE__, f, e) @@ -2694,6 +2698,7 @@ static void r_verify_inifile(unsigned l, LPCWSTR filename, LPCSTR exp) DWORD read; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) return; @@ -2712,52 +2717,54 @@ static void test_SHGetIniString(void) WCHAR out[64] = {0}; static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; - static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; static const WCHAR AKeyW[] = {'A','K','e','y',0}; static const WCHAR AnotherKeyW[] = {'A','n','o','t','h','e','r','K','e','y',0}; static const WCHAR JunkKeyW[] = {'J','u','n','k','K','e','y',0}; + static const WCHAR testpathW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + WCHAR pathW[MAX_PATH]; if(!pSHGetIniStringW || is_win2k_and_lower){ win_skip("SHGetIniStringW is not available\n"); return; } - write_inifile(TestIniW); + lstrcpyW(pathW, testpathW); + + if (!write_inifile(pathW)) + return; if(0){ /* these crash on Windows */ pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); - pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); - pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); + pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), pathW); + pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), pathW); } - ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, TestIniW); + ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); /* valid arguments */ - ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s\n", - wine_dbgstr_w(AKeyW), wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); - ok(broken(*out == 0) || /*win 98 */ - !strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(broken(*out == 0) || /* win 98 */ - !strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), TestIniW); + out[0] = 0; + SetLastError(0xdeadbeef); + ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), pathW); + ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s, %d\n", + wine_dbgstr_w(AKeyW), wine_dbgstr_w(out), GetLastError()); + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), pathW); + ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); + ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), pathW); + ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + + out[0] = 1; + ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); ok(*out == 0, "Expected L\"\", got: %s\n", wine_dbgstr_w(out)); - DeleteFileW(TestIniW); + DeleteFileW(pathW); } static void test_SHSetIniString(void) @@ -2776,7 +2783,8 @@ static void test_SHSetIniString(void) return; } - write_inifile(TestIniW); + if (!write_inifile(TestIniW)) + return; ret = pSHSetIniStringW(TestAppW, AKeyW, AValueW, TestIniW); ok(ret == TRUE, "SHSetIniStringW should not have failed\n");

1 0

Damjan Jovanovic : winex11.drv: Store XDND cached data in global memory objects.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: a58c220d9ba4ab496e4c33f5551c480caf172846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58c220d9ba4ab496e4c33f55… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:32 2014 +0200 winex11.drv: Store XDND cached data in global memory objects. --- dlls/winex11.drv/xdnd.c | 60 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index db88fc2..4cd67de 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -38,6 +38,7 @@ #define COBJMACROS #include "x11drv.h" +#include "shellapi.h" #include "shlobj.h" /* DROPFILES */ #include "oleidl.h" #include "objidl.h" @@ -56,8 +57,7 @@ typedef struct tagXDNDDATA { int cf_win; Atom cf_xdnd; - void *data; - unsigned int size; + HANDLE contents; struct list entry; } XDNDDATA, *LPXDNDDATA; @@ -71,7 +71,7 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); +static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, @@ -516,7 +516,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, if (current->cf_win != CF_HDROP && current->cf_win < CF_MAX) { list_remove(&current->entry); - HeapFree(GetProcessHeap(), 0, current->data); + GlobalFree(current->contents); HeapFree(GetProcessHeap(), 0, current); } } @@ -529,7 +529,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, * * Cache available XDND property */ -static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len) +static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents) { LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); @@ -538,8 +538,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns EnterCriticalSection(&xdnd_cs); current->cf_xdnd = property; current->cf_win = format; - current->data = data; - current->size = len; + current->contents = contents; list_add_tail(&xdndData, &current->entry); LeaveCriticalSection(&xdnd_cs); } @@ -553,14 +552,20 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns */ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len) { - void* xdata; + HANDLE xdata; TRACE("%d: %s\n", property, data); /* Always include the raw type */ - xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - memcpy(xdata, data, len); - X11DRV_XDND_InsertXDNDData(property, property, xdata, len); + xdata = GlobalAlloc(GMEM_FIXED, len); + if (xdata) + { + memcpy(GlobalLock(xdata), data, len); + GlobalUnlock(xdata); + X11DRV_XDND_InsertXDNDData(property, property, xdata); + } + else + ERR("out of memory\n"); if (property == x11drv_atom(text_uri_list)) X11DRV_XDND_DeconstructTextURIList(property, data, len); @@ -571,18 +576,7 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr UINT windowsFormat; contents = X11DRV_CLIPBOARD_ImportSelection(display, property, xwin, x11drv_atom(XdndTarget), &windowsFormat); if (contents) - { - void *data = HeapAlloc(GetProcessHeap(), 0, GlobalSize(contents)); - if (data) - { - memcpy(data, GlobalLock(contents), GlobalSize(contents)); - GlobalUnlock(contents); - X11DRV_XDND_InsertXDNDData(property, windowsFormat, data, GlobalSize(contents)); - } - else - ERR("out of memory\n"); - GlobalFree(contents); - } + X11DRV_XDND_InsertXDNDData(property, windowsFormat, contents); } } @@ -651,10 +645,12 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) } if (out && end >= len) { + HDROP hDrop; DROPFILES *dropFiles; - dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); - if (dropFiles) + hDrop = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + if (hDrop) { + dropFiles = GlobalLock(hDrop); dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = XDNDxy.x; dropFiles->pt.y = XDNDxy.y; @@ -662,7 +658,8 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) dropFiles->fWide = TRUE; out[size] = '\0'; memcpy(((char*)dropFiles) + dropFiles->pFiles, out, (size + 1)*sizeof(WCHAR)); - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + GlobalUnlock(hDrop); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, hDrop); count = 1; } } @@ -693,14 +690,14 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (found) { - HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size); + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - memcpy(lpDrop, current->data, current->size); + memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); @@ -730,7 +727,7 @@ static void X11DRV_XDND_FreeDragDropOp(void) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) { list_remove(&current->entry); - HeapFree(GetProcessHeap(), 0, current->data); + GlobalFree(current->contents); HeapFree(GetProcessHeap(), 0, current); } @@ -917,11 +914,12 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GlobalSize(current->contents)); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), GlobalLock(current->contents), GlobalSize(current->contents)); GlobalUnlock(pMedium->u.hGlobal); + GlobalUnlock(current->contents); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Damjan Jovanovic : winex11.drv: Import text/ plain XDND selections through the clipboard.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: c2f73b97802dc9e1f84220c271038b97415bad5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f73b97802dc9e1f84220c27… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:27 2014 +0200 winex11.drv: Import text/plain XDND selections through the clipboard. --- dlls/winex11.drv/clipboard.c | 1 + dlls/winex11.drv/xdnd.c | 57 ------------------------------------------ 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 350eeab..dfd09e9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -186,6 +186,7 @@ static const struct } builtin_formats[] = { { CF_TEXT, XA_STRING, X11DRV_CLIPBOARD_ImportXAString, X11DRV_CLIPBOARD_ExportString}, + { CF_TEXT, XATOM_text_plain, X11DRV_CLIPBOARD_ImportXAString, X11DRV_CLIPBOARD_ExportString}, { CF_BITMAP, XATOM_WCF_BITMAP, X11DRV_CLIPBOARD_ImportClipboardData, NULL}, { CF_METAFILEPICT, XATOM_WCF_METAFILEPICT, X11DRV_CLIPBOARD_ImportMetaFilePict, X11DRV_CLIPBOARD_ExportMetaFilePict }, { CF_SYLK, XATOM_WCF_SYLK, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2184a42..db88fc2 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -73,13 +73,11 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); -static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); -static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI); static CRITICAL_SECTION xdnd_cs; @@ -566,8 +564,6 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr if (property == x11drv_atom(text_uri_list)) X11DRV_XDND_DeconstructTextURIList(property, data, len); - else if (property == x11drv_atom(text_plain)) - X11DRV_XDND_DeconstructTextPlain(property, data, len); else { /* use the clipboard import functions for other types */ @@ -676,25 +672,6 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) /************************************************************************** - * X11DRV_XDND_DeconstructTextPlain - * - * Interpret text/plain Data and add records to <dndfmt> linked list - */ -static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) -{ - char* dostext; - - /* Always supply plain text */ - X11DRV_XDND_UnixToDos(&dostext, data, len); - X11DRV_XDND_InsertXDNDData(property, CF_TEXT, dostext, strlen(dostext)); - - TRACE("CF_TEXT (%d): %s\n", CF_TEXT, dostext); - - return 1; -} - - -/************************************************************************** * X11DRV_XDND_SendDropFiles */ static void X11DRV_XDND_SendDropFiles(HWND hwnd) @@ -766,40 +743,6 @@ static void X11DRV_XDND_FreeDragDropOp(void) } - -/************************************************************************** - * X11DRV_XDND_UnixToDos - */ -static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len) -{ - int i; - unsigned int destlen, lines; - - for (i = 0, lines = 0; i <= len; i++) - { - if (lpsrc[i] == '\n') - lines++; - } - - destlen = len + lines + 1; - - if (lpdest) - { - char* lpstr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, destlen); - for (i = 0, lines = 0; i <= len; i++) - { - if (lpsrc[i] == '\n') - lpstr[++lines + i] = '\r'; - lpstr[lines + i] = lpsrc[i]; - } - - *lpdest = lpstr; - } - - return lines; -} - - /************************************************************************** * X11DRV_XDND_URIToDOS */

1 0

Michael Stefaniuc : dmusic: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 147f100f3ea88851777ac78ef74b397490fceb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147f100f3ea88851777ac78ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:14:58 2014 +0200 dmusic: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmusic/collection.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c7084db..f3bb510 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -35,7 +35,6 @@ typedef struct IDirectMusicCollectionImpl { IStream *pStm; /* stream from which we load collection and later instruments */ LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - DMUS_OBJECTDESC *pDesc; CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ DLSHEADER *pHeader; /* pool table */ @@ -440,14 +439,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST } case FOURCC_DLID: { TRACE_(dmfile)(": DLID (GUID) chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read(stream, &This->pDesc->guidObject, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read(stream, &This->dmobj.desc.guidObject, chunk.dwSize, NULL); break; } case FOURCC_VERS: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read(stream, &This->pDesc->vVersion, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read(stream, &This->dmobj.desc.vVersion, chunk.dwSize, NULL); break; } case FOURCC_PTBL: { @@ -475,9 +474,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case mmioFOURCC('I','N','A','M'): { CHAR szName[DMUS_MAX_NAME]; TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; IStream_Read(stream, szName, chunk.dwSize, NULL); - MultiByteToWideChar(CP_ACP, 0, szName, -1, This->pDesc->wszName, DMUS_MAX_NAME); + MultiByteToWideChar(CP_ACP, 0, szName, -1, This->dmobj.desc.wszName, DMUS_MAX_NAME); if (even_or_odd(chunk.dwSize)) { ListCount[0]++; liMove.QuadPart = 1; @@ -671,13 +670,13 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST struct list *listEntry; TRACE("*** IDirectMusicCollection (%p) ***\n", &This->IDirectMusicCollection_iface); - if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) - TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); - if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, - (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); - if (This->pDesc->dwValidData & DMUS_OBJ_NAME) - TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_OBJECT) + TRACE(" - GUID = %s\n", debugstr_dmguid(&This->dmobj.desc.guidObject)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_VERSION) + TRACE(" - Version = %i,%i,%i,%i\n", (This->dmobj.desc.vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionMS & 0x0000FFFF, + (This->dmobj.desc.vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionLS & 0x0000FFFF); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_NAME) + TRACE(" - Name = %s\n", debugstr_w(This->dmobj.desc.wszName)); TRACE(" - Collection header:\n"); TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments); @@ -724,7 +723,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p (IUnknown*)&obj->IDirectMusicCollection_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; list_init (&obj->Instruments);

1 0

Vincent Povirk : notepad: Check IsDialogMessage before TranslateAccelerator.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 8e873c8afcc23ad012177fc8c9eeda72ce648f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e873c8afcc23ad012177fc8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 21 11:18:03 2014 -0500 notepad: Check IsDialogMessage before TranslateAccelerator. --- programs/notepad/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 5c465ca..8b654da 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -790,7 +790,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) while (GetMessageW(&msg, 0, 0, 0)) { - if (!TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg) && !IsDialogMessageW(Globals.hFindReplaceDlg, &msg)) + if (!IsDialogMessageW(Globals.hFindReplaceDlg, &msg) && !TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg)) { TranslateMessage(&msg); DispatchMessageW(&msg);

1 0

Andrew Eikum : ole32: Fix return value logging.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: f02c0ae6567bb28a6afd8967d97aa9455f737e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02c0ae6567bb28a6afd8967d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 09:07:39 2014 -0500 ole32: Fix return value logging. --- dlls/ole32/stg_stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index b60b17b..7738cf1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -252,7 +252,7 @@ static HRESULT WINAPI StgStreamImpl_Write( if (SUCCEEDED(res)) res = StorageBaseImpl_Flush(This->parentStorage); - TRACE("<-- S_OK, written %u\n", *pcbWritten); + TRACE("<-- %08x, written %u\n", res, *pcbWritten); return res; }

1 0

Nikolay Sivov : quartz/tests: Unregister filters only when registered successfully.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: c6de8ad981fed73c3bbcab34df50358d900ee4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6de8ad981fed73c3bbcab34d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 13 10:19:35 2014 +0400 quartz/tests: Unregister filters only when registered successfully. --- dlls/quartz/tests/filtergraph.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6938e67..713df7b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1847,17 +1847,17 @@ static void test_render_filter_priority(void) get_connected_filter_name(ptestfilter, ConnectedFilterName1); ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), "unexpected connected filter: %s\n", ConnectedFilterName1); - } - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter3); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter4); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter2); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter3); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter4); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out:

1 0

Henri Verbeet : wined3d: Add format information for WINED3DFMT_R8_UNORM.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: fa312a32b268c6c3199867d7a5911e3d706e70eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa312a32b268c6c3199867d7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:19 2014 +0200 wined3d: Add format information for WINED3DFMT_R8_UNORM. --- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/utils.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5eb685..515e815 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6567,7 +6567,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED]) + && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED] + && gl_info->supported[ARB_TEXTURE_RG]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6a27920..afc77fc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -85,6 +85,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, {WINED3DFMT_B4G4R4A4_UNORM, 4, 4, 4, 4, 8, 4, 0, 12, 2, 0, 0}, {WINED3DFMT_B2G3R3_UNORM, 3, 3, 2, 0, 5, 2, 0, 0, 1, 0, 0}, + {WINED3DFMT_R8_UNORM, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_B2G3R3A8_UNORM, 3, 3, 2, 8, 5, 2, 0, 8, 2, 0, 0}, {WINED3DFMT_B4G4R4X4_UNORM, 4, 4, 4, 0, 8, 4, 0, 0, 2, 0, 0}, @@ -782,6 +783,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RGB, GL_UNSIGNED_BYTE_3_3_2, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_R8_UNORM, GL_R8, GL_R8, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, @@ -3056,6 +3062,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, + {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12},

1 0

Henri Verbeet : ddraw: Don' t try to create surfaces for wined3d internal textures.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: d30720d825fc594559104c12f27858f89a8673ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30720d825fc594559104c12f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:18 2014 +0200 ddraw: Don't try to create surfaces for wined3d internal textures. --- dlls/ddraw/ddraw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aa74a1e..062fe02 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4733,8 +4733,8 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", device_parent, container_parent, surface, parent, parent_ops); - /* We have a swapchain texture. */ - if (container_parent == ddraw) + /* We have a swapchain or wined3d internal texture. */ + if (!container_parent || container_parent == ddraw) { *parent = NULL; *parent_ops = &ddraw_null_wined3d_parent_ops;

1 0

Michael Stefaniuc : dmusic: Move the common parts of DMObject to a generic implementation.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 02ed47fa3c69b399dc6360379ffe93390358f447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ed47fa3c69b399dc6360379… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:10:24 2014 +0200 dmusic: Move the common parts of DMObject to a generic implementation. --- dlls/dmusic/Makefile.in | 1 + dlls/dmusic/collection.c | 151 +++++++----------------------------------- dlls/dmusic/dmobject.c | 144 ++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 44 ++++++++++++ dlls/dmusic/dmusic_private.h | 7 -- 5 files changed, 214 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02ed47fa3c69b399dc636…

1 0

Alexandre Julliard : gdi32/tests: Remove some noisy traces.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 7d21dd26c83c1a1a869fb29955e2c1d805e2ca9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21dd26c83c1a1a869fb2995… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 10:12:28 2014 +0200 gdi32/tests: Remove some noisy traces. --- dlls/gdi32/tests/font.c | 47 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index dd63297..245fd56 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -960,7 +960,6 @@ static void test_bitmap_font_metrics(void) if(!TranslateCharsetInfo( fs, &csi, TCI_SRCFONTSIG )) continue; lf.lfCharSet = csi.ciCharset; - trace("looking for %s height %d charset %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet); ret = EnumFontFamiliesExA(hdc, &lf, find_font_proc, (LPARAM)&lf, 0); if (fd[i].height & FH_SCALE) ok(ret, "scaled font height %d should not be enumerated\n", height); @@ -988,7 +987,6 @@ static void test_bitmap_font_metrics(void) { ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n"); ok(ret != expected_cs, "font charset %d should not be %d\n", ret, expected_cs); - trace("Skipping replacement %s height %d charset %d\n", face_name, tm.tmHeight, tm.tmCharSet); SelectObject(hdc, old_hfont); DeleteObject(hfont); continue; @@ -1843,7 +1841,6 @@ static void test_height( HDC hdc, const struct font_data *fd ) ok(ret, "GetTextMetrics error %d\n", GetLastError()); if(fd[i].dpi == tm.tmDigitizedAspectX) { - trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmWeight, fd[i].weight); ok(match_off_by_1(tm.tmHeight, fd[i].height, fd[i].exact), "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmHeight, fd[i].height); ok(match_off_by_1(tm.tmAscent, fd[i].ascent, fd[i].exact), "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmAscent, fd[i].ascent); @@ -2215,8 +2212,6 @@ static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) } } - trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar); - y += size.cy; str = pLastChar; } while (*str && y < clientArea->bottom); @@ -4879,8 +4874,6 @@ static void test_fullname2_helper(const char *Family) FaceName = (char *)efnd.elf[i].elfFullName; StyleName = (char *)efnd.elf[i].elfStyle; - trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); - get_vertical = ( FamilyName[0] == '@' ); ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); @@ -4906,12 +4899,8 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FONT_FAMILY found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "FAMILY (family name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: FAMILY (family name) could not be read\n", FamilyName); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); @@ -4921,44 +4910,32 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FULL_NAME found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + ok(!lstrcmpA(FaceName, bufA), "%s: font face names don't match: returned %s, expect %s\n", FamilyName, FaceName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; - ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + ok(!lstrcmpA(FaceName, otmStr), "%s: FaceName %s doesn't match otmpFaceName %s\n", FamilyName, FaceName, otmStr); bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FONT_SUBFAMILY found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "SUBFAMILY (style name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA); + ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName; - ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr); + ok(!lstrcmpA(StyleName, otmStr), "%s: StyleName %s doesn't match otmpStyleName %s\n", FamilyName, StyleName, otmStr); bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized UNIQUE_ID found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "UNIQUE_ID (full name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: UNIQUE_ID (full name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "%s: UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", FamilyName, otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont);

1 0

Henri Verbeet : user32: Ensure at least one character is used in TEXT_WordBreak().
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: f25317a6086700ec5c895cab9a1c791a17d8ff01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25317a6086700ec5c895cab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:22 2014 +0200 user32: Ensure at least one character is used in TEXT_WordBreak(). --- dlls/user32/tests/text.c | 8 ++++++++ dlls/user32/text.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 19bcd72..06705a7 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -564,6 +564,10 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK); ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", textheight, heightcheck * 2); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK | DT_EDITCONTROL); + ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", + textheight, heightcheck * 6); SetRect(&rect, 0, 0, 1, 1); heightcheck = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT); @@ -571,6 +575,10 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", textheight, heightcheck * 2); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK | DT_EDITCONTROL); + ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", + textheight, heightcheck * 6); SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index fdc3554..66a35d2 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -413,8 +413,9 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, DT_EDITCONTROL) { /* break the word after the last character that fits (there must be - * at least one; none is caught earlier). - */ + * at least one). */ + if (!chars_fit) + ++chars_fit; *len_str = chars_fit; *chars_used = chars_fit;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GetDeviceRemovedReason() .
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 8d23f13b1655c34f1f4e524f69d251611202269a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d23f13b1655c34f1f4e524f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:21 2014 +0200 d3d10core: Implement d3d10_device_GetDeviceRemovedReason(). --- dlls/d3d10core/device.c | 7 +++++-- dlls/d3d10core/tests/device.c | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1aa5e8b..722b5aa 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1007,9 +1007,12 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_GetDeviceRemovedReason(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + /* In the current implementation the device is never removed, so we can + * just return S_OK here. */ + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_SetExceptionMode(ID3D10Device1 *iface, UINT flags) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8fb62a0..d761dae 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -880,6 +880,27 @@ static void test_create_predicate(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_device_removed_reason(void) +{ + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_create_texture2d(); @@ -893,4 +914,5 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_predicate(); + test_device_removed_reason(); }

1 0

Henri Verbeet : d3d10_1: Forward D3D10CreateEffectFromMemory to d3d10.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 90e662c4e7d34b4112e9d1cd87def97d56e2c5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e662c4e7d34b4112e9d1cd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:20 2014 +0200 d3d10_1: Forward D3D10CreateEffectFromMemory to d3d10. --- dlls/d3d10_1/d3d10_1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 5ec86f8..4ca69ec 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -4,7 +4,7 @@ @ stub D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stub D3D10CreateDeviceAndSwapChain1 -@ stub D3D10CreateEffectFromMemory +@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stub D3D10CreateEffectPoolFromMemory @ stub D3D10CreateStateBlock @ stub D3D10DisassembleEffect

1 0

Akihiro Sagawa : user32: Don' t close a popup menu when clicking a sub-menu parent item twice.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: cb2b15921daeebf763e8eb34fd9fa336d3b3311a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2b15921daeebf763e8eb34f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 13 21:11:34 2014 +0900 user32: Don't close a popup menu when clicking a sub-menu parent item twice. --- dlls/user32/menu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0aa7744..93bee49 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2617,13 +2617,14 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) return executedMenuId; } - /* If we are dealing with the top-level menu */ + /* If we are dealing with the menu bar */ /* and this is a click on an already "popped" item: */ /* Stop the menu tracking and close the opened submenus */ if((pmt->hTopMenu == hPtMenu) && ptmenu->bTimeToHide) return 0; } - ptmenu->bTimeToHide = TRUE; + if( GetMenu(ptmenu->hWnd) == hPtMenu ) + ptmenu->bTimeToHide = TRUE; } return -1; }

1 0

Alexandre Julliard : user32/tests: Remove some noisy traces.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: a95651a5dc7b6b2bb62b3a68a4f1c2bcb7edb29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95651a5dc7b6b2bb62b3a68a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 10:12:32 2014 +0200 user32/tests: Remove some noisy traces. --- dlls/user32/tests/win.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cbcd6b6..5bdfed6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -705,19 +705,12 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { case WM_GETMINMAXINFO: { - MINMAXINFO* minmax = (MINMAXINFO *)lparam; - - trace("WM_GETMINMAXINFO: hwnd %p, %08lx, %08lx\n", hwnd, wparam, lparam); - dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } case WM_WINDOWPOSCHANGING: { WINDOWPOS *winpos = (WINDOWPOS *)lparam; - trace("main: WM_WINDOWPOSCHANGING %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", - winpos->hwnd, winpos->hwndInsertAfter, - winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); if (!(winpos->flags & SWP_NOMOVE)) { ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); @@ -739,9 +732,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { RECT rc1, rc2; WINDOWPOS *winpos = (WINDOWPOS *)lparam; - trace("main: WM_WINDOWPOSCHANGED %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", - winpos->hwnd, winpos->hwndInsertAfter, - winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); ok(winpos->y >= -32768 && winpos->y <= 32767, "bad winpos->y %d\n", winpos->y); @@ -775,10 +765,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR BOOL got_getminmaxinfo = GetWindowLongPtrA(hwnd, GWLP_USERDATA) == 0x20031021; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; - trace("WM_NCCREATE: hwnd %p, parent %p, style %08x\n", hwnd, cs->hwndParent, cs->style); - if (got_getminmaxinfo) - trace("%p got WM_GETMINMAXINFO\n", hwnd); - if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) ok(got_getminmaxinfo, "main: WM_GETMINMAXINFO should have been received before WM_NCCREATE\n"); else @@ -803,10 +789,6 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { case WM_GETMINMAXINFO: { - MINMAXINFO* minmax = (MINMAXINFO *)lparam; - - trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam); - dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } @@ -815,10 +797,6 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR BOOL got_getminmaxinfo = GetWindowLongPtrA(hwnd, GWLP_USERDATA) == 0x20031021; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; - trace("WM_NCCREATE: hwnd %p, parent %p, style %08x\n", hwnd, cs->hwndParent, cs->style); - if (got_getminmaxinfo) - trace("%p got WM_GETMINMAXINFO\n", hwnd); - if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) ok(got_getminmaxinfo, "tool: WM_GETMINMAXINFO should have been received before WM_NCCREATE\n"); else

1 0

Akihiro Sagawa : kernel32: Return correct buffer size when returning DBCS characters.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 80695cde4f475903f355821fec0d9c978c9aa29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80695cde4f475903f355821fe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 12 22:51:24 2014 +0900 kernel32: Return correct buffer size when returning DBCS characters. --- dlls/kernel32/tests/time.c | 17 ++++++++++++++++- dlls/kernel32/time.c | 13 +++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0cc4485..55d4be9 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -667,7 +667,7 @@ static void test_GetCalendarInfo(void) char bufferA[20]; WCHAR bufferW[20]; DWORD val1, val2; - int ret; + int ret, ret2; if (!pGetCalendarInfoA || !pGetCalendarInfoW) { @@ -716,6 +716,21 @@ static void test_GetCalendarInfo(void) ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); + + ret = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferA, sizeof(bufferA), NULL); + ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ret2 = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferA, 0, NULL); + ok( ret2, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret == ret2, "got %d, expected %d\n", ret2, ret ); + + ret2 = pGetCalendarInfoW( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferW, sizeof(bufferW), NULL); + ok( ret2, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ret2 = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + ok( ret == ret2, "got %d, expected %d\n", ret, ret2 ); + } START_TEST(time) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 11df7ff..21ac120 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -614,7 +614,7 @@ BOOL WINAPI GetProcessTimes( HANDLE hprocess, LPFILETIME lpCreationTime, int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, LPSTR lpCalData, int cchData, LPDWORD lpValue) { - int ret; + int ret, cchDataW = cchData; LPWSTR lpCalDataW = NULL; if (NLS_IsUnicodeOnlyLcid(lcid)) @@ -623,13 +623,14 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, return 0; } - if (cchData && - !(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchData*sizeof(WCHAR)))) - return 0; + if (!cchData && !(CalType & CAL_RETURN_NUMBER)) + cchDataW = GetCalendarInfoW(lcid, Calendar, CalType, NULL, 0, NULL); + if (!(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchDataW*sizeof(WCHAR)))) + return 0; - ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); + ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchDataW, lpValue); if(ret && lpCalDataW && lpCalData) - WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); + ret = WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); else if (CalType & CAL_RETURN_NUMBER) ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW);

1 0

Guillaume Charifi : pdh: Implement PdhExpandCounterPathA/W.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: f823b6abe3265f0ed45796f6064a66fde453cb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f823b6abe3265f0ed45796f60… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Wed Jun 4 19:00:50 2014 +0200 pdh: Implement PdhExpandCounterPathA/W. --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index b475d53..fc1aa4f 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -36,8 +36,8 @@ @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW @ stub PdhEnumObjectsW -@ stub PdhExpandCounterPathA -@ stub PdhExpandCounterPathW +@ stdcall PdhExpandCounterPathA(str ptr ptr) +@ stdcall PdhExpandCounterPathW(wstr ptr ptr) @ stdcall PdhExpandWildCardPathA(str str ptr ptr long) @ stub PdhExpandWildCardPathHA @ stub PdhExpandWildCardPathHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 25bd858..f197095 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -636,6 +636,24 @@ PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCa } /*********************************************************************** + * PdhExpandCounterPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathA( LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathA(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** + * PdhExpandCounterPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathW( LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathW(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** * PdhGetCounterInfoA (PDH.@) */ PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info )

1 0

Guillaume Charifi : ole32: CoCreateGuid returns E_INVALIDARG on null-GUID.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 216b24527dc2b465a87ea72b848f4ca51708f903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216b24527dc2b465a87ea72b8… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sat Jun 7 19:24:28 2014 +0200 ole32: CoCreateGuid returns E_INVALIDARG on null-GUID. --- dlls/ole32/compobj.c | 6 +++++- dlls/ole32/tests/compobj.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 250c0f9..d117c02 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2051,7 +2051,11 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) */ HRESULT WINAPI CoCreateGuid(GUID *pguid) { - DWORD status = UuidCreate(pguid); + DWORD status; + + if(!pguid) return E_INVALIDARG; + + status = UuidCreate(pguid); if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; return HRESULT_FROM_WIN32( status ); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b85842b..16ae501 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1977,6 +1977,14 @@ static void test_OleRegGetMiscStatus(void) } } +static void test_CoCreateGuid(void) +{ + HRESULT hr; + + hr = CoCreateGuid(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2033,4 +2041,5 @@ START_TEST(compobj) test_CoGetTreatAsClass(); test_CoInitializeEx(); test_OleRegGetMiscStatus(); + test_CoCreateGuid(); }

1 0

Piotr Caban : msvcrt: Add _wcsxfrm_l implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: b540277cc7b8dc5b8118ce948b485afe802ab79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b540277cc7b8dc5b8118ce948… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 17:52:56 2014 +0200 msvcrt: Add _wcsxfrm_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +-- dlls/msvcr110/msvcr110.spec | 4 +-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +-- dlls/msvcr90/msvcr90.spec | 4 +-- dlls/msvcrt/msvcrt.spec | 4 +-- dlls/msvcrt/wcs.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ab71711..108fae5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1518,7 +1518,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1877,7 +1877,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c231de9..4f89b24 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1877,7 +1877,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -2236,7 +2236,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 0168359..1a94ee2 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -870,7 +870,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f5ff608..127a440 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -866,7 +866,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d4985bc..302abe5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1197,7 +1197,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1557,7 +1557,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c5ec79a..28d37d1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1173,7 +1173,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1530,7 +1530,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 82d352d..2349580 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1134,7 +1134,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -# stub _wcsxfrm_l(ptr wstr long ptr) +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 # stub _wctime32_s(ptr long ptr) @@ -1509,7 +1509,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7c299a7..c2b8f58 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2056,3 +2056,61 @@ int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, { return strncmpW(str1, str2, n); } + +/********************************************************************* + * _wcsxfrm_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcsxfrm_l(MSVCRT_wchar_t *dest, const MSVCRT_wchar_t *src, + MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + int i, ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + MSVCRT_wcsncpy(dest, src, len); + return strlenW(src); + } + + ret = LCMapStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return ret-1; + } + + ret = LCMapStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; + for(i=ret; i>=0; i--) + dest[i] = ((unsigned char*)dest)[i]; + return ret; +} + +/********************************************************************* + * wcsxfrm (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, + const MSVCRT_wchar_t *src, MSVCRT_size_t len) +{ + return MSVCRT__wcsxfrm_l(dest, src, len, NULL); +}

1 0

Piotr Caban : msvcrt: Add _strxfrm_l implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 00bce25143b09a17c628dfded47ce2506b90aba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bce25143b09a17c628dfded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 17:52:40 2014 +0200 msvcrt: Add _strxfrm_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 49 +++++++++++++++++++++++++++++-- dlls/msvcrt/tests/string.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 120 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ed40b65..ab71711 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1367,7 +1367,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8af410c..c231de9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1725,7 +1725,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1898d11..d4985bc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1047,7 +1047,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b4ea4b8..c5ec79a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1022,7 +1022,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 69020f6..82d352d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -988,7 +988,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -# stub _strxfrm_l(ptr str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf # stub _swprintf_c(ptr long str) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e1a14ac..60e00c9 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -701,12 +701,57 @@ char* __cdecl MSVCRT_strncat(char *dst, const char *src, MSVCRT_size_t len) } /********************************************************************* + * _strxfrm_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src, + MSVCRT_size_t len, MSVCRT__locale_t locale ) +{ + MSVCRT_pthreadlocinfo locinfo; + int ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + MSVCRT_strncpy(dest, src, len); + return strlen(src); + } + + ret = LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return ret-1; + } + + return LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len ) { - /* FIXME: handle Windows locale */ - return strxfrm( dest, src, len ); + return MSVCRT__strxfrm_l(dest, src, len, NULL); } /******************************************************************** diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 822c952..6604819 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2649,6 +2649,73 @@ static void test_strncpy(void) ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); } +static void test_strxfrm(void) +{ + char dest[256]; + size_t ret; + + /* crashes on old version of msvcrt */ + if(p__atodbl_l) { + errno = 0xdeadbeef; + ret = strxfrm(NULL, "src", 1); + ok(ret == INT_MAX, "ret = %d\n", (int)ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = strxfrm(dest, NULL, 100); + ok(ret == INT_MAX, "ret = %d\n", (int)ret); + ok(errno == EINVAL, "errno = %d\n", errno); + } + + ret = strxfrm(NULL, "src", 0); + ok(ret == 3, "ret = %d\n", (int)ret); + dest[0] = 'a'; + ret = strxfrm(dest, "src", 0); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(dest[0] == 'a', "dest[0] = %d\n", dest[0]); + + dest[3] = 'a'; + ret = strxfrm(dest, "src", 5); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(!strcmp(dest, "src"), "dest = %s\n", dest); + + errno = 0xdeadbeef; + dest[1] = 'a'; + ret = strxfrm(dest, "src", 1); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(dest[0] == 's', "dest[0] = %d\n", dest[0]); + ok(dest[1] == 'a', "dest[1] = %d\n", dest[1]); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ret = strxfrm(dest, "", 5); + ok(ret == 0, "ret = %d\n", (int)ret); + ok(!dest[0], "dest[0] = %d\n", dest[0]); + + if(!setlocale(LC_ALL, "polish")) { + win_skip("stxfrm tests\n"); + return; + } + + ret = strxfrm(NULL, "src", 0); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + dest[0] = 'a'; + ret = strxfrm(dest, "src", 0); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(dest[0] == 'a', "dest[0] = %d\n", dest[0]); + + ret = strxfrm(dest, "src", ret+1); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(dest[0], "dest[0] = 0\n"); + + errno = 0xdeadbeef; + dest[0] = 'a'; + ret = strxfrm(dest, "src", 5); + ok(ret>5 && ret<sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(!dest[0] || broken(!p__atodbl_l && dest[0]=='a'), "dest[0] = %d\n", dest[0]); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2748,4 +2815,5 @@ START_TEST(string) test__wcstoi64(); test_atoi(); test_strncpy(); + test_strxfrm(); }

1 0

Akihiro Sagawa : kernel32: Avoid uninitialised value read in GetCalendarInfoA.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 89a558fe8f0b9034b53c0443431dab3739c6ddff URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a558fe8f0b9034b53c04434… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 12 22:51:22 2014 +0900 kernel32: Avoid uninitialised value read in GetCalendarInfoA. --- dlls/kernel32/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 01d38fc..11df7ff 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -629,7 +629,7 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); if(ret && lpCalDataW && lpCalData) - WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); else if (CalType & CAL_RETURN_NUMBER) ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW);

1 0

Nikolay Sivov : services: Defer service delete until all handles are closed.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 6a4c14696266aef22f3bfe890dd3e9955d87bdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4c14696266aef22f3bfe890… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 23:54:17 2014 +0400 services: Defer service delete until all handles are closed. --- dlls/advapi32/service.c | 2 ++ dlls/advapi32/tests/service.c | 17 ++++++----------- programs/services/rpc.c | 13 +++++++------ programs/services/services.c | 9 ++++++++- programs/services/services.h | 10 ++++++++-- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0047031..6bfdda6 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1087,6 +1087,8 @@ BOOL WINAPI DeleteService( SC_HANDLE hService ) { DWORD err; + TRACE("%p\n", hService); + __TRY { err = svcctl_DeleteService(hService); diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4ebae1c..beb589d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -187,7 +187,7 @@ static void test_open_svc(void) static void test_create_delete_svc(void) { - SC_HANDLE scm_handle, svc_handle1; + SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; @@ -412,6 +412,11 @@ static void test_create_delete_svc(void) ret = DeleteService(svc_handle1); ok(ret, "Expected success, got error %u\n", GetLastError()); + /* Service is marked for delete, but handle is still open. Try to open service again. */ + svc_handle2 = OpenServiceA(scm_handle, servicename, GENERIC_READ); + ok(svc_handle2 != NULL, "got %p, error %u\n", svc_handle2, GetLastError()); + CloseServiceHandle(svc_handle2); + CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); @@ -2341,19 +2346,9 @@ static void test_refcount(void) svc_handle5 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle5, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_MARKED_FOR_DELETE, "Expected ERROR_SERVICE_MARKED_FOR_DELETE, got %d\n", GetLastError()); - } - - /* FIXME: Remove this when Wine is fixed */ - if (svc_handle5) - { - DeleteService(svc_handle5); - CloseServiceHandle(svc_handle5); - } /* Close all the handles to the service and try again */ ret = CloseServiceHandle(svc_handle4); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 166e2b7..3955e09 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -481,8 +481,8 @@ DWORD __cdecl svcctl_CreateServiceW( DWORD dwPasswordSize, SC_RPC_HANDLE *phService) { + struct service_entry *entry, *found; struct sc_manager_handle *manager; - struct service_entry *entry; DWORD err; WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); @@ -533,11 +533,14 @@ DWORD __cdecl svcctl_CreateServiceW( scmdatabase_lock_exclusive(manager->db); - if (scmdatabase_find_service(manager->db, lpServiceName)) + if ((found = scmdatabase_find_service(manager->db, lpServiceName))) { + service_lock_exclusive(found); + err = is_marked_for_delete(found) ? ERROR_SERVICE_MARKED_FOR_DELETE : ERROR_SERVICE_EXISTS; + service_unlock(found); scmdatabase_unlock(manager->db); free_service_entry(entry); - return ERROR_SERVICE_EXISTS; + return err; } if (scmdatabase_find_service_by_displayname(manager->db, get_display_name(entry))) @@ -568,16 +571,14 @@ DWORD __cdecl svcctl_DeleteService( if ((err = validate_service_handle(hService, DELETE, &service)) != ERROR_SUCCESS) return err; - scmdatabase_lock_exclusive(service->service_entry->db); service_lock_exclusive(service->service_entry); if (!is_marked_for_delete(service->service_entry)) - err = scmdatabase_remove_service(service->service_entry->db, service->service_entry); + err = mark_for_delete(service->service_entry); else err = ERROR_SERVICE_MARKED_FOR_DELETE; service_unlock(service->service_entry); - scmdatabase_unlock(service->service_entry->db); return err; } diff --git a/programs/services/services.c b/programs/services/services.c index 2fe3806..632d92a 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -245,7 +245,7 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *serv return ERROR_SUCCESS; } -DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) +static DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) { int err; @@ -422,7 +422,14 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase void release_service(struct service_entry *service) { if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) + { + scmdatabase_lock_exclusive(service->db); + service_lock_exclusive(service); + scmdatabase_remove_service(service->db, service); + service_unlock(service); + scmdatabase_unlock(service->db); free_service_entry(service); + } } static DWORD scmdatabase_create(struct scmdatabase **db) diff --git a/programs/services/services.h b/programs/services/services.h index 3e36141..88a84ad 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -48,6 +48,7 @@ struct service_entry HANDLE control_pipe; HANDLE overlapped_event; HANDLE status_changed_event; + BOOL marked_for_delete; }; extern struct scmdatabase *active_database; @@ -57,7 +58,6 @@ extern struct scmdatabase *active_database; struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR name); struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *entry); DWORD scmdatabase_lock_startup(struct scmdatabase *db); void scmdatabase_unlock_startup(struct scmdatabase *db); @@ -106,7 +106,13 @@ static inline LPCWSTR get_display_name(struct service_entry *service) static inline BOOL is_marked_for_delete(struct service_entry *service) { - return service->entry.next == NULL; + return service->marked_for_delete; +} + +static inline DWORD mark_for_delete(struct service_entry *service) +{ + service->marked_for_delete = TRUE; + return ERROR_SUCCESS; } #endif /*WINE_PROGRAMS_UTILS_H_*/

1 0

Austin English : msasn1: Add stub dll.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: d13d296c2784c42a73d1e44295988166a79caf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13d296c2784c42a73d1e4429… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 1 17:22:16 2014 -0700 msasn1: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/msasn1/Makefile.in | 5 + dlls/msasn1/main.c | 39 +++++++ dlls/msasn1/msasn1.spec | 266 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 313 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d13d296c2784c42a73d1e…

1 0

Michael Müller : ntdll: Stub TokenAppContainerSid in NtQueryInformationToken.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 97c3bb040e7811fcd506fb5c29f5bdbec4ffead5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c3bb040e7811fcd506fb5c2… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:08:45 2014 +0200 ntdll: Stub TokenAppContainerSid in NtQueryInformationToken. --- dlls/ntdll/nt.c | 22 +++++++++++++++++++++- include/winnt.h | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ce648de..73d9383 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -279,7 +279,20 @@ NTSTATUS WINAPI NtQueryInformationToken( sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ - 0 /* TokenLogonSid */ + 0, /* TokenLogonSid */ + 0, /* TokenIsAppContainer */ + 0, /* TokenCapabilities */ + sizeof(TOKEN_APPCONTAINER_INFORMATION) + sizeof(SID), /* TokenAppContainerSid */ + 0, /* TokenAppContainerNumber */ + 0, /* TokenUserClaimAttributes*/ + 0, /* TokenDeviceClaimAttributes */ + 0, /* TokenRestrictedUserClaimAttributes */ + 0, /* TokenRestrictedDeviceClaimAttributes */ + 0, /* TokenDeviceGroups */ + 0, /* TokenRestrictedDeviceGroups */ + 0, /* TokenSecurityAttributes */ + 0, /* TokenIsRestricted */ + 0 /* TokenProcessTrustLevel */ }; ULONG len = 0; @@ -521,6 +534,13 @@ NTSTATUS WINAPI NtQueryInformationToken( memcpy(psid, &high_level, sizeof(SID)); } break; + case TokenAppContainerSid: + { + TOKEN_APPCONTAINER_INFORMATION *container = tokeninfo; + FIXME("QueryInformationToken( ..., TokenAppContainerSid, ...) semi-stub\n"); + container->TokenAppContainer = NULL; + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/include/winnt.h b/include/winnt.h index bae8aed..280cba0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3685,6 +3685,19 @@ typedef enum _TOKEN_INFORMATION_CLASS { TokenUIAccess, TokenMandatoryPolicy, TokenLogonSid, + TokenIsAppContainer, + TokenCapabilities, + TokenAppContainerSid, + TokenAppContainerNumber, + TokenUserClaimAttributes, + TokenDeviceClaimAttributes, + TokenRestrictedUserClaimAttributes, + TokenRestrictedDeviceClaimAttributes, + TokenDeviceGroups, + TokenRestrictedDeviceGroups, + TokenSecurityAttributes, + TokenIsRestricted, + TokenProcessTrustLevel, MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; @@ -4410,6 +4423,10 @@ typedef struct _TOKEN_MANDATORY_LABEL { SID_AND_ATTRIBUTES Label; } TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; +typedef struct _TOKEN_APPCONTAINER_INFORMATION { + PSID TokenAppContainer; +} TOKEN_APPCONTAINER_INFORMATION, * PTOKEN_APPCONTAINER_INFORMATION; + /* * ACLs of NT */

1 0