November 2011 - Wine-commits

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (tapi.h).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 04757b1b853b28fd452d1525a137aa589f5bdee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04757b1b853b28fd452d1525a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 10 01:42:55 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (tapi.h). --- include/tapi.h | 58 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/tapi.h b/include/tapi.h index ca2c4c8..564b118 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -37,7 +37,7 @@ typedef HANDLE HLINEAPP, *LPHLINEAPP; typedef HANDLE HPHONE, *LPHPHONE; typedef HANDLE HPHONEAPP, *LPHPHONEAPP; -#define TAPIERR_REQUESTFAILED -16L +#define TAPIERR_REQUESTFAILED __MSABI_LONG(-16) #define LINEERR_ALLOCATED 0x80000001 #define LINEERR_BADDEVICEID 0x80000002 #define LINEERR_BEARERMODEUNAVAIL 0x80000003 @@ -196,34 +196,34 @@ typedef HANDLE HPHONEAPP, *LPHPHONEAPP; /* tapi callback messages */ -#define LINE_ADDRESSSTATE 0L -#define LINE_CALLINFO 1L -#define LINE_CALLSTATE 2L -#define LINE_CLOSE 3L -#define LINE_DEVSPECIFIC 4L -#define LINE_DEVSPECIFICFEATURE 5L -#define LINE_GATHERDIGITS 6L -#define LINE_GENERATE 7L -#define LINE_LINEDEVSTATE 8L -#define LINE_MONITORDIGITS 9L -#define LINE_MONITORMEDIA 10L -#define LINE_MONITORTONE 11L -#define LINE_REPLY 12L -#define LINE_REQUEST 13L -#define PHONE_BUTTON 14L -#define PHONE_CLOSE 15L -#define PHONE_DEVSPECIFIC 16L -#define PHONE_REPLY 17L -#define PHONE_STATE 18L -#define LINE_CREATE 19L -#define PHONE_CREATE 20L - -#define LINE_AGENTSPECIFIC 21L -#define LINE_AGENTSTATUS 22L -#define LINE_APPNEWCALL 23L -#define LINE_PROXYREQUEST 24L -#define LINE_REMOVE 25L -#define PHONE_REMOVE 26L +#define LINE_ADDRESSSTATE __MSABI_LONG(0) +#define LINE_CALLINFO __MSABI_LONG(1) +#define LINE_CALLSTATE __MSABI_LONG(2) +#define LINE_CLOSE __MSABI_LONG(3) +#define LINE_DEVSPECIFIC __MSABI_LONG(4) +#define LINE_DEVSPECIFICFEATURE __MSABI_LONG(5) +#define LINE_GATHERDIGITS __MSABI_LONG(6) +#define LINE_GENERATE __MSABI_LONG(7) +#define LINE_LINEDEVSTATE __MSABI_LONG(8) +#define LINE_MONITORDIGITS __MSABI_LONG(9) +#define LINE_MONITORMEDIA __MSABI_LONG(10) +#define LINE_MONITORTONE __MSABI_LONG(11) +#define LINE_REPLY __MSABI_LONG(12) +#define LINE_REQUEST __MSABI_LONG(13) +#define PHONE_BUTTON __MSABI_LONG(14) +#define PHONE_CLOSE __MSABI_LONG(15) +#define PHONE_DEVSPECIFIC __MSABI_LONG(16) +#define PHONE_REPLY __MSABI_LONG(17) +#define PHONE_STATE __MSABI_LONG(18) +#define LINE_CREATE __MSABI_LONG(19) +#define PHONE_CREATE __MSABI_LONG(20) + +#define LINE_AGENTSPECIFIC __MSABI_LONG(21) +#define LINE_AGENTSTATUS __MSABI_LONG(22) +#define LINE_APPNEWCALL __MSABI_LONG(23) +#define LINE_PROXYREQUEST __MSABI_LONG(24) +#define LINE_REMOVE __MSABI_LONG(25) +#define PHONE_REMOVE __MSABI_LONG(26) /* these are used as Param1 of line_callstate messages */ #define LINECALLSTATE_IDLE 0x00000001 #define LINECALLSTATE_OFFERING 0x00000002

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (shlwapi.h).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 3e1ee5b8b76b68a60f604733d70ef35dc069e28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1ee5b8b76b68a60f604733d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 10 01:44:04 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (shlwapi.h). --- dlls/shlwapi/string.c | 4 ++-- include/shlwapi.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 9578565..45b8d21 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -867,7 +867,7 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) } if (dwFlags > STIF_SUPPORT_HEX) { - WARN("Unknown flags (%08lX)!\n", dwFlags & ~STIF_SUPPORT_HEX); + WARN("Unknown flags (%08X)!\n", dwFlags & ~STIF_SUPPORT_HEX); } /* Skip leading space, '+', '-' */ @@ -937,7 +937,7 @@ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet) } if (dwFlags > STIF_SUPPORT_HEX) { - WARN("Unknown flags (%08lX)!\n", dwFlags & ~STIF_SUPPORT_HEX); + WARN("Unknown flags (%08X)!\n", dwFlags & ~STIF_SUPPORT_HEX); } /* Skip leading space, '+', '-' */ diff --git a/include/shlwapi.h b/include/shlwapi.h index bec8b3a..2ebcdc9 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -747,8 +747,8 @@ HRESULT WINAPI ParseURLW(LPCWSTR pszUrl, PARSEDURLW *ppu); #ifndef NO_SHLWAPI_STRFCNS /* StrToIntEx flags */ -#define STIF_DEFAULT 0x0L -#define STIF_SUPPORT_HEX 0x1L +#define STIF_DEFAULT __MSABI_LONG(0x0) +#define STIF_SUPPORT_HEX __MSABI_LONG(0x1) BOOL WINAPI ChrCmpIA (WORD,WORD); BOOL WINAPI ChrCmpIW (WCHAR,WCHAR);

1 0

Frédéric Delanoy : dxdiag: Avoid dead increment ( clang).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: b9e828df0a6146c6b469c49a112a59fd3d56dd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e828df0a6146c6b469c49a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 10 02:35:06 2011 +0100 dxdiag: Avoid dead increment (clang). --- programs/dxdiag/output.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 8470f50..7fb9a4c 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -109,9 +109,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ ptr += sprintf(ptr, sprintf_fmt, field_name); ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); - memcpy(ptr, crlf, sizeof(crlf)); - ptr += sizeof(crlf); return WriteFile(hFile, output_buffer, total_len, NULL, NULL); }

1 0

Dmitry Timoshkov : gdi32: Remove a duplicated line of code.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 6acf226fa11efcf0832548aee377fdc4931e80b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6acf226fa11efcf0832548aee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 9 12:50:27 2011 +0800 gdi32: Remove a duplicated line of code. --- dlls/gdi32/tests/brush.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index c6c7678..4f44d03 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -287,10 +287,7 @@ static void test_palette_brush(void) DWORD expect = (pal->palPalEntry[255 - i].peRed << 16 | pal->palPalEntry[255 - i].peGreen << 8 | pal->palPalEntry[255 - i].peBlue); - if (expect) - ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); - else - ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); } DeleteDC( hdc ); DeleteObject( dib );

1 0

Vitaliy Margolen : dinput: Return correct key names for num_lock and pause.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 5bb094c9a21d078d4fec26ef45529e84f3f73e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb094c9a21d078d4fec26ef4… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Nov 8 10:59:20 2011 -0700 dinput: Return correct key names for num_lock and pause. Scan codes and DIK codes for num_lock and pause are reversed. --- dlls/dinput/keyboard.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c23a023..3ca7d97 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -410,12 +410,14 @@ SysKeyboardAImpl_GetObjectInfo( DWORD dwHow) { HRESULT res; + LONG scan; res = IDirectInputDevice2AImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (!GetKeyNameTextA((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | - (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, + scan = DIDFT_GETINSTANCE(pdidoi->dwType); + if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + if (!GetKeyNameTextA((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -429,14 +431,15 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwHow) { HRESULT res; + LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (!GetKeyNameTextW((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | - (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, - pdidoi->tszName, - sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) + scan = DIDFT_GETINSTANCE(pdidoi->dwType); + if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, + pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Alexandre Julliard : winex11: Don' t allow setting the cursor across processes while clipping.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 098b11e995860e6074a7a42de7464db683ca8d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098b11e995860e6074a7a42de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 14:26:34 2011 +0100 winex11: Don't allow setting the cursor across processes while clipping. --- dlls/winex11.drv/mouse.c | 13 ++++++++++--- dlls/winex11.drv/window.c | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 033f94c..83c714a 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -420,6 +420,7 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) } clip_rect = *clip; if (!data->clip_hwnd) sync_window_cursor( clip_window ); + InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); return TRUE; @@ -542,9 +543,16 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + HWND clip_hwnd = thread_data->clip_hwnd; - if (!thread_data->clip_hwnd) return; + if (!clip_hwnd) return; if (thread_data->clip_window != window) return; + if (InterlockedExchangePointer( (void **)&cursor_window, clip_hwnd ) != clip_hwnd || + GetTickCount() - last_cursor_change > 100) + { + sync_window_cursor( window ); + last_cursor_change = GetTickCount(); + } input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; __wine_send_input( hwnd, input ); @@ -1215,8 +1223,7 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) GetTickCount() - last_cursor_change > 100) { last_cursor_change = GetTickCount(); - if (clipping_cursor) set_window_cursor( init_clip_window(), handle ); - else if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6a87afc..ed4f570 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2699,6 +2699,8 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_SET_CURSOR: if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) set_window_cursor( data->whole_window, (HCURSOR)lp ); + else if (hwnd == x11drv_thread_data()->clip_hwnd) + set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); return 0; case WM_X11DRV_CLIP_CURSOR: return clip_cursor_notify( hwnd, (HWND)lp );

1 0

Alexandre Julliard : winex11: Use the motion event time to decide when to update the cursor.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: ef292465bebe13a0dcb52a65a940505f0149f728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef292465bebe13a0dcb52a65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 14:53:34 2011 +0100 winex11: Use the motion event time to decide when to update the cursor. --- dlls/winex11.drv/mouse.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 83c714a..112b4cf 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -548,10 +548,10 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (!clip_hwnd) return; if (thread_data->clip_window != window) return; if (InterlockedExchangePointer( (void **)&cursor_window, clip_hwnd ) != clip_hwnd || - GetTickCount() - last_cursor_change > 100) + input->u.mi.time - last_cursor_change > 100) { sync_window_cursor( window ); - last_cursor_change = GetTickCount(); + last_cursor_change = input->u.mi.time; } input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; @@ -578,10 +578,10 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU MapWindowPoints( hwnd, 0, &pt, 1 ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || - GetTickCount() - last_cursor_change > 100) + input->u.mi.time - last_cursor_change > 100) { sync_window_cursor( data->whole_window ); - last_cursor_change = GetTickCount(); + last_cursor_change = input->u.mi.time; } if (hwnd != GetDesktopWindow())

1 0

Alexandre Julliard : winex11: Still process all MotionNotify events when using XInput2.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 9716d1c8619e5fe68d1ad3ab9a18b106499b3fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9716d1c8619e5fe68d1ad3ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 15:45:13 2011 +0100 winex11: Still process all MotionNotify events when using XInput2. --- dlls/winex11.drv/event.c | 47 ++++++++++++++++++++++----------------------- dlls/winex11.drv/mouse.c | 2 - dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 00915cf..1b3478d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -310,37 +310,36 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) } break; case MotionNotify: - if (prev->xany.window == next->xany.window && next->type == MotionNotify) + switch (next->type) { - TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); - return MERGE_DISCARD; + case MotionNotify: + if (prev->xany.window == next->xany.window) + { + TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + } + break; +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + if (x11drv_thread_data()->warp_serial) break; + return MERGE_KEEP; } break; -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: + if (prev->xcookie.extension != xinput2_opcode) break; + if (prev->xcookie.evtype != XI_RawMotion) break; + switch (next->type) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; - if (thread_data->warp_serial) break; - switch (next->type) - { - case MotionNotify: - if (next->xany.window == thread_data->clip_window && - next->xmotion.time - thread_data->last_motion_notify < 1000) - { - TRACE( "ignoring MotionNotify for clip window\n" ); - return MERGE_IGNORE; - } - break; - case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); - } + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + if (x11drv_thread_data()->warp_serial) break; + return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); +#endif } break; -#endif } return MERGE_HANDLE; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 112b4cf..d4249f4 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1387,9 +1387,7 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (event->time - thread_data->last_motion_notify < 1000) return; if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return; - thread_data->last_motion_notify = event->time; } send_mouse_input( hwnd, event->window, event->state, &input ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4967866..dbc0629 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,7 +548,6 @@ struct x11drv_thread_data HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ - Time last_motion_notify; /* time of last mouse motion */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ unsigned long warp_serial; /* serial number of last pointer warp request */

1 0

Hans Leidekker : scrrun: New dll.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 8e74ee58d510eb1c770941a6b0fdca83147aa195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e74ee58d510eb1c770941a6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:03:53 2011 +0100 scrrun: New dll. --- configure | 1 + configure.ac | 1 + dlls/scrrun/Makefile.in | 5 +++++ dlls/scrrun/scrrun.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/scrrun.spec | 6 ++++++ 5 files changed, 56 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 46cbd5f..6762f90 100755 --- a/configure +++ b/configure @@ -15138,6 +15138,7 @@ wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test +wine_fn_config_dll scrrun enable_scrrun wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security diff --git a/configure.ac b/configure.ac index 76e8e95..36a7642 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) +WINE_CONFIG_DLL(scrrun) WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in new file mode 100644 index 0000000..46d8748 --- /dev/null +++ b/dlls/scrrun/Makefile.in @@ -0,0 +1,5 @@ +MODULE = scrrun.dll + +C_SRCS = scrrun.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c new file mode 100644 index 0000000..84a7bef --- /dev/null +++ b/dlls/scrrun/scrrun.c @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/scrrun/scrrun.spec b/dlls/scrrun/scrrun.spec new file mode 100644 index 0000000..5316d8f --- /dev/null +++ b/dlls/scrrun/scrrun.spec @@ -0,0 +1,6 @@ +@ stub DLLGetDocumentation +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub DoOpenPipeStream

1 0

Hans Leidekker : scrrun: Add a version resource.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: bdbd17c72af28da249806aa033e1f6e53d68c562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbd17c72af28da249806aa03… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:04:15 2011 +0100 scrrun: Add a version resource. --- dlls/scrrun/Makefile.in | 2 ++ dlls/scrrun/scrrun.rc | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index 46d8748..38f7652 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -2,4 +2,6 @@ MODULE = scrrun.dll C_SRCS = scrrun.c +RC_SRCS = scrrun.rc + @MAKE_DLL_RULES@ diff --git a/dlls/scrrun/scrrun.rc b/dlls/scrrun/scrrun.rc new file mode 100644 index 0000000..66dcaa8 --- /dev/null +++ b/dlls/scrrun/scrrun.rc @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +#define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll" +#define WINE_FILENAME_STR "scrrun.dll" +#define WINE_FILEVERSION 5,8,7600,16385 +#define WINE_FILEVERSION_STR "5.8.7600.16385" +#define WINE_PRODUCTVERSION 5,8,7600,16385 +#define WINE_PRODUCTVERSION_STR "5.8.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0