June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Add resource files to the standard object files list.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 68a1f4d0a11914a2e509fa7d88c71b90637209fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a1f4d0a11914a2e509fa7d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 15:50:57 2009 +0200 makefiles: Add resource files to the standard object files list. --- Make.rules.in | 2 +- dlls/Makedll.rules.in | 2 +- dlls/Maketest.rules.in | 6 +++--- programs/Makeprog.rules.in | 4 ++-- programs/winetest/Makefile.in | 2 +- programs/winetest/dist.rc | 2 -- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 05cfa12..b1ccd7c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -118,7 +118,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS) +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(RC_SRCS:.rc=.res) $(EXTRA_OBJS) LINTS = $(C_SRCS:.c=.ln) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index a571ae3..5a77d9e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -16,7 +16,7 @@ BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec SPEC_DEF = $(BASEMODULE).def WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) -ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) +ALL_OBJS = @WIN16_FILES@ $(OBJS) ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 0ff50d9..b112c45 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -29,8 +29,8 @@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR all: $(TESTPROGRAM) -$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) +$(MODULE) $(MODULE).so: $(OBJS) Makefile.in + $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) # Rules for building test list @@ -47,7 +47,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) # Rules for cross-compiling tests -CROSSOBJS = $(OBJS:.o=.cross.o) $(RC_SRCS:.rc=.res) +CROSSOBJS = $(OBJS:.o=.cross.o) .SUFFIXES: .cross.o diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 7c47727..9c361ff 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -19,8 +19,8 @@ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(p all: $(MODULE)$(DLLEXT) -$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) +$(MODULE) $(MODULE).so: $(OBJS) Makefile.in + $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) # Rules for testing diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index bb1ff86..bd1251f 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -50,7 +50,7 @@ winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) -upx -9 -qqq $@ -dist.res: winetest.rc tests.rc build.nfo winetest.ico $(TESTBINS) +dist.res: build.nfo @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc index 4acbfa6..6e3ac6c 100644 --- a/programs/winetest/dist.rc +++ b/programs/winetest/dist.rc @@ -18,7 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "winetest.rc" - /* @makedep: build.nfo */ BUILD_INFO STRINGRES "build.nfo"

1 0

Alexandre Julliard : user32/tests: Add tests for message sequence of window destruction at thread exit.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: d25f71b55325941cc9c71a2da2604388e75041f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25f71b55325941cc9c71a2da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 11:31:10 2009 +0200 user32/tests: Add tests for message sequence of window destruction at thread exit. --- dlls/user32/tests/msg.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 45ef814..72cf9ed 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -885,7 +885,7 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_GETTEXT, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_SHOWWINDOW }, { 0 } }; /* CreateWindow (for child window, not initially visible) */ @@ -1125,6 +1125,13 @@ static const struct message WmDestroyChildSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; +/* visible child window destroyed by thread exit */ +static const struct message WmExitThreadSeq[] = { + { WM_NCDESTROY, sent }, /* actually in grandchild */ + { WM_PAINT, sent|parent }, + { WM_ERASEBKGND, sent|parent|beginpaint }, + { 0 } +}; /* DestroyWindow for a visible child window with invisible parent */ static const struct message WmDestroyInvisibleChildSeq[] = { { HCBT_DESTROYWND, hook }, @@ -6334,6 +6341,53 @@ static DWORD WINAPI thread_proc(void *param) return 0; } +static DWORD CALLBACK create_grand_child_thread( void *param ) +{ + struct wnd_event *wnd_event = param; + HWND hchild; + MSG msg; + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + flush_events(); + flush_sequence(); + SetEvent( wnd_event->event ); + + while (GetMessage(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ + } + return 0; +} + +static DWORD CALLBACK create_child_thread( void *param ) +{ + struct wnd_event *wnd_event = param; + struct wnd_event child_event; + DWORD tid; + MSG msg; + + child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + ok (child_event.hwnd != 0, "Failed to create child window\n"); + SetFocus( child_event.hwnd ); + flush_events(); + flush_sequence(); + child_event.event = wnd_event->event; + CloseHandle( CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid) ); + for (;;) + { + DWORD ret = MsgWaitForMultipleObjects(1, &child_event.event, FALSE, 1000, QS_SENDMESSAGE); + if (ret != 1) break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + } + Sleep( 200 ); /* leave parent the time to finish processing messages */ + return 0; +} + static void test_interthread_messages(void) { HANDLE hThread; @@ -6401,6 +6455,30 @@ static void test_interthread_messages(void) CloseHandle(hThread); ok(!IsWindow(wnd_event.hwnd), "window should be destroyed on thread exit\n"); + + wnd_event.hwnd = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); + flush_sequence(); + log_all_parent_messages++; + wnd_event.event = CreateEventA( NULL, TRUE, FALSE, NULL ); + hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + for (;;) + { + ret = MsgWaitForMultipleObjects(1, &wnd_event.event, FALSE, 1000, QS_SENDMESSAGE); + if (ret != 1) break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + } + ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); + /* now wait for the thread without processing messages; this shouldn't deadlock */ + ret = WaitForSingleObject( hThread, 5000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); + CloseHandle( hThread ); + CloseHandle( wnd_event.event ); + flush_events(); + ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); + log_all_parent_messages--; + DestroyWindow( wnd_event.hwnd ); }

1 0

Michael Stefaniuc : kernel32: Switch to UTF-8 encoding for rom.nls.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 7f28666e884f678317cbd4d948060ba3627ef6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f28666e884f678317cbd4d94… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 3 09:44:20 2009 +0200 kernel32: Switch to UTF-8 encoding for rom.nls. --- dlls/kernel32/nls/rom.nls | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls index 045f930..4692c0b 100644 --- a/dlls/kernel32/nls/rom.nls +++ b/dlls/kernel32/nls/rom.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1250) +#pragma code_page(65001) STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT { @@ -88,12 +88,12 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LOCALE_SCURRENCY "lei" LOCALE_SDATE "." LOCALE_SDAYNAME1 "luni" - LOCALE_SDAYNAME2 "mar�i" + LOCALE_SDAYNAME2 "marţi" LOCALE_SDAYNAME3 "miercuri" LOCALE_SDAYNAME4 "joi" LOCALE_SDAYNAME5 "vineri" - LOCALE_SDAYNAME6 "s�mb�t�" - LOCALE_SDAYNAME7 "duminic�" + LOCALE_SDAYNAME6 "sâmbătă" + LOCALE_SDAYNAME7 "duminică" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Romania" LOCALE_SENGCURRNAME "Romanian Leu" @@ -122,10 +122,10 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "ro-RO" - LOCALE_SNATIVECTRYNAME "Rom�nia" + LOCALE_SNATIVECTRYNAME "România" LOCALE_SNATIVECURRNAME "Leu" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "rom�n�" + LOCALE_SNATIVELANGNAME "română" LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;"

1 0

Michael Stefaniuc : kernel32: Update the Romanian(Romania) NLS file.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 7faa2cb70eedaf0539c6cb2dd566a49524a0040b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7faa2cb70eedaf0539c6cb2dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 3 09:44:36 2009 +0200 kernel32: Update the Romanian(Romania) NLS file. --- dlls/kernel32/nls/rom.nls | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls index 4692c0b..f3837a5 100644 --- a/dlls/kernel32/nls/rom.nls +++ b/dlls/kernel32/nls/rom.nls @@ -88,7 +88,7 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LOCALE_SCURRENCY "lei" LOCALE_SDATE "." LOCALE_SDAYNAME1 "luni" - LOCALE_SDAYNAME2 "marţi" + LOCALE_SDAYNAME2 "marți" LOCALE_SDAYNAME3 "miercuri" LOCALE_SDAYNAME4 "joi" LOCALE_SDAYNAME5 "vineri" @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Europa de vest și Statele Unite" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Europa centrală" LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_GREEK+LGRPID_RES_BASE "Grec" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Chirilic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turcic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japonez" + LGRPID_KOREAN+LGRPID_RES_BASE "Coreean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinez tradițional" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinez simplificat" + LGRPID_THAI+LGRPID_RES_BASE "Thailandez" + LGRPID_HEBREW+LGRPID_RES_BASE "Ebraic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arab" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamez" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armean" }

1 0

Michael Stefaniuc : crypt32: Replace long with a better type.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 2b6c4c0be6edb3ccdcbbf4b0a3dc2545133f2fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6c4c0be6edb3ccdcbbf4b0a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 3 09:44:55 2009 +0200 crypt32: Replace long with a better type. --- dlls/crypt32/oid.c | 4 ++-- dlls/crypt32/tests/oid.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 0f36fd7..927481f 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -197,7 +197,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, struct OIDFunctionSet *set = hFuncSet; char *keyName; HKEY key; - long rc; + LSTATUS rc; TRACE("(%p, %d, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList, pcchDllList); @@ -299,7 +299,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID, char *keyName; const char *funcName; HKEY key; - long rc; + LSTATUS rc; keyName = CRYPT_GetKeyName(dwEncodingType, szFuncName, pszOID); rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 9b50129..8b680c4 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -384,7 +384,7 @@ static void test_registerDefaultOIDFunction(void) static const char func[] = "CertDllOpenStoreProv"; char buf[MAX_PATH]; BOOL ret; - long rc; + LSTATUS rc; HKEY key; ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL); @@ -419,7 +419,7 @@ static void test_registerDefaultOIDFunction(void) ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); sprintf(buf, fmt, 0, func); rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key); - ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc); + ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %d\n", rc); if (rc == 0) { static const CHAR dllA[] = "Dll"; @@ -432,7 +432,7 @@ static void test_registerDefaultOIDFunction(void) size = sizeof(dllBuf) / sizeof(dllBuf[0]); rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size); ok(rc == 0, - "Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc); + "Expected Dll value to exist, RegQueryValueExA failed: %d\n", rc); ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %d\n", type); /* bogusDll was registered first, so that should be first */ ptr = dllBuf;

1 0

Michael Stefaniuc : mshtml: Replace long with LONG.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 2d83c1d7e35710f950bd8043687de3400bd2ef12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d83c1d7e35710f950bd80436… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 3 09:44:46 2009 +0200 mshtml: Replace long with LONG. This are internal helper functions; the API functions that use them already use LONG. --- dlls/mshtml/txtrange.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index fd00f85..509d938 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -804,11 +804,11 @@ static WCHAR prev_char(HTMLTxtRange *This, const dompos_t *pos, dompos_t *new_po return 0; } -static long move_next_chars(long cnt, const dompos_t *pos, BOOL col, const dompos_t *bound_pos, +static LONG move_next_chars(LONG cnt, const dompos_t *pos, BOOL col, const dompos_t *bound_pos, BOOL *bounded, dompos_t *new_pos) { dompos_t iter, tmp; - long ret = 0; + LONG ret = 0; WCHAR c; if(bounded) @@ -843,11 +843,11 @@ static long move_next_chars(long cnt, const dompos_t *pos, BOOL col, const dompo return ret; } -static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, BOOL end, +static LONG move_prev_chars(HTMLTxtRange *This, LONG cnt, const dompos_t *pos, BOOL end, const dompos_t *bound_pos, BOOL *bounded, dompos_t *new_pos) { dompos_t iter, tmp; - long ret = 0; + LONG ret = 0; BOOL prev_eq = FALSE; WCHAR c; @@ -882,7 +882,7 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B return ret; } -static long find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret) +static LONG find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret) { dompos_t iter, tmp; WCHAR c; @@ -946,10 +946,10 @@ static int find_word_end(const dompos_t *pos, dompos_t *ret) return cnt; } -static long move_next_words(long cnt, const dompos_t *pos, dompos_t *new_pos) +static LONG move_next_words(LONG cnt, const dompos_t *pos, dompos_t *new_pos) { dompos_t iter, tmp; - long ret = 0; + LONG ret = 0; WCHAR c; c = get_pos_char(pos); @@ -974,10 +974,10 @@ static long move_next_words(long cnt, const dompos_t *pos, dompos_t *new_pos) return ret; } -static long move_prev_words(HTMLTxtRange *This, long cnt, const dompos_t *pos, dompos_t *new_pos) +static LONG move_prev_words(HTMLTxtRange *This, LONG cnt, const dompos_t *pos, dompos_t *new_pos) { dompos_t iter, tmp; - long ret = 0; + LONG ret = 0; iter = *pos; dompos_addref(&iter);

1 0

Gerald Pfeifer : d3d9: Use WINED3DPOOL_DEFAULT instead of D3DPOOL_DEFAULT as appropriate.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: f39e7182e16f9d458e01e1af6c80e36fbbd0fe64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39e7182e16f9d458e01e1af6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jun 3 00:55:08 2009 +0200 d3d9: Use WINED3DPOOL_DEFAULT instead of D3DPOOL_DEFAULT as appropriate. --- dlls/d3d9/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9508ff5..8f95ad1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2002,7 +2002,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen "\tpool %#x, level %u, face %u, surface %p\n", iface, superior, width, height, format, usage, pool, level, face, surface); - if (pool == D3DPOOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) lockable = FALSE; + if (pool == WINED3DPOOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) + lockable = FALSE; hr = IDirect3DDevice9Impl_CreateSurface((IDirect3DDevice9Ex *)This, width, height, d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,

1 0

Alexandre Julliard : server: Reset events on the message queue fd to avoid busy looping when the thread is suspended .
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 2d69ba45d7b815caafcde13a886ebbed45561dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d69ba45d7b815caafcde13a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 22:14:40 2009 +0200 server: Reset events on the message queue fd to avoid busy looping when the thread is suspended. --- server/queue.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/queue.c b/server/queue.c index bc0aea7..e603b16 100644 --- a/server/queue.c +++ b/server/queue.c @@ -872,6 +872,7 @@ static void msg_queue_poll_event( struct fd *fd, int event ) assert( queue->obj.ops == &msg_queue_ops ); if (event & (POLLERR | POLLHUP)) set_fd_events( fd, -1 ); + else set_fd_events( queue->fd, 0 ); wake_up( &queue->obj, 0 ); }

1 0

Alexandre Julliard : server: Hide a window before destroying it if it was still visible.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 5dcf157b5bbbc039dce9eabe3f26bd50da7b33f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcf157b5bbbc039dce9eabe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 11:29:15 2009 +0200 server: Hide a window before destroying it if it was still visible. --- server/thread.c | 2 +- server/window.c | 82 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/server/thread.c b/server/thread.c index 6ce59c8..e931e81 100644 --- a/server/thread.c +++ b/server/thread.c @@ -264,9 +264,9 @@ static void cleanup_thread( struct thread *thread ) if (thread->reply_fd) release_object( thread->reply_fd ); if (thread->wait_fd) release_object( thread->wait_fd ); free( thread->suspend_context ); - free_msg_queue( thread ); cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); + free_msg_queue( thread ); close_thread_desktop( thread ); for (i = 0; i < MAX_INFLIGHT_FDS; i++) { diff --git a/server/window.c b/server/window.c index a24b2d6..a0e0788 100644 --- a/server/window.c +++ b/server/window.c @@ -378,39 +378,6 @@ static void detach_window_thread( struct window *win ) win->thread = NULL; } -/* destroy a window */ -void destroy_window( struct window *win ) -{ - /* destroy all children */ - while (!list_empty(&win->children)) - destroy_window( LIST_ENTRY( list_head(&win->children), struct window, entry )); - while (!list_empty(&win->unlinked)) - destroy_window( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); - - /* reset global window pointers, if the corresponding window is destroyed */ - if (win == shell_window) shell_window = NULL; - if (win == shell_listview) shell_listview = NULL; - if (win == progman_window) progman_window = NULL; - if (win == taskman_window) taskman_window = NULL; - free_user_handle( win->handle ); - destroy_properties( win ); - list_remove( &win->entry ); - if (is_desktop_window(win)) - { - struct desktop *desktop = win->desktop; - assert( desktop->top_window == win || desktop->msg_window == win ); - if (desktop->top_window == win) desktop->top_window = NULL; - else desktop->msg_window = NULL; - } - detach_window_thread( win ); - if (win->win_region) free_region( win->win_region ); - if (win->update_region) free_region( win->update_region ); - if (win->class) release_class( win->class ); - free( win->text ); - memset( win, 0x55, sizeof(*win) + win->nb_extra_bytes - 1 ); - free( win ); -} - /* get the process owning the top window of a given desktop */ struct process *get_top_window_owner( struct desktop *desktop ) { @@ -1696,6 +1663,55 @@ static void set_window_region( struct window *win, struct region *region, int re } +/* destroy a window */ +void destroy_window( struct window *win ) +{ + /* hide the window */ + if (is_visible(win)) + { + struct region *vis_rgn = get_visible_region( win, DCX_WINDOW ); + win->style &= ~WS_VISIBLE; + if (vis_rgn) + { + struct region *exposed_rgn = expose_window( win, &win->window_rect, vis_rgn ); + if (exposed_rgn) free_region( exposed_rgn ); + free_region( vis_rgn ); + } + validate_whole_window( win ); + validate_children( win ); + } + + /* destroy all children */ + while (!list_empty(&win->children)) + destroy_window( LIST_ENTRY( list_head(&win->children), struct window, entry )); + while (!list_empty(&win->unlinked)) + destroy_window( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); + + /* reset global window pointers, if the corresponding window is destroyed */ + if (win == shell_window) shell_window = NULL; + if (win == shell_listview) shell_listview = NULL; + if (win == progman_window) progman_window = NULL; + if (win == taskman_window) taskman_window = NULL; + free_user_handle( win->handle ); + destroy_properties( win ); + list_remove( &win->entry ); + if (is_desktop_window(win)) + { + struct desktop *desktop = win->desktop; + assert( desktop->top_window == win || desktop->msg_window == win ); + if (desktop->top_window == win) desktop->top_window = NULL; + else desktop->msg_window = NULL; + } + detach_window_thread( win ); + if (win->win_region) free_region( win->win_region ); + if (win->update_region) free_region( win->update_region ); + if (win->class) release_class( win->class ); + free( win->text ); + memset( win, 0x55, sizeof(*win) + win->nb_extra_bytes - 1 ); + free( win ); +} + + /* create a window */ DECL_HANDLER(create_window) {

1 0

Alexandre Julliard : user32: Use a simplified sequence to destroy windows at thread exit, since we don' t want to send messages.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 95f8371a16dc2cb9754122abca56ea628a4bed7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f8371a16dc2cb9754122abc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 11:30:29 2009 +0200 user32: Use a simplified sequence to destroy windows at thread exit, since we don't want to send messages. --- dlls/user32/win.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7e599ba..da196ed 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -712,6 +712,75 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) return 0; } + +/*********************************************************************** + * destroy_thread_window + * + * Destroy a window upon exit of its thread. + */ +static void destroy_thread_window( HWND hwnd ) +{ + WND *wndPtr; + HWND *list; + HMENU menu = 0, sys_menu = 0; + WORD index; + + /* free child windows */ + + if ((list = WIN_ListChildren( hwnd ))) + { + int i; + for (i = 0; list[i]; i++) + { + if (WIN_IsCurrentThread( list[i] )) destroy_thread_window( list[i] ); + else SendMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); + } + HeapFree( GetProcessHeap(), 0, list ); + } + + /* destroy the client-side storage */ + + index = USER_HANDLE_TO_INDEX(hwnd); + if (index >= NB_USER_HANDLES) return; + USER_Lock(); + if ((wndPtr = user_handles[index])) + { + if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = (HMENU)wndPtr->wIDmenu; + sys_menu = wndPtr->hSysMenu; + free_dce( wndPtr->dce, hwnd ); + user_handles[index] = NULL; + wndPtr->dwMagic = 0; + } + USER_Unlock(); + + HeapFree( GetProcessHeap(), 0, wndPtr ); + if (menu) DestroyMenu( menu ); + if (sys_menu) DestroyMenu( sys_menu ); +} + + +/*********************************************************************** + * destroy_thread_child_windows + * + * Destroy child windows upon exit of its thread. + */ +static void destroy_thread_child_windows( HWND hwnd ) +{ + HWND *list; + int i; + + if (WIN_IsCurrentThread( hwnd )) + { + destroy_thread_window( hwnd ); + } + else if ((list = WIN_ListChildren( hwnd ))) + { + for (i = 0; list[i]; i++) destroy_thread_child_windows( list[i] ); + HeapFree( GetProcessHeap(), 0, list ); + } +} + + /*********************************************************************** * WIN_DestroyThreadWindows * @@ -723,13 +792,18 @@ void WIN_DestroyThreadWindows( HWND hwnd ) int i; if (!(list = WIN_ListChildren( hwnd ))) return; + + /* reset owners of top-level windows */ for (i = 0; list[i]; i++) { - if (WIN_IsCurrentThread( list[i] )) - DestroyWindow( list[i] ); - else - WIN_DestroyThreadWindows( list[i] ); + if (!WIN_IsCurrentThread( list[i] )) + { + HWND owner = GetWindow( list[i], GW_OWNER ); + if (owner && WIN_IsCurrentThread( owner )) WIN_SetOwner( list[i], 0 ); + } } + + for (i = 0; list[i]; i++) destroy_thread_child_windows( list[i] ); HeapFree( GetProcessHeap(), 0, list ); }

1 0