July 2008 - Wine-Commits - list.winehq.org

James Hawkins : fusion: The VersionLength member is not constant, so dynamically load the metadata header.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 8f985a338abcf9ed7dbf1c549f69a6a470c332c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f985a338abcf9ed7dbf1c549… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 10:51:54 2008 -0500 fusion: The VersionLength member is not constant, so dynamically load the metadata header. --- dlls/fusion/assembly.c | 49 ++++++++++++++++++++++++++++++++++++++------- dlls/fusion/fusionpriv.h | 6 ++-- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 5bc8725..56ad060 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -271,22 +271,54 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) return S_OK; } +static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) +{ + METADATAHDR *metadatahdr; + BYTE *ptr, *dest; + DWORD size, ofs; + ULONG rva; + + rva = assembly->corhdr->MetaData.VirtualAddress; + ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + if (!ptr) + return E_FAIL; + + metadatahdr = (METADATAHDR *)ptr; + + assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); + if (!assembly->metadatahdr) + return E_OUTOFMEMORY; + + size = FIELD_OFFSET(METADATAHDR, Version); + memcpy(assembly->metadatahdr, metadatahdr, size); + + /* we don't care about the version string */ + + ofs = FIELD_OFFSET(METADATAHDR, Flags); + ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; + dest = (BYTE *)assembly->metadatahdr + ofs; + memcpy(dest, ptr, sizeof(METADATAHDR) - ofs); + + *hdrsz = sizeof(METADATAHDR) - sizeof(LPSTR) + metadatahdr->VersionLength + 1; + + return S_OK; +} + static HRESULT parse_clr_metadata(ASSEMBLY *assembly) { METADATASTREAMHDR *streamhdr; ULONG rva, i, ofs; LPSTR stream; HRESULT hr; + DWORD hdrsz; BYTE *ptr; - rva = assembly->corhdr->MetaData.VirtualAddress; - assembly->metadatahdr = ImageRvaToVa(assembly->nthdr, assembly->data, - rva, NULL); - if (!assembly->metadatahdr) - return E_FAIL; + hr = parse_metadata_header(assembly, &hdrsz); + if (FAILED(hr)) + return hr; - ptr = ImageRvaToVa(assembly->nthdr, assembly->data, - rva + sizeof(METADATAHDR), NULL); + rva = assembly->corhdr->MetaData.VirtualAddress; + ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva + hdrsz, NULL); if (!ptr) return E_FAIL; @@ -393,7 +425,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) return S_OK; failed: - assembly_release( assembly ); + assembly_release(assembly); return hr; } @@ -402,6 +434,7 @@ HRESULT assembly_release(ASSEMBLY *assembly) if (!assembly) return S_OK; + HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); HeapFree(GetProcessHeap(), 0, assembly->path); UnmapViewOfFile(assembly->data); CloseHandle(assembly->hmap); diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 08a2d5c..a4e6193 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -27,6 +27,8 @@ #include "winbase.h" #include "winuser.h" +#include <pshpack1.h> + typedef struct { ULONG Signature; @@ -34,13 +36,11 @@ typedef struct USHORT MinorVersion; ULONG Reserved; ULONG VersionLength; - BYTE Version[12]; + LPSTR Version; BYTE Flags; WORD Streams; } METADATAHDR; -#include <pshpack1.h> - typedef struct { DWORD Offset;

1 0

James Hawkins : fusion: Load the table row numbers before calculating the table offsets.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 378fde9acfbb87a5f1bc17b16d8ab6e82bc3aeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378fde9acfbb87a5f1bc17b16… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 10:51:06 2008 -0500 fusion: Load the table row numbers before calculating the table offsets. --- dlls/fusion/assembly.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index bbe8a76..5bc8725 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -241,9 +241,17 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) memset(assembly->tables, -1, MAX_CLR_TABLES * sizeof(CLRTABLE)); if (assembly->tableshdr->MaskValid.u.LowPart & 1) - { assembly->tables[0].offset = currofs; - assembly->tables[0].rows = assembly->numrows[0]; + + offidx = 0; + for (i = 0; i < MAX_CLR_TABLES; i++) + { + if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || + (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) + { + assembly->tables[i].rows = assembly->numrows[offidx]; + offidx++; + } } previ = 0; @@ -255,7 +263,6 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) { currofs += COR_TABLE_SIZES[previ] * assembly->numrows[offidx - 1]; assembly->tables[i].offset = currofs; - assembly->tables[i].rows = assembly->numrows[offidx]; offidx++; previ = i; }

1 0

Detlef Riekenberg : winetest: Run tests again on Win9x.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: fbc9dc109c2a2fe658663ff216e6b107064e8f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc9dc109c2a2fe658663ff21… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 16 18:33:12 2008 +0200 winetest: Run tests again on Win9x. --- programs/winetest/main.c | 16 ++++++++++++++++ programs/winetest/send.c | 8 ++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 9d04e90..04eaae4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -346,6 +346,14 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) subfile = CreateFileA( subname, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, &sa, CREATE_ALWAYS, 0, NULL ); + + if ((subfile == INVALID_HANDLE_VALUE) && + (GetLastError() == ERROR_INVALID_PARAMETER)) { + /* FILE_SHARE_DELETE not supported on win9x */ + subfile = CreateFileA( subname, GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + &sa, CREATE_ALWAYS, 0, NULL ); + } if (subfile == INVALID_HANDLE_VALUE) { report (R_ERROR, "Can't open subtests output of %s: %u", test->name, GetLastError()); @@ -474,6 +482,14 @@ run_tests (char *logname) logfile = CreateFileA( logname, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, &sa, CREATE_ALWAYS, 0, NULL ); + + if ((logfile == INVALID_HANDLE_VALUE) && + (GetLastError() == ERROR_INVALID_PARAMETER)) { + /* FILE_SHARE_DELETE not supported on win9x */ + logfile = CreateFileA( logname, GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + &sa, CREATE_ALWAYS, 0, NULL ); + } if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); diff --git a/programs/winetest/send.c b/programs/winetest/send.c index dc25bd2..c8372f3 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -134,6 +134,14 @@ send_file (const char *name) file = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL ); + + if ((file == INVALID_HANDLE_VALUE) && + (GetLastError() == ERROR_INVALID_PARAMETER)) { + /* FILE_SHARE_DELETE not supported on win9x */ + file = CreateFileA( name, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL ); + } if (file == INVALID_HANDLE_VALUE) { report (R_WARNING, "Can't open file '%s': %u", name, GetLastError());

1 0

James Hawkins : fusion: Allow parsing the blob stream without a #.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 8a7b76fefac7a7be52703d37cb01956890a5e678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7b76fefac7a7be52703d37c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 10:49:24 2008 -0500 fusion: Allow parsing the blob stream without a #. --- dlls/fusion/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 94ea542..bbe8a76 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -299,7 +299,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) } else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings")) assembly->strings = (BYTE *)assembly_data_offset(assembly, ofs); - else if (!lstrcmpA(stream, "#Blob")) + else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs); ptr += lstrlenA(stream);

1 0

Zhangrong Huang : msxml3: Add support for accessing CDATASection node.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: c4ac69b7556bccafe9fe0825dd3552d64877a263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ac69b7556bccafe9fe0825d… Author: Zhangrong Huang <hzhrong(a)gmail.com> Date: Wed Jul 16 23:41:14 2008 +0800 msxml3: Add support for accessing CDATASection node. --- dlls/msxml3/node.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8ace2ea..583e0e1 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1446,6 +1446,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) case XML_TEXT_NODE: pUnk = create_text( node ); break; + case XML_CDATA_SECTION_NODE: + pUnk = create_cdata( node ); + break; case XML_COMMENT_NODE: pUnk = create_comment( node ); break;

1 0

Zhangrong Huang : msxml3: Add support for accessing document node.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 89f1bfabe3ed9fc7fccc1c413735e40de3a1d1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f1bfabe3ed9fc7fccc1c413… Author: Zhangrong Huang <hzhrong(a)gmail.com> Date: Wed Jul 16 20:13:18 2008 +0800 msxml3: Add support for accessing document node. --- dlls/msxml3/domdoc.c | 14 ++++++++++++++ dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 12 +----------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 59ea8c5..3952b5e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2287,6 +2287,20 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) return hr; } +IUnknown* create_domdoc( xmlNodePtr document ) +{ + HRESULT hr; + LPVOID pObj = NULL; + + TRACE("(%p)\n", document); + + hr = DOMDocument_create_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument2**)&pObj); + if (FAILED(hr)) + return NULL; + + return (IUnknown*)pObj; +} + #else HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 34e4800..c365a11 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -32,7 +32,7 @@ #endif /* constructors */ -extern IUnknown *create_domdoc( void ); +extern IUnknown *create_domdoc( xmlNodePtr document ); extern IUnknown *create_xmldoc( void ); extern IXMLDOMNode *create_node( xmlNodePtr node ); extern IUnknown *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6b1d6b0..8ace2ea 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1450,8 +1450,8 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_comment( node ); break; case XML_DOCUMENT_NODE: - ERR("shouldn't be here!\n"); - return NULL; + pUnk = create_domdoc( node ); + break; default: FIXME("only creating basic node for type %d\n", node->type); pUnk = create_basic_node( node, NULL ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 19a9a2f..7c64f6c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -330,8 +330,7 @@ static void node_to_string(IXMLDOMNode *node, char *buf) * results we "fix" it */ if (r == S_OK) ole_check(IXMLDOMNode_get_nodeType(new_node, &parent_type)); - /* we need also to workaround the no document node problem - see below */ - if (((r == S_FALSE && type != NODE_DOCUMENT) || parent_type == NODE_DOCUMENT) && type != NODE_PROCESSING_INSTRUCTION && pos==1) + if ((parent_type == NODE_DOCUMENT) && type != NODE_PROCESSING_INSTRUCTION && pos==1) { todo_wine ok(FALSE, "The first child of the document node in MSXML is the <?xml ... ?> processing instruction\n"); pos++; @@ -347,15 +346,6 @@ static void node_to_string(IXMLDOMNode *node, char *buf) *(buf++) = '.'; } - /* currently we can't access document node in wine. All our examples this is the - * root node so to be able to test query results we add it */ - if (type != NODE_DOCUMENT) - { - todo_wine ok(FALSE, "Document node is not the last returned node!\n"); - *(buf++) = '.'; - *(buf++) = 'D'; - *(buf++) = '1'; - } *buf = 0; }

1 0

Mikołaj Zalewski : comctl32: statusbar: WM_CREATE should not resize the window - it should happen in WM_SIZE.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 1e43f207cd5a2436928cf50f115d33a1b86bbdf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e43f207cd5a2436928cf50f1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 15:25:43 2008 +0200 comctl32: statusbar: WM_CREATE should not resize the window - it should happen in WM_SIZE. --- dlls/comctl32/status.c | 6 +--- dlls/comctl32/tests/status.c | 65 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index f7e3033..33ffcbf 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -913,7 +913,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) NONCLIENTMETRICSW nclm; DWORD dwStyle; RECT rect; - int width, len, textHeight = 0; + int len, textHeight = 0; HDC hdc; TRACE("\n"); @@ -1006,8 +1006,6 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) if (!(dwStyle & CCS_NORESIZE)) { /* don't resize wnd if it doesn't want it ! */ HTHEME theme; - GetClientRect (infoPtr->Notify, &rect); - width = rect.right - rect.left; infoPtr->height = textHeight + 4 + infoPtr->verticalBorder; if ((theme = GetWindowTheme (hwnd))) @@ -1025,8 +1023,6 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) ReleaseDC (hwnd, hdc); } - SetWindowPos(hwnd, 0, lpCreate->x, lpCreate->y - 1, - width, infoPtr->height, SWP_NOZORDER); STATUSBAR_SetPartBounds (infoPtr); } diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 4e643c1..18501fb 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -24,9 +24,16 @@ #include "wine/test.h" -#define expect(expected,got) ok (expected == got,"Expected %d, got %d\n",expected,got); +#define expect(expected,got) ok (expected == got,"Expected %d, got %d\n",expected,got) +#define expect_rect(_left,_top,_right,_bottom,got) do { RECT _rcExp = {_left, _top, _right, _bottom}; \ + ok(memcmp(&_rcExp, &(got), sizeof(RECT)) == 0, "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ + _rcExp.left, _rcExp.top, _rcExp.right, _rcExp.bottom, \ + (got).left, (got).top, (got).right, (got).bottom); } while (0) static HINSTANCE hinst; +static WNDPROC g_status_wndproc; +static RECT g_rcCreated; +static HWND g_hMainWnd; static HWND create_status_control(DWORD style, DWORD exstyle) { @@ -42,6 +49,48 @@ static HWND create_status_control(DWORD style, DWORD exstyle) return hWndStatus; } +static LRESULT WINAPI create_test_wndproc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_CREATE) + { + CREATESTRUCT *cs = (CREATESTRUCT *)lParam; + LRESULT ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + GetWindowRect(hwnd, &g_rcCreated); + MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&g_rcCreated, 2); + ok(cs->x == g_rcCreated.left, "CREATESTRUCT.x modified\n"); + ok(cs->y == g_rcCreated.top, "CREATESTRUCT.y modified\n"); + return ret; + } + return CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); +} + +static void test_create() +{ + WNDCLASSEX cls; + RECT rc; + HWND hwnd; + + cls.cbSize = sizeof(WNDCLASSEX); + GetClassInfoEx(NULL, STATUSCLASSNAME, &cls); + g_status_wndproc = cls.lpfnWndProc; + cls.lpfnWndProc = create_test_wndproc; + cls.lpszClassName = "MyStatusBar"; + cls.hInstance = NULL; + ok(RegisterClassEx(&cls), "RegisterClassEx failed\n"); + + ok((hwnd = CreateWindowA("MyStatusBar", "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, 0, 0, 100, 100, + g_hMainWnd, NULL, NULL, 0)) != NULL, "CreateWindowA failed\n"); + MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&rc, 2); + GetWindowRect(hwnd, &rc); + MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&rc, 2); + expect_rect(0, 0, 100, 100, g_rcCreated); + expect(0, rc.left); + expect(672, rc.right); + expect(226, rc.bottom); + /* we don't check rc.top as this may depend on user font settings */ + DestroyWindow(hwnd); +} + static void test_status_control(void) { HWND hWndStatus; @@ -56,7 +105,7 @@ static void test_status_control(void) hWndStatus = create_status_control(WS_VISIBLE, 0); /* Divide into parts and set text */ - r = SendMessage(hWndStatus, SB_SETPARTS, 3, (long)nParts); + r = SendMessage(hWndStatus, SB_SETPARTS, 3, (LPARAM)nParts); expect(TRUE,r); r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)"First"); expect(TRUE,r); @@ -87,12 +136,12 @@ static void test_status_control(void) expect(0,HIWORD(r)); /* Get parts and borders */ - r = SendMessage(hWndStatus, SB_GETPARTS, 3, (long)checkParts); + r = SendMessage(hWndStatus, SB_GETPARTS, 3, (LPARAM)checkParts); ok(r == 3, "Expected 3, got %d\n", r); expect(50,checkParts[0]); expect(150,checkParts[1]); expect(-1,checkParts[2]); - r = SendMessage(hWndStatus, SB_GETBORDERS, 0, (long)borders); + r = SendMessage(hWndStatus, SB_GETBORDERS, 0, (LPARAM)borders); ok(r == TRUE, "Expected TRUE, got %d\n", r); expect(0,borders[0]); expect(2,borders[1]); @@ -151,7 +200,7 @@ static void test_status_control(void) expect(TRUE,r); /* Reset number of parts */ - r = SendMessage(hWndStatus, SB_SETPARTS, 2, (long)nParts); + r = SendMessage(hWndStatus, SB_SETPARTS, 2, (LPARAM)nParts); expect(TRUE,r); /* Set the minimum height and get rectangle information again */ @@ -190,7 +239,13 @@ START_TEST(status) { hinst = GetModuleHandleA(NULL); + g_hMainWnd = CreateWindowExA(0, "static", "", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 672+2*GetSystemMetrics(SM_CXSIZEFRAME), + 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), + NULL, NULL, GetModuleHandleA(NULL), 0); + InitCommonControls(); test_status_control(); + test_create(); }

1 0

Mikołaj Zalewski : comctl32: statusbar: Window is always Unicode, CCM_SETUNICODEFORMAT should change the notify format.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 7f97372a892fdfced4a8c8d6b9f797e33b888cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f97372a892fdfced4a8c8d6b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 12:04:30 2008 +0200 comctl32: statusbar: Window is always Unicode, CCM_SETUNICODEFORMAT should change the notify format. --- dlls/comctl32/status.c | 61 ++++++++++++----------------------------------- 1 files changed, 16 insertions(+), 45 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 464e650..d1d4893 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -77,7 +77,6 @@ typedef struct HFONT hFont; HFONT hDefaultFont; COLORREF clrBk; /* background color */ - BOOL bUnicode; /* unicode flag */ BOOL NtfUnicode; /* notify format */ STATUSWINDOWPART part0; /* simple window */ STATUSWINDOWPART* parts; @@ -845,10 +844,10 @@ STATUSBAR_SetTipTextW (const STATUS_INFO *infoPtr, INT id, LPWSTR text) static inline LRESULT STATUSBAR_SetUnicodeFormat (STATUS_INFO *infoPtr, BOOL bUnicode) { - BOOL bOld = infoPtr->bUnicode; + BOOL bOld = infoPtr->NtfUnicode; TRACE("(0x%x)\n", bUnicode); - infoPtr->bUnicode = bUnicode; + infoPtr->NtfUnicode = bUnicode; return bOld; } @@ -961,24 +960,11 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) OpenThemeData (hwnd, themeClass); - if (IsWindowUnicode (hwnd)) { - infoPtr->bUnicode = TRUE; - if (lpCreate->lpszName && - (len = strlenW ((LPCWSTR)lpCreate->lpszName))) { - infoPtr->parts[0].text = Alloc ((len + 1)*sizeof(WCHAR)); - if (!infoPtr->parts[0].text) goto create_fail; - strcpyW (infoPtr->parts[0].text, (LPCWSTR)lpCreate->lpszName); - } - } - else { - if (lpCreate->lpszName && - (len = strlen((LPCSTR)lpCreate->lpszName))) { - DWORD lenW = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lpCreate->lpszName, -1, NULL, 0 ); - infoPtr->parts[0].text = Alloc (lenW*sizeof(WCHAR)); - if (!infoPtr->parts[0].text) goto create_fail; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lpCreate->lpszName, -1, - infoPtr->parts[0].text, lenW ); - } + if (lpCreate->lpszName && (len = strlenW ((LPCWSTR)lpCreate->lpszName))) + { + infoPtr->parts[0].text = Alloc ((len + 1)*sizeof(WCHAR)); + if (!infoPtr->parts[0].text) goto create_fail; + strcpyW (infoPtr->parts[0].text, (LPCWSTR)lpCreate->lpszName); } dwStyle = GetWindowLongW (hwnd, GWL_STYLE); @@ -1062,17 +1048,11 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) TRACE("\n"); if (!(infoPtr->parts[0].text)) return 0; - if (infoPtr->bUnicode) - len = strlenW (infoPtr->parts[0].text); - else - len = WideCharToMultiByte( CP_ACP, 0, infoPtr->parts[0].text, -1, NULL, 0, NULL, NULL )-1; + + len = strlenW (infoPtr->parts[0].text); if (size > len) { - if (infoPtr->bUnicode) - strcpyW (buf, infoPtr->parts[0].text); - else - WideCharToMultiByte( CP_ACP, 0, infoPtr->parts[0].text, -1, - (LPSTR)buf, len+1, NULL, NULL ); + strcpyW (buf, infoPtr->parts[0].text); return len; } @@ -1145,20 +1125,11 @@ STATUSBAR_WMSetText (const STATUS_INFO *infoPtr, LPCSTR text) /* duplicate string */ Free (part->text); part->text = 0; - if (infoPtr->bUnicode) { - if (text && (len = strlenW((LPCWSTR)text))) { - part->text = Alloc ((len+1)*sizeof(WCHAR)); - if (!part->text) return FALSE; - strcpyW (part->text, (LPCWSTR)text); - } - } - else { - if (text && (len = lstrlenA(text))) { - DWORD lenW = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 ); - part->text = Alloc (lenW*sizeof(WCHAR)); - if (!part->text) return FALSE; - MultiByteToWideChar( CP_ACP, 0, text, -1, part->text, lenW ); - } + + if (text && (len = strlenW((LPCWSTR)text))) { + part->text = Alloc ((len+1)*sizeof(WCHAR)); + if (!part->text) return FALSE; + strcpyW (part->text, (LPCWSTR)text); } InvalidateRect(infoPtr->Self, &part->bound, FALSE); @@ -1278,7 +1249,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_GetTipTextW (infoPtr, LOWORD(wParam), (LPWSTR)lParam, HIWORD(wParam)); case SB_GETUNICODEFORMAT: - return infoPtr->bUnicode; + return infoPtr->NtfUnicode; case SB_ISSIMPLE: return infoPtr->simple;

1 0

Mikołaj Zalewski : comctl32: statusbar: Rename NtfUnicode to bUnicode to make is more consistent with other controls , use NF_REQUERY in WM_CREATE.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 0cb74db9921c53c96b542d02d42528b9cf86001e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb74db9921c53c96b542d02d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 12:09:12 2008 +0200 comctl32: statusbar: Rename NtfUnicode to bUnicode to make is more consistent with other controls, use NF_REQUERY in WM_CREATE. --- dlls/comctl32/status.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index d1d4893..f7e3033 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -77,7 +77,7 @@ typedef struct HFONT hFont; HFONT hDefaultFont; COLORREF clrBk; /* background color */ - BOOL NtfUnicode; /* notify format */ + BOOL bUnicode; /* notify format. TRUE if notifies in Unicode */ STATUSWINDOWPART part0; /* simple window */ STATUSWINDOWPART* parts; INT horizontalBorder; @@ -100,6 +100,8 @@ static const WCHAR themeClass[] = { 'S','t','a','t','u','s',0 }; /* prototype */ static void STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr); +static LRESULT +STATUSBAR_NotifyFormat (STATUS_INFO *infoPtr, HWND from, INT cmd); static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW) { @@ -844,10 +846,10 @@ STATUSBAR_SetTipTextW (const STATUS_INFO *infoPtr, INT id, LPWSTR text) static inline LRESULT STATUSBAR_SetUnicodeFormat (STATUS_INFO *infoPtr, BOOL bUnicode) { - BOOL bOld = infoPtr->NtfUnicode; + BOOL bOld = infoPtr->bUnicode; TRACE("(0x%x)\n", bUnicode); - infoPtr->NtfUnicode = bUnicode; + infoPtr->bUnicode = bUnicode; return bOld; } @@ -911,7 +913,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) NONCLIENTMETRICSW nclm; DWORD dwStyle; RECT rect; - int i, width, len, textHeight = 0; + int width, len, textHeight = 0; HDC hdc; TRACE("\n"); @@ -930,8 +932,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) infoPtr->verticalBorder = VERT_BORDER; infoPtr->horizontalGap = HORZ_GAP; - i = SendMessageW(infoPtr->Notify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); - infoPtr->NtfUnicode = (i == NFR_UNICODE); + STATUSBAR_NotifyFormat(infoPtr, infoPtr->Notify, NF_REQUERY); GetClientRect (hwnd, &rect); InvalidateRect (hwnd, &rect, 0); @@ -1182,9 +1183,9 @@ STATUSBAR_NotifyFormat (STATUS_INFO *infoPtr, HWND from, INT cmd) { if (cmd == NF_REQUERY) { INT i = SendMessageW(from, WM_NOTIFYFORMAT, (WPARAM)infoPtr->Self, NF_QUERY); - infoPtr->NtfUnicode = (i == NFR_UNICODE); + infoPtr->bUnicode = (i == NFR_UNICODE); } - return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI; + return infoPtr->bUnicode ? NFR_UNICODE : NFR_ANSI; } @@ -1249,7 +1250,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_GetTipTextW (infoPtr, LOWORD(wParam), (LPWSTR)lParam, HIWORD(wParam)); case SB_GETUNICODEFORMAT: - return infoPtr->NtfUnicode; + return infoPtr->bUnicode; case SB_ISSIMPLE: return infoPtr->simple;

1 0

Luis Busquets : d3dx9: Add a test for D3DXGetShaderSize().
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 9e2b04893c8ac3b6155441960a84167d2c6a82fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2b04893c8ac3b6155441960… Author: Luis Busquets <luis.busquets(a)ilidium.com> Date: Mon Jul 14 22:47:28 2008 +0200 d3dx9: Add a test for D3DXGetShaderSize(). --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/shader.c | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 5d72504..40500e2 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -6,7 +6,8 @@ TESTDLL = d3dx9_36.dll IMPORTS = d3dx9 kernel32 CTESTS = \ - math.c + math.c \ + shader.c @MAKE_TEST_RULES@ diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c new file mode 100644 index 0000000..b08285d --- /dev/null +++ b/dlls/d3dx9_36/tests/shader.c @@ -0,0 +1,60 @@ +/* + * Copyright 2008 Luis Busquets + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "d3dx9.h" + +static const DWORD simple_vs[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff}; /* END */ + +static const DWORD simple_ps[] = { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ + 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ + 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ + 0x0000ffff}; /* END */ + + +static void test_get_shader_size(void) +{ + UINT shader_size, expected; + + shader_size = D3DXGetShaderSize(simple_vs); + expected = sizeof(simple_vs); + ok(shader_size == expected, "Got shader size %u, expected %u\n", shader_size, expected); + + shader_size = D3DXGetShaderSize(simple_ps); + expected = sizeof(simple_ps); + ok(shader_size == expected, "Got shader size %u, expected %u\n", shader_size, expected); + + shader_size = D3DXGetShaderSize(NULL); + ok(shader_size == 0, "Got shader size %u, expected 0\n", shader_size); +} + +START_TEST(shader) +{ + test_get_shader_size(); +}

1 0