wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Piotr Caban : msvcrt: Added fputwc tests.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 77f3ce0b10248537db8254dad728a4f9a911101d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f3ce0b10248537db8254dad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:18:57 2013 +0100 msvcrt: Added fputwc tests. --- dlls/msvcrt/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b74e1d9..392b1a0 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -792,6 +792,63 @@ static void test_fgetwc( void ) free(tempf); } +static void test_fputwc(void) +{ + char temppath[MAX_PATH]; + char tempfile[MAX_PATH]; + FILE *f; + char buf[1024]; + int ret; + + GetTempPath (MAX_PATH, temppath); + GetTempFileName (temppath, "", 0, tempfile); + + f = fopen(tempfile, "w"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 3, "fread returned %d, expected 3\n", ret); + ok(!memcmp(buf, "a\r\n", 3), "incorrect file data\n"); + fclose(f); + + if(p_fopen_s) { + f = fopen(tempfile, "w,ccs=unicode"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 8, "fread returned %d, expected 8\n", ret); + ok(!memcmp(buf, "\xff\xfe\x61\x00\r\x00\n\x00", 8), "incorrect file data\n"); + fclose(f); + + f = fopen(tempfile, "w,ccs=utf-8"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 6, "fread returned %d, expected 6\n", ret); + ok(!memcmp(buf, "\xef\xbb\xbf\x61\r\n", 6), "incorrect file data\n"); + fclose(f); + }else { + win_skip("fputwc tests on unicode files\n"); + } + + _unlink(tempfile); +} + static void test_ctrlz( void ) { char* tempf; @@ -1955,6 +2012,7 @@ START_TEST(file) test_flsbuf(); test_fflush(); test_fgetwc(); + test_fputwc(); test_ctrlz(); test_file_put_get(); test_tmpnam();

1 0

Piotr Caban : msvcrt: Make fputwc encoding aware.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: ebfa65361819f5804934db2262b54508851ba3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfa65361819f5804934db226… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:18:44 2013 +0100 msvcrt: Make fputwc encoding aware. --- dlls/msvcrt/file.c | 28 ++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c53e061..19ad11c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3375,10 +3375,30 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si */ MSVCRT_wint_t CDECL MSVCRT_fputwc(MSVCRT_wint_t wc, MSVCRT_FILE* file) { - MSVCRT_wchar_t mwc=wc; - if (MSVCRT_fwrite( &mwc, sizeof(mwc), 1, file) != 1) - return MSVCRT_WEOF; - return wc; + MSVCRT_wchar_t mwc=wc; + ioinfo *fdinfo; + MSVCRT_wint_t ret; + + MSVCRT__lock_file(file); + fdinfo = msvcrt_get_ioinfo(file->_file); + + if((fdinfo->wxflag&WX_TEXT) && !(fdinfo->exflag&(EF_UTF8|EF_UTF16))) { + char buf[MSVCRT_MB_LEN_MAX]; + int char_len; + + char_len = wctomb(buf, mwc); + if(char_len!=-1 && MSVCRT_fwrite(buf, char_len, 1, file)==1) + ret = wc; + else + ret = MSVCRT_WEOF; + }else if(MSVCRT_fwrite(&mwc, sizeof(mwc), 1, file) == 1) { + ret = wc; + }else { + ret = MSVCRT_WEOF; + } + + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1bdf393..77418e3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -46,6 +46,7 @@ #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define MSVCRT_MB_LEN_MAX 2 #define MSVCRT__MAX_DRIVE 3 #define MSVCRT__MAX_DIR 256

1 0

Ken Thomases : libwine: Use rpath-based install name and library references for libwine on Mac.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: f377591e98c490ca00e6479627832e41b2ad01b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f377591e98c490ca00e647962… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 03:25:07 2013 -0600 libwine: Use rpath-based install name and library references for libwine on Mac. --- configure | 3 ++- configure.ac | 3 ++- libs/wine/Makefile.in | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 7a4b086..8394dea 100755 --- a/configure +++ b/configure @@ -6657,7 +6657,8 @@ fi LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib" - LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" + LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`" + LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" COREFOUNDATIONLIB="-framework CoreFoundation" IOKITLIB="-framework IOKit -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index a9fa02d..78d4f4b 100644 --- a/configure.ac +++ b/configure.ac @@ -723,7 +723,8 @@ case $host_os in LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib" - LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" + LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`" + LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index a86e73b..b8c713a 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -128,13 +128,13 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(srcdir)/wine.def -o $@ $(OBJS) $(EXTRALIBS) -DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) -Wl,-headerpad_max_install_names +DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name @rpath/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib - cp -p libwine.$(VERSION).dylib $@ && install_name_tool -id @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $@ || $(RM) $@ + $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@ libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@

1 0

Nikolay Sivov : comctl32/listview: Add a special case for deselect all attempt when nothing is selected.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: b68e95abd86a3db26f873d37f6317f3ad68763c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68e95abd86a3db26f873d37f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 11 03:06:27 2013 +0400 comctl32/listview: Add a special case for deselect all attempt when nothing is selected. --- dlls/comctl32/listview.c | 4 ++++ dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 79d55da..bb6d1b2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8857,6 +8857,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE UINT oldstate = 0; BOOL notify; + /* special case optimization for recurring attemp to deselect all */ + if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) + return TRUE; + /* select all isn't allowed in LVS_SINGLESEL */ if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 25321c3..cff6e92 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2271,7 +2271,7 @@ static void test_multiselect(void) item.state = 0; item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", FALSE); /* any non-zero state value does the same */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3111,7 +3111,7 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", FALSE); /* select one, then deselect all */ item.stateMask = LVIS_SELECTED;

1 0

Nikolay Sivov : comctl32/listview: Always send LVN_ITEMCHANGING notification even if nothing changed.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 7773d6b09591be22e7a3a284cd90435895707f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7773d6b09591be22e7a3a284c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 11 02:36:39 2013 +0400 comctl32/listview: Always send LVN_ITEMCHANGING notification even if nothing changed. --- dlls/comctl32/listview.c | 20 ++++++----- dlls/comctl32/tests/listview.c | 77 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 49c326a..79d55da 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4233,20 +4233,19 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpItem->hdr.pszText, lpLVItem->pszText, isW)) uChanged |= LVIF_TEXT; - TRACE("uChanged=0x%x\n", uChanged); - if (!uChanged) return TRUE; - *bChanged = TRUE; + TRACE("change mask=0x%x\n", uChanged); - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); + memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; - nmlv.uChanged = uChanged; + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - - /* send LVN_ITEMCHANGING notification, if the item is not being inserted */ - /* and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications */ - /* are enabled */ + + /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications + are enabled. Even nothing really changed we still need to send this, + in this case uChanged mask is just set to passed item mask. */ if(lpItem && !isNew && infoPtr->bDoChangeNotify) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4257,6 +4256,9 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL return FALSE; } + if (!uChanged) return TRUE; + *bChanged = TRUE; + /* copy information */ if (lpLVItem->mask & LVIF_TEXT) textsetptrT(&lpItem->hdr.pszText, lpLVItem->pszText, isW); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 583645d..25321c3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3,7 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov - * Copyright 2009-2012 Nikolay Sivov + * Copyright 2009-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,6 +52,8 @@ static BOOL blockEdit; static BOOL g_block_hover; /* notification data for LVN_ITEMCHANGED */ static NMLISTVIEW g_nmlistview; +/* notification data for LVN_ITEMCHANGING */ +static NMLISTVIEW g_nmlistview_changing; /* format reported to control: -1 falls to defproc, anything else returned */ static INT notifyFormat; @@ -209,7 +211,7 @@ static const struct message ownerdata_deselect_all_parent_seq[] = { { 0 } }; -static const struct message select_all_parent_seq[] = { +static const struct message change_all_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -227,6 +229,15 @@ static const struct message select_all_parent_seq[] = { { 0 } }; +static const struct message changing_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { 0 } +}; + static const struct message textcallback_set_again_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -430,6 +441,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP "BEGIN" : "END", pScroll->dx, pScroll->dy); } break; + case LVN_ITEMCHANGING: + { + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + g_nmlistview_changing = *nmlv; + } + break; case LVN_ITEMCHANGED: { NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; @@ -2169,9 +2186,8 @@ static void test_multiselect(void) item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); - selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - - ok(selected_count == 1, "There should be only one selected item at the beginning (is %d)\n",selected_count); + selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + ok(selected_count == 1, "expected 1, got %d\n", selected_count); /* Set SHIFT key pressed */ GetKeyboardState(kstate); @@ -2220,16 +2236,62 @@ static void test_multiselect(void) r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - ok_sequence(sequences, PARENT_SEQ_INDEX, select_all_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, "select all notification", FALSE); + /* select all again (all selected already) */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing)); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok(g_nmlistview_changing.uNewState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uNewState); + ok(g_nmlistview_changing.uOldState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uOldState); + ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged); + + ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, + "select all notification 2", FALSE); + /* deselect all items */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.state = 0; item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, + "deselect all notification", FALSE); + + /* deselect all items again */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", TRUE); + + /* any non-zero state value does the same */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing)); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_CUT; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok(g_nmlistview_changing.uNewState == 0, "got 0x%x\n", g_nmlistview_changing.uNewState); + ok(g_nmlistview_changing.uOldState == 0, "got 0x%x\n", g_nmlistview_changing.uOldState); + ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged); + + ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, + "set state all notification 3", FALSE); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); - for (i=0;i<3;i++) { + for (i = 0; i < 3; i++) { item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); @@ -5470,6 +5532,7 @@ START_TEST(listview) test_LVS_EX_TRANSPARENTBKGND(); test_LVS_EX_HEADERINALLVIEWS(); test_deleteitem(); + test_multiselect(); unload_v6_module(ctx_cookie, hCtx);

1 0

Rico Schüller : d3dx9: Use lowercase hexadecimal values.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: c1d1d746142dafee149e7aa9575c54631592efc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d1d746142dafee149e7aa95… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 22:23:31 2013 +0100 d3dx9: Use lowercase hexadecimal values. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3e28a03..a0d36e2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -597,9 +597,9 @@ static inline struct ID3DXConstantTableImpl *impl_from_ID3DXConstantTable(ID3DXC return CONTAINING_RECORD(iface, struct ID3DXConstantTableImpl, ID3DXConstantTable_iface); } -static inline int is_vertex_shader(DWORD version) +static inline BOOL is_vertex_shader(DWORD version) { - return (version & 0xFFFF0000) == 0xFFFE0000; + return (version & 0xffff0000) == 0xfffe0000; } static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle)

1 0

Rico Schüller : d3dcompiler43/tests: Don' t use IUnknown_Release().
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: b1126a8c30c2f70c68d11a027677d40fc9e16ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1126a8c30c2f70c68d11a027… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 22:23:27 2013 +0100 d3dcompiler43/tests: Don't use IUnknown_Release(). --- dlls/d3dcompiler_43/tests/blob.c | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 56 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 6a4217e..ba69abf 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -64,7 +64,7 @@ static void test_create_blob(void) hr = D3DCreateBlob(0, &blob); ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); - refcount = blob->lpVtbl->Release(blob); + refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); } diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 1546bfe..c29d075 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -139,14 +139,14 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, { skip("not compiling vertex shader due to lacking wine HLSL support!\n"); if (errors) - IUnknown_Release(errors); + ID3D10Blob_Release(errors); return NULL; } hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), vshader_passthru); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - IUnknown_Release(compiled); + ID3D10Blob_Release(compiled); return device_ptr; } @@ -184,7 +184,7 @@ static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, co hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - IUnknown_Release(compiled); + ID3D10Blob_Release(compiled); return pshader; } @@ -287,8 +287,8 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); - IUnknown_Release(render_target); - IUnknown_Release(readback); + IDirect3DSurface9_Release(render_target); + IDirect3DSurface9_Release(readback); } /* Now the actual test functions */ @@ -321,8 +321,8 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -364,8 +364,8 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -418,8 +418,8 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, sizeof(if_greater_probes) / sizeof(*if_greater_probes), 32, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); @@ -428,8 +428,8 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, sizeof(ternary_operator_probes) / sizeof(*ternary_operator_probes), 8, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -477,8 +477,8 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, sizeof(vec4_indexing_test1_probes) / sizeof(*vec4_indexing_test1_probes), 1, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); @@ -489,8 +489,8 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, sizeof(vec4_indexing_test2_probes) / sizeof(*vec4_indexing_test2_probes), 32, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -551,8 +551,8 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, sizeof(sincos_probes) / sizeof(*sincos_probes), 32, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -604,7 +604,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with undefined variables\n"); ok(compiled == NULL, "A shader blob was returned for a shader with undefined variables\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_swizzle_shader, strlen(invalid_swizzle_shader), NULL, NULL, NULL, @@ -613,7 +613,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with an invalid swizzle mask\n"); ok(compiled == NULL, "A shader blob was returned for a shader with an invalid swizzle mask\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_conversion_shader, strlen(invalid_conversion_shader), NULL, NULL, NULL, @@ -623,7 +623,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with invalid type conversions\n"); ok(compiled == NULL, "A shader blob was returned for a shader with invalid type conversions\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_syntax_shader, strlen(invalid_syntax_shader), NULL, NULL, NULL, "test", @@ -633,7 +633,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with invalid syntax\n"); ok(compiled == NULL, "A shader blob was returned for a shader with invalid syntax\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_identifiers_shader, strlen(invalid_identifiers_shader), NULL, NULL, @@ -645,7 +645,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(compiled == NULL, "A shader blob was returned for a shader with invalid variable and " "function names\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); } START_TEST(hlsl) @@ -679,16 +679,16 @@ START_TEST(hlsl) /* Reference counting sanity checks */ if (vshader_passthru) { - refcount = IUnknown_Release(vshader_passthru); + refcount = IDirect3DVertexShader9_Release(vshader_passthru); ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); } - refcount = IUnknown_Release(quad_geometry); + refcount = IDirect3DVertexBuffer9_Release(quad_geometry); ok(!refcount, "Vertex buffer has %u references left\n", refcount); - refcount = IUnknown_Release(vdeclaration); + refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); ok(!refcount, "Vertex declaration has %u references left\n", refcount); - refcount = IUnknown_Release(device); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left\n", refcount); }

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A16B16G16R16F.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 43f30fe8d6e405627ebfb642dc43de0bb65f8026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f30fe8d6e405627ebfb642d… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 22:18:08 2013 +0100 d3dx9: Add support for D3DFMT_A16B16G16R16F. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++ dlls/d3dx9_36/math.c | 2 +- dlls/d3dx9_36/tests/texture.c | 4 +- dlls/d3dx9_36/texture.c | 15 +++++++--- dlls/d3dx9_36/util.c | 55 +++++++++++++++++++------------------ 5 files changed, 44 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43f30fe8d6e405627ebfb…

1 0

Rico Schüller : d3dx9: Use all 32 bits as mask.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: f7d877061d55eb12f1beb356a5b22b11c35e0d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d877061d55eb12f1beb356a… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:40 2013 +0100 d3dx9: Use all 32 bits as mask. --- dlls/d3dx9_36/texture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index c93d2df..a6e769b 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1216,7 +1216,7 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po for (c = 0; c < 4; c++) { float comp_value; - DWORD i, v; + DWORD i, v, mask32 = format->bits[c] == 32 ? ~0U : ((1 << format->bits[c]) - 1); switch (c) { @@ -1242,12 +1242,12 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po if (format->shift[c] > i) { - mask = ((1 << format->bits[c]) - 1) << (format->shift[c] - i); + mask = mask32 << (format->shift[c] - i); byte = (v << (format->shift[c] - i)) & mask; } else { - mask = ((1 << format->bits[c]) - 1) >> (i - format->shift[c]); + mask = mask32 >> (i - format->shift[c]); byte = (v >> (i - format->shift[c])) & mask; } pos[i / 8] |= byte;

1 0

Rico Schüller : d3dx9: Shift only as much as needed.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 98ef0ca8e685b197ed17aab608b676700b608e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ef0ca8e685b197ed17aab60… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:25 2013 +0100 d3dx9: Shift only as much as needed. --- dlls/d3dx9_36/texture.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2531ea6..c93d2df 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1240,8 +1240,16 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po { BYTE byte, mask; - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; + if (format->shift[c] > i) + { + mask = ((1 << format->bits[c]) - 1) << (format->shift[c] - i); + byte = (v << (format->shift[c] - i)) & mask; + } + else + { + mask = ((1 << format->bits[c]) - 1) >> (i - format->shift[c]); + byte = (v >> (i - format->shift[c])) & mask; + } pos[i / 8] |= byte; } }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013