October 2013 - Wine-Commits

Henri Verbeet : wined3d: Send constant buffer binding updates through the command stream.
by Alexandre Julliard Oct. 11, 2013

Oct. 11, 2013

Module: wine Branch: master Commit: 738de80d0cbf5e284f2592b59f5c6cbbe817d140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=738de80d0cbf5e284f2592b59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 10 23:49:44 2013 +0200 wined3d: Send constant buffer binding updates through the command stream. --- dlls/wined3d/cs.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 30 ++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 12ab60e..7b33164 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -37,6 +37,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_INDEX_BUFFER, + WINED3D_CS_OP_SET_CONSTANT_BUFFER, WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, @@ -134,6 +135,14 @@ struct wined3d_cs_set_index_buffer enum wined3d_format_id format_id; }; +struct wined3d_cs_set_constant_buffer +{ + enum wined3d_cs_op opcode; + enum wined3d_shader_type type; + UINT cb_idx; + struct wined3d_buffer *buffer; +}; + struct wined3d_cs_set_texture { enum wined3d_cs_op opcode; @@ -493,6 +502,34 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff cs->ops->submit(cs); } +static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_constant_buffer *op = data; + struct wined3d_buffer *prev; + + prev = cs->state.cb[op->type][op->cb_idx]; + cs->state.cb[op->type][op->cb_idx] = op->buffer; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); +} + +void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT cb_idx, struct wined3d_buffer *buffer) +{ + struct wined3d_cs_set_constant_buffer *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; + op->type = type; + op->cb_idx = cb_idx; + op->buffer = buffer; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; @@ -720,6 +757,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, + /* WINED3D_CS_OP_SET_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, /* WINED3D_CS_OP_SET_SHADER */ wined3d_cs_exec_set_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93aef9f..3fb11a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2098,30 +2098,16 @@ static void wined3d_device_set_constant_buffer(struct wined3d_device *device, } prev = device->update_state->cb[type][idx]; - device->update_state->cb[type][idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); + if (buffer == prev) return; - } - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + if (buffer) + wined3d_buffer_incref(buffer); + device->update_state->cb[type][idx] = buffer; + if (!device->recording) + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + if (prev) + wined3d_buffer_decref(prev); } void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bfd9995..890f1a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2475,6 +2475,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : comctl32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 11, 2013

Oct. 11, 2013

Module: wine Branch: master Commit: d12c0d67ae652023b0f8fe1889c0612c2e6fc79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12c0d67ae652023b0f8fe188… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 10 21:52:45 2013 +0200 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/commctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index f08288d..d2ad28f 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1541,7 +1541,7 @@ BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2) return FALSE; } -static inline int IsDelimiter(WCHAR c) +static inline BOOL IsDelimiter(WCHAR c) { switch(c) {

1 0

Ken Thomases : winemac: Implement support for Cocoa-style full-screen mode.
by Alexandre Julliard Oct. 11, 2013

Oct. 11, 2013

Module: wine Branch: master Commit: f4f50c9e4ae9007fcba4555d212be2146440f6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f50c9e4ae9007fcba4555d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 10 14:22:08 2013 -0500 winemac: Implement support for Cocoa-style full-screen mode. Based in large part on a patch submitted by Kevin Eaves. --- dlls/winemac.drv/cocoa_app.m | 5 + dlls/winemac.drv/cocoa_window.h | 5 + dlls/winemac.drv/cocoa_window.m | 169 ++++++++++++++++++++++++++++++++++---- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 3 +- dlls/winemac.drv/window.c | 9 ++- 7 files changed, 171 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4f50c9e4ae9007fcba45…

1 0

Alexandre Julliard : makefiles: Generate the common rules for tests from configure.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: c6262a14f8bccaa8b46a6ac33c6ebece9cac3faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6262a14f8bccaa8b46a6ac33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 10 11:47:57 2013 +0200 makefiles: Generate the common rules for tests from configure. --- .gitignore | 1 - Make.rules.in | 6 ---- Make.vars.in | 3 -- Maketest.rules.in | 25 ---------------- aclocal.m4 | 14 ++++---- configure | 75 ++++++++++++++++++++++++++++--------------------- configure.ac | 49 ++++++++++++++++++++++---------- tools/make_makefiles | 3 +- 8 files changed, 85 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6262a14f8bccaa8b46a6…

1 0

Jacek Caban : secur32: Compile tests with __WINESRC__ define.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 00e53de76595d8064eb062e7285e6b6dc90d4bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e53de76595d8064eb062e72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 10 12:53:55 2013 +0200 secur32: Compile tests with __WINESRC__ define. --- dlls/secur32/tests/Makefile.in | 1 - dlls/secur32/tests/main.c | 8 ++++---- dlls/secur32/tests/negotiate.c | 10 +++++----- dlls/secur32/tests/ntlm.c | 30 +++++++++++++++--------------- dlls/secur32/tests/schannel.c | 2 +- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in index f41d50b..278cac4 100644 --- a/dlls/secur32/tests/Makefile.in +++ b/dlls/secur32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = secur32.dll IMPORTS = advapi32 ws2_32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ main.c \ diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index 7612b1c8..b5b21c3 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -108,7 +108,7 @@ static const char* getSecError(SECURITY_STATUS status) /* Helper for testQuerySecurityPagageInfo */ static SECURITY_STATUS setupPackageA(SEC_CHAR *p_package_name, - PSecPkgInfo *p_pkg_info) + PSecPkgInfoA *p_pkg_info) { SECURITY_STATUS ret; @@ -121,7 +121,7 @@ static SECURITY_STATUS setupPackageA(SEC_CHAR *p_package_name, static void testInitSecurityInterface(void) { - PSecurityFunctionTable sec_fun_table = NULL; + PSecurityFunctionTableA sec_fun_table = NULL; sec_fun_table = pInitSecurityInterfaceA(); ok(sec_fun_table != NULL, "InitSecurityInterface() returned NULL.\n"); @@ -133,7 +133,7 @@ static void testEnumerateSecurityPackages(void) SECURITY_STATUS sec_status; ULONG num_packages, i; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; trace("Running testEnumerateSecurityPackages\n"); @@ -197,7 +197,7 @@ static void testEnumerateSecurityPackages(void) static void testQuerySecurityPackageInfo(void) { SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info; + PSecPkgInfoA pkg_info; static SEC_CHAR ntlm[] = "NTLM", winetest[] = "Winetest"; diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index e70c1e8..91c3fa1 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -99,7 +99,7 @@ struct sspi_data CtxtHandle ctxt; PSecBufferDesc in_buf; PSecBufferDesc out_buf; - PSEC_WINNT_AUTH_IDENTITY id; + PSEC_WINNT_AUTH_IDENTITY_A id; ULONG max_token; }; @@ -256,10 +256,10 @@ static void test_authentication(void) SECURITY_STATUS status_c = SEC_I_CONTINUE_NEEDED, status_s = SEC_I_CONTINUE_NEEDED, status; struct sspi_data client, server; - SEC_WINNT_AUTH_IDENTITY id; - SecPkgContext_NegotiationInfo info; + SEC_WINNT_AUTH_IDENTITY_A id; + SecPkgContext_NegotiationInfoA info; SecPkgContext_Sizes sizes; - SecPkgInfo *pi; + SecPkgInfoA *pi; BOOL first = TRUE; id.User = (unsigned char *)"user"; @@ -357,7 +357,7 @@ done: START_TEST(negotiate) { - SecPkgInfo *info; + SecPkgInfoA *info; init_function_ptrs(); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 7533899..f01fa12 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -67,7 +67,7 @@ typedef struct _SspiData { CtxtHandle ctxt; PSecBufferDesc in_buf; PSecBufferDesc out_buf; - PSEC_WINNT_AUTH_IDENTITY id; + PSEC_WINNT_AUTH_IDENTITY_A id; ULONG max_token; } SspiData; @@ -565,9 +565,9 @@ static void communicate(SspiData *from, SspiData *to) static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; SspiData client; - SEC_WINNT_AUTH_IDENTITY id; + SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM", test_user[] = "testuser", workgroup[] = "WORKGROUP", @@ -788,10 +788,10 @@ static void testAuth(ULONG data_rep, BOOL fake) SECURITY_STATUS client_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS server_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; SspiData client, server; - SEC_WINNT_AUTH_IDENTITY id; + SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; static char sec_pkg_name[] = "NTLM", test_user[] = "testuser", @@ -921,10 +921,10 @@ static void testSignSeal(void) SECURITY_STATUS client_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS server_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; SspiData client, server; - SEC_WINNT_AUTH_IDENTITY id; + SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; SecBuffer data[2], fake_data[2], complex_data[4]; @@ -1004,7 +1004,7 @@ static void testSignSeal(void) fake_data[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, fake_data[0].cbBuffer); fake_data[1].BufferType = SECBUFFER_DATA; - fake_data[1].cbBuffer = lstrlen(message); + fake_data[1].cbBuffer = lstrlenA(message); fake_data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, fake_data[1].cbBuffer); sec_status = pMakeSignature(&client.ctxt, 0, &crypt, 0); @@ -1019,7 +1019,7 @@ static void testSignSeal(void) data[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[0].cbBuffer); data[1].BufferType = SECBUFFER_DATA; - data[1].cbBuffer = lstrlen(message); + data[1].cbBuffer = lstrlenA(message); data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[1].cbBuffer); memcpy(data[1].pvBuffer, message, data[1].cbBuffer); @@ -1106,7 +1106,7 @@ static void testSignSeal(void) complex_data[0].pvBuffer = message_header; complex_data[1].BufferType = SECBUFFER_DATA; - complex_data[1].cbBuffer = lstrlen(message); + complex_data[1].cbBuffer = lstrlenA(message); complex_data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[1].cbBuffer); memcpy(complex_data[1].pvBuffer, message, complex_data[1].cbBuffer); @@ -1187,8 +1187,8 @@ static BOOL testAcquireCredentialsHandle(void) test_pass[] = "testpass", sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; - SEC_WINNT_AUTH_IDENTITY id; - PSecPkgInfo pkg_info = NULL; + SEC_WINNT_AUTH_IDENTITY_A id; + PSecPkgInfoA pkg_info = NULL; if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) { @@ -1254,8 +1254,8 @@ static void test_cred_multiple_use(void) test_pass[] = "testpass", sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; - SEC_WINNT_AUTH_IDENTITY id; - PSecPkgInfo pkg_info = NULL; + SEC_WINNT_AUTH_IDENTITY_A id; + PSecPkgInfoA pkg_info = NULL; CredHandle cred; CtxtHandle ctxt1; CtxtHandle ctxt2; @@ -1315,7 +1315,7 @@ static void test_cred_multiple_use(void) static void test_null_auth_data(void) { SECURITY_STATUS status; - PSecPkgInfo info; + PSecPkgInfoA info; CredHandle cred; CtxtHandle ctx; SecBufferDesc buffer_desc; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 34f2524..81539c7 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -675,7 +675,7 @@ static void test_communication(void) init_cred(&cred); cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; - status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, + status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, &cred_handle, NULL); ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return;

1 0

Jacek Caban : mshtml: Compile tests with __WINESRC__ define.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 5b52334f6d5cde57a7ebe80c55c26f7ea9d9b769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b52334f6d5cde57a7ebe80c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 10 12:53:34 2013 +0200 mshtml: Compile tests with __WINESRC__ define. --- dlls/mshtml/tests/Makefile.in | 2 -- dlls/mshtml/tests/activex.c | 10 +++++----- dlls/mshtml/tests/dom.c | 4 ++-- dlls/mshtml/tests/events.c | 10 +++++----- dlls/mshtml/tests/htmldoc.c | 12 ++++++------ dlls/mshtml/tests/mshtml_test.h | 4 ++-- dlls/mshtml/tests/script.c | 12 ++++++------ dlls/mshtml/tests/style.c | 4 ++-- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index 41d4040..e339175 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -1,7 +1,5 @@ TESTDLL = mshtml.dll IMPORTS = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS - C_SRCS = \ activex.c \ dom.c \ diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index fab2c92..16dfba5 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -283,7 +283,7 @@ static LRESULT WINAPI plugin_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } } - return DefWindowProc(hwnd, msg, wParam, lParam); + return DefWindowProcW(hwnd, msg, wParam, lParam); } static void create_plugin_window(HWND parent, const RECT *rect) @@ -2334,9 +2334,9 @@ static IHTMLDocument2 *create_doc(const char *str) doc_load_string(doc, str); do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) { + while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } return doc; @@ -2591,7 +2591,7 @@ static void test_nooleobj_ax(void) static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hwnd, msg, wParam, lParam); + return DefWindowProcW(hwnd, msg, wParam, lParam); } static HWND create_container_window(void) @@ -2639,7 +2639,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res; if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3141643..f1155d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7542,9 +7542,9 @@ static void run_domtest(const char *str, domtest_t test) do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) { + while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } test(doc); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 8e9d88c9..f1542f5 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1398,12 +1398,12 @@ static void pump_msgs(BOOL *b) if(b) { while(!*b && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } }else { while(!b && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } } @@ -2722,9 +2722,9 @@ static void run_test(const char *str, testfunc_t test) doc_load_string(doc, str); do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) { + while(!doc_complete && GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } hres = IHTMLDocument2_get_body(doc, &body); @@ -2751,7 +2751,7 @@ static void run_test(const char *str, testfunc_t test) static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); } static HWND create_container_window(void) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 70da9ae..1e872f3 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -368,9 +368,9 @@ static void test_timer(DWORD flags) if(flags & EXPECT_SETTITLE) SET_EXPECT(Exec_SETTITLE); - while(!*b && GetMessage(&msg, doc_hwnd, 0, 0)) { + while(!*b && GetMessageA(&msg, doc_hwnd, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } if(flags & EXPECT_UPDATEUI) { @@ -1243,7 +1243,7 @@ static HRESULT WINAPI Binding_Abort(IBinding *iface) { CHECK_EXPECT(Abort); if(asynchronous_binding) - PeekMessage(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE); + PeekMessageA(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE); return S_OK; } @@ -5225,7 +5225,7 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam continue_binding(callback); } - return DefWindowProc(hwnd, msg, wParam, lParam); + return DefWindowProcW(hwnd, msg, wParam, lParam); } static void test_doscroll(IUnknown *unk) @@ -5680,9 +5680,9 @@ static void test_download(DWORD flags) } expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ - while(!*b && GetMessage(&msg, NULL, 0, 0)) { + while(!*b && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } if(flags & DWL_REFRESH) { diff --git a/dlls/mshtml/tests/mshtml_test.h b/dlls/mshtml/tests/mshtml_test.h index 7f2cdf2..c084495 100644 --- a/dlls/mshtml/tests/mshtml_test.h +++ b/dlls/mshtml/tests/mshtml_test.h @@ -24,10 +24,10 @@ static BOOL is_ie_hardened(void) DWORD ie_harden, type, size; ie_harden = 0; - if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", + if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { size = sizeof(DWORD); - if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || + if (RegQueryValueExA(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || type != REG_DWORD) { ie_harden = 0; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 0c3c542..c0602d8 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -201,7 +201,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res; if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; } @@ -1285,9 +1285,9 @@ static void load_doc(IHTMLDocument2 *doc, const char *str) load_string(doc, str); do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) { + while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } hres = IHTMLDocument2_get_body(doc, &body); @@ -2826,9 +2826,9 @@ static void run_js_script(const char *test_name) SET_EXPECT(external_success); - while(!called_external_success && GetMessage(&msg, NULL, 0, 0)) { + while(!called_external_success && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } CHECK_CALLED(external_success); @@ -2873,7 +2873,7 @@ static BOOL register_script_engine(void) static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); } static HWND create_container_window(void) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 71eb955..c434c1c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2686,9 +2686,9 @@ static void run_test(const char *str, style_test_t test) do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) { + while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } test(doc);

1 0

Jacek Caban : ieframe: Compile tests with __WINESRC__ define.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 33b92a8cf44e059bac2a2742fce13bba4ed2ba25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b92a8cf44e059bac2a2742f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 10 12:53:22 2013 +0200 ieframe: Compile tests with __WINESRC__ define. --- dlls/ieframe/tests/Makefile.in | 1 - dlls/ieframe/tests/ie.c | 2 +- dlls/ieframe/tests/intshcut.c | 2 +- dlls/ieframe/tests/webbrowser.c | 12 ++++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in index 661869e..ec9853e 100644 --- a/dlls/ieframe/tests/Makefile.in +++ b/dlls/ieframe/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = ieframe.dll IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ ie.c \ diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 51cd8b3..daf47f7 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -222,7 +222,7 @@ static void test_navigate(IWebBrowser2 *wb, const char *url) while(!navigate_complete && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index c9c105c..bbc7a18 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -265,7 +265,7 @@ static void test_ReadAndWriteProperties(void) hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); ok(hr == S_OK, "Unable to get url from file, hr=0x%x\n", hr); - ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url); + ok(lstrcmpA(url, testurl) == 0, "Wrong url read from file: %s\n",url); hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 675bc12..d045658 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2779,9 +2779,9 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); - while(!*b && GetMessage(&msg, NULL, 0, 0)) { + while(!*b && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) @@ -2824,9 +2824,9 @@ static void test_download(DWORD flags) test_ready_state(READYSTATE_COMPLETE); - while(!called_Exec_UPDATECOMMANDS && GetMessage(&msg, NULL, 0, 0)) { + while(!called_Exec_UPDATECOMMANDS && GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); @@ -3565,10 +3565,10 @@ static BOOL is_ie_hardened(void) DWORD ie_harden, type, size; ie_harden = 0; - if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", + if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { size = sizeof(DWORD); - if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || + if (RegQueryValueExA(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || type != REG_DWORD) { ie_harden = 0; }

1 0

Alexandre Julliard : makefiles: Generate the common rules for dlls from configure.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 41c7ba4b5d653f290080eaa5d5b5bde03af7ff9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c7ba4b5d653f290080eaa5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 10 11:05:21 2013 +0200 makefiles: Generate the common rules for dlls from configure. --- .gitignore | 1 - aclocal.m4 | 4 ++-- configure | 29 +++++++++++++++++++++-------- configure.ac | 19 ++++++++++++++++++- dlls/Makedll.rules.in | 17 ----------------- tools/make_makefiles | 15 +++++++++++---- 6 files changed, 52 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index f5133b7..1d35e05 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ Makefile dlldata.c dlls/*/*.def -dlls/Makedll.rules dlls/actxprxy/actxprxy_activscp.h dlls/actxprxy/actxprxy_activscp_p.c dlls/actxprxy/actxprxy_comcat.h diff --git a/aclocal.m4 b/aclocal.m4 index 0058603..fb013fb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -393,14 +393,14 @@ wine_fn_config_dll () dnl enable_win16 is special in that it disables import libs too [if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 then - wine_fn_depend_rules dlls/Makedll.rules + wine_fn_depend_rules Make.rules.in wine_fn_clean_rules $ac_clean else wine_fn_disabled_rules $ac_clean return fi], - [wine_fn_all_rules dlls/Makedll.rules + [wine_fn_all_rules Make.rules.in wine_fn_clean_rules $ac_clean wine_fn_append_rule \ "$ac_dir: __builddeps__ diff --git a/configure b/configure index 4744a1a..da3d922 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ LIBOBJS PORCFLAGS LINGUAS ALL_TEST_RESOURCES +MAKE_DLL_RULES MAKE_IMPLIB_RULES LDAPLIBS LIBRT @@ -801,7 +802,6 @@ PATH_SEPARATOR SHELL' ac_subst_files='MAKE_RULES MAKE_TEST_RULES -MAKE_DLL_RULES MAKE_PROG_RULES' ac_user_opts=' enable_option_checking @@ -16065,6 +16065,24 @@ all: \$(STATICLIB:.a=.cross.a) fi +if test -n "$DLLEXT" +then + deps="\$(MODULE)$DLLEXT \$(MODULE).fake" +else + deps="\$(MODULE)" +fi + +MAKE_DLL_RULES=" +DLLFLAGS = $DLLFLAGS +MAINSPEC = \$(MODULE:%.dll=%).spec +IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) +MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) + +all: $deps +" + + + wine_rules_file=conf$$rules.make rm -f $wine_rules_file ALL_POT_FILES="" @@ -16266,14 +16284,14 @@ wine_fn_config_dll () if eval test \"x\$"$ac_enable"\" = x"no"; then : if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 then - wine_fn_depend_rules dlls/Makedll.rules + wine_fn_depend_rules Make.rules.in wine_fn_clean_rules $ac_clean else wine_fn_disabled_rules $ac_clean return fi else - wine_fn_all_rules dlls/Makedll.rules + wine_fn_all_rules Make.rules.in wine_fn_clean_rules $ac_clean wine_fn_append_rule \ "$ac_dir: __builddeps__ @@ -16605,10 +16623,6 @@ wine_fn_config_makerules Maketest.rules Make.rules MAKE_TEST_RULES=Maketest.rules ac_config_files="$ac_config_files Maketest.rules" -wine_fn_config_makerules dlls/Makedll.rules Make.rules -MAKE_DLL_RULES=dlls/Makedll.rules -ac_config_files="$ac_config_files dlls/Makedll.rules" - wine_fn_config_makerules programs/Makeprog.rules Make.rules MAKE_PROG_RULES=programs/Makeprog.rules ac_config_files="$ac_config_files programs/Makeprog.rules" @@ -18180,7 +18194,6 @@ do "include/wine") CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;; "Make.rules") CONFIG_FILES="$CONFIG_FILES Make.rules" ;; "Maketest.rules") CONFIG_FILES="$CONFIG_FILES Maketest.rules" ;; - "dlls/Makedll.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;; "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; diff --git a/configure.ac b/configure.ac index 90feb73..6bc985a 100644 --- a/configure.ac +++ b/configure.ac @@ -2608,6 +2608,24 @@ all: \$(STATICLIB:.a=.cross.a) ") fi +dnl Dll rules + +if test -n "$DLLEXT" +then + deps="\$(MODULE)$DLLEXT \$(MODULE).fake" +else + deps="\$(MODULE)" +fi + +AC_SUBST(MAKE_DLL_RULES," +DLLFLAGS = $DLLFLAGS +MAINSPEC = \$(MODULE:%.dll=%).spec +IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) +MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) + +all: $deps +") + dnl Main makefile WINE_APPEND_RULE([ @@ -2636,7 +2654,6 @@ WINE_CONFIG_EXTRA_DIR(include/wine) WINE_CONFIG_MAKERULES([Make.rules],[MAKE_RULES]) WINE_CONFIG_MAKERULES([Maketest.rules],[MAKE_TEST_RULES],[Make.rules]) -WINE_CONFIG_MAKERULES([dlls/Makedll.rules],[MAKE_DLL_RULES],[Make.rules]) WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules]) WINE_CONFIG_DLL(acledit) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in deleted file mode 100644 index 82322e3..0000000 --- a/dlls/Makedll.rules.in +++ /dev/null @@ -1,17 +0,0 @@ -# Global rules for building dlls -*-Makefile-*- -# -# Each individual makefile should define the following variables: -# MODULE : name of the main module being built -# EXTRALIBS : extra libraries to link in (optional) -# -# plus all variables required by the global Make.rules.in -# - -DLLFLAGS = @DLLFLAGS@ -MAINSPEC = $(MODULE:%.dll=%).spec -IDL_TLB_RES = $(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared $(srcdir)/$(MAINSPEC) $(EXTRADLLFLAGS) - -all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) - -(a)MAKE_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 8785326..dc1f92a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -25,7 +25,6 @@ use strict; my %makerules = ( "MAKE_RULES" => "Make.rules", - "MAKE_DLL_RULES" => "dlls/Makedll.rules", "MAKE_TEST_RULES" => "Maketest.rules", "MAKE_PROG_RULES" => "programs/Makeprog.rules", ); @@ -351,7 +350,7 @@ sub parse_makefile($) } if (defined $make{"=flags"} && defined $make{"=rules"} && - ($make{"=rules"} eq $makerules{"MAKE_DLL_RULES"} || + ($make{"=rules"} eq "MAKE_DLL_RULES" || $make{"=rules"} eq $makerules{"MAKE_PROG_RULES"})) { die "Custom install-lib rule not allowed in $file" if defined ${$make{"=flags"}}{"install-lib"}; @@ -377,6 +376,14 @@ sub assign_sources_to_makefiles(@) $subdirs{"$dir/ $subdir"} = 1 if $subdir; next unless $dir; + my $basedir = dirname( $dir ); + if ($basedir && !defined $makefiles{"$basedir/Makefile"}) + { + $subdir = $basedir; + $basedir = dirname( $basedir ); + $subdirs{"$basedir/ $subdir"} = 1; + } + die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"}; my $make = $makefiles{"$dir/Makefile"}; @@ -447,7 +454,7 @@ sub update_makefiles(@) my $args = ""; my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}}); my $flag_args = defined $make{"=flags"} ? ",[" . join(",",sort keys %{$make{"=flags"}}) ."]" : ""; - if ($rules eq $makerules{"MAKE_DLL_RULES"}) + if ($rules eq "MAKE_DLL_RULES") { (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; if ($name =~ /\./) @@ -546,7 +553,7 @@ sub update_ignores(@) { my @pattern = @{$src}; next unless defined $makefile{$pattern[0]}; - next if $pattern[0] eq "IDL_TLB_SRCS" && $makefile{"=rules"} eq "dlls/Makedll.rules"; + next if $pattern[0] eq "IDL_TLB_SRCS" && $makefile{"=rules"} eq "MAKE_DLL_RULES"; push @list, map { (my $ret = $_) =~ s/$pattern[1]$/$pattern[2]/; $ret; } @{$makefile{$pattern[0]}}; } foreach my $f (@list)

1 0

Alexandre Julliard : makefiles: Generate the common rules for programs from configure.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 237ed76e6d3bf60a7c4daf1eefc07c5cf59054c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237ed76e6d3bf60a7c4daf1ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 10 11:22:08 2013 +0200 makefiles: Generate the common rules for programs from configure. --- .gitignore | 1 - aclocal.m4 | 2 +- configure | 18 ++++++++++-------- configure.ac | 9 +++++++-- programs/Makeprog.rules.in | 16 ---------------- programs/winetest/Makefile.in | 4 ++-- tools/make_makefiles | 5 ++--- 7 files changed, 22 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 1d35e05..4cb2af7 100644 --- a/.gitignore +++ b/.gitignore @@ -286,7 +286,6 @@ loader/wine64-preloader loader/wine_info.plist msg.pot po/*.mo -programs/Makeprog.rules programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h diff --git a/aclocal.m4 b/aclocal.m4 index fb013fb..9ee387a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -524,7 +524,7 @@ wine_fn_config_program () AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules $ac_clean; return]) - wine_fn_all_rules programs/Makeprog.rules + wine_fn_all_rules Make.rules.in wine_fn_clean_rules $ac_clean wine_fn_append_rule "$ac_dir: __builddeps__" wine_fn_pot_rules diff --git a/configure b/configure index da3d922..91af939 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ LIBOBJS PORCFLAGS LINGUAS ALL_TEST_RESOURCES +MAKE_PROG_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES LDAPLIBS @@ -801,8 +802,7 @@ PACKAGE_NAME PATH_SEPARATOR SHELL' ac_subst_files='MAKE_RULES -MAKE_TEST_RULES -MAKE_PROG_RULES' +MAKE_TEST_RULES' ac_user_opts=' enable_option_checking enable_win16 @@ -16082,6 +16082,13 @@ all: $deps " +MAKE_PROG_RULES=" +DLLFLAGS = $DLLFLAGS + +all: $deps +" + + wine_rules_file=conf$$rules.make rm -f $wine_rules_file @@ -16418,7 +16425,7 @@ wine_fn_config_program () wine_fn_disabled_rules $ac_clean; return fi - wine_fn_all_rules programs/Makeprog.rules + wine_fn_all_rules Make.rules.in wine_fn_clean_rules $ac_clean wine_fn_append_rule "$ac_dir: __builddeps__" wine_fn_pot_rules @@ -16623,10 +16630,6 @@ wine_fn_config_makerules Maketest.rules Make.rules MAKE_TEST_RULES=Maketest.rules ac_config_files="$ac_config_files Maketest.rules" -wine_fn_config_makerules programs/Makeprog.rules Make.rules -MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files programs/Makeprog.rules" - wine_fn_config_dll acledit enable_acledit wine_fn_config_dll aclui enable_aclui implib @@ -18194,7 +18197,6 @@ do "include/wine") CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;; "Make.rules") CONFIG_FILES="$CONFIG_FILES Make.rules" ;; "Maketest.rules") CONFIG_FILES="$CONFIG_FILES Maketest.rules" ;; - "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; diff --git a/configure.ac b/configure.ac index 6bc985a..b5358c0 100644 --- a/configure.ac +++ b/configure.ac @@ -2608,7 +2608,7 @@ all: \$(STATICLIB:.a=.cross.a) ") fi -dnl Dll rules +dnl Dll and program rules if test -n "$DLLEXT" then @@ -2626,6 +2626,12 @@ MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps ") +AC_SUBST(MAKE_PROG_RULES," +DLLFLAGS = $DLLFLAGS + +all: $deps +") + dnl Main makefile WINE_APPEND_RULE([ @@ -2654,7 +2660,6 @@ WINE_CONFIG_EXTRA_DIR(include/wine) WINE_CONFIG_MAKERULES([Make.rules],[MAKE_RULES]) WINE_CONFIG_MAKERULES([Maketest.rules],[MAKE_TEST_RULES],[Make.rules]) -WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules]) WINE_CONFIG_DLL(acledit) WINE_CONFIG_DLL(aclui,,[implib]) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in deleted file mode 100644 index 1813173..0000000 --- a/programs/Makeprog.rules.in +++ /dev/null @@ -1,16 +0,0 @@ -# Global rules for building a Winelib program -*-Makefile-*- -# -# Each individual makefile should define the following variables: -# MODULE : name of the main module being built -# APPMODE : program mode (-mwindows,-mconsole) -# EXTRALIBS : extra libraries to link in (optional) -# EXTRADEFS : extra symbol definitions, like -DWINELIB (optional) -# -# plus all variables required by the global Make.rules.in -# - -DLLFLAGS = @DLLFLAGS@ - -all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) - -(a)MAKE_RULES@ diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index cddea98..898e995 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -16,8 +16,6 @@ SVG_SRCS = winetest.svg EXTRA_OBJS = build.res @ALL_TEST_RESOURCES@ -(a)MAKE_PROG_RULES@ - clean:: $(RM) build.rc build.nfo @@ -28,3 +26,5 @@ build.nfo: -$(CC) -v 2>$@ build.res: build.nfo + +(a)MAKE_PROG_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index dc1f92a..d265955 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -26,7 +26,6 @@ my %makerules = ( "MAKE_RULES" => "Make.rules", "MAKE_TEST_RULES" => "Maketest.rules", - "MAKE_PROG_RULES" => "programs/Makeprog.rules", ); # Programs that we want to install in the bin directory too @@ -351,7 +350,7 @@ sub parse_makefile($) if (defined $make{"=flags"} && defined $make{"=rules"} && ($make{"=rules"} eq "MAKE_DLL_RULES" || - $make{"=rules"} eq $makerules{"MAKE_PROG_RULES"})) + $make{"=rules"} eq "MAKE_PROG_RULES")) { die "Custom install-lib rule not allowed in $file" if defined ${$make{"=flags"}}{"install-lib"}; die "Custom install-dev rule not allowed in $file" if defined ${$make{"=flags"}}{"install-dev"}; @@ -472,7 +471,7 @@ sub update_makefiles(@) $args .= ",[$implib]" if $implib && $implib ne $name; push @lines, "WINE_CONFIG_DLL($name$args)\n"; } - elsif ($rules eq $makerules{"MAKE_PROG_RULES"}) + elsif ($rules eq "MAKE_PROG_RULES") { (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; if ($name =~ /\./)

1 0

Ken Thomases : winemac: Make sure the same housekeeping is done when closing a window as is done when hiding it .
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 05e3d0e5cc4211d408210e4ef3969a1446f9c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e3d0e5cc4211d408210e4ef… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 9 16:30:53 2013 -0500 winemac: Make sure the same housekeeping is done when closing a window as is done when hiding it. --- dlls/winemac.drv/cocoa_window.m | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a48b691..7371cbc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1801,8 +1801,11 @@ void macdrv_destroy_cocoa_window(macdrv_window w) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineWindow* window = (WineWindow*)w; + OnMainThread(^{ + [window doOrderOut]; + [window close]; + }); [window.queue discardEventsMatchingMask:-1 forWindow:window]; - [window close]; [window release]; [pool release];

1 0