wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Frédéric Delanoy : msvcrt: Use BOOL type where appropriate.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: cb7546eaf799fab39a00f5973ff838c45cd7beff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7546eaf799fab39a00f5973… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 27 08:43:20 2013 +0200 msvcrt: Use BOOL type where appropriate. --- dlls/msvcrt/string.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 861389b..5678a89 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -987,7 +987,7 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong val; unsigned int digit; - int is_negative; + BOOL is_negative; char buffer[33], *pos; size_t len; @@ -1001,12 +1001,12 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; } @@ -1062,7 +1062,7 @@ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, in { MSVCRT_ulong val; unsigned int digit; - int is_negative; + BOOL is_negative; MSVCRT_wchar_t buffer[33], *pos; size_t len; @@ -1076,12 +1076,12 @@ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, in if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; } @@ -1338,7 +1338,7 @@ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix) { unsigned __int64 val; unsigned int digit; - int is_negative; + BOOL is_negative; char buffer[65], *pos; size_t len; @@ -1352,12 +1352,12 @@ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix) if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; } @@ -1413,7 +1413,7 @@ int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int { unsigned __int64 val; unsigned int digit; - int is_negative; + BOOL is_negative; MSVCRT_wchar_t buffer[65], *pos; size_t len; @@ -1427,12 +1427,12 @@ int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; }

1 0

Jactry Zeng : riched20/tests: Add UTF8 BOM tests for EM_SETTEXTEX.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 5520dcab8a3d4189be9885ce46b9fc3566cdfc8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5520dcab8a3d4189be9885ce4… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Sep 27 13:01:39 2013 +0800 riched20/tests: Add UTF8 BOM tests for EM_SETTEXTEX. --- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fed9b95..15e1132 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3913,6 +3913,23 @@ static void test_EM_SETTEXTEX(void) SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); ok(!strcmp(bufACP, "morerichtext"), "expected 'morerichtext' but got '%s'\n", bufACP); + /* test for utf8 text with BOM */ + setText.flags = 0; + setText.codepage = CP_ACP; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + result = strcmp(bufACP, "TestUTF8WithBOM"); + todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + + setText.flags = 0; + setText.codepage = CP_UTF8; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + result = strcmp(bufACP, "TestUTF8WithBOM"); + todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + DestroyWindow(hwndRichEdit); }

1 0

Nikolay Sivov : ntdll/tests: Add proper skips in tests.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 437c84655a1f132ef56c094ac999c36f21e665c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437c84655a1f132ef56c094ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 25 10:36:33 2013 +0400 ntdll/tests: Add proper skips in tests. --- dlls/ntdll/tests/path.c | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 90db536..442dd82 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -30,7 +30,7 @@ static BOOLEAN (WINAPI *pRtlIsNameLegalDOS8Dot3)(const UNICODE_STRING*,POEM_STRI static DWORD (WINAPI *pRtlGetFullPathName_U)(const WCHAR*,ULONG,WCHAR*,WCHAR**); -static void test_RtlDetermineDosPathNameType(void) +static void test_RtlDetermineDosPathNameType_U(void) { struct test { @@ -75,6 +75,12 @@ static void test_RtlDetermineDosPathNameType(void) WCHAR buffer[MAX_PATH]; UINT ret; + if (!pRtlDetermineDosPathNameType_U) + { + win_skip("RtlDetermineDosPathNameType_U is not available\n"); + return; + } + for (test = tests; test->path; test++) { pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, test->path, strlen(test->path)+1 ); @@ -84,7 +90,7 @@ static void test_RtlDetermineDosPathNameType(void) } -static void test_RtlIsDosDeviceName(void) +static void test_RtlIsDosDeviceName_U(void) { struct test { @@ -142,6 +148,12 @@ static void test_RtlIsDosDeviceName(void) WCHAR buffer[2000]; ULONG ret; + if (!pRtlIsDosDeviceName_U) + { + win_skip("RtlIsDosDeviceName_U is not available\n"); + return; + } + for (test = tests; test->path; test++) { pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, test->path, strlen(test->path)+1 ); @@ -195,6 +207,12 @@ static void test_RtlIsNameLegalDOS8Dot3(void) char buff2[12]; BOOLEAN ret, spaces; + if (!pRtlIsNameLegalDOS8Dot3) + { + win_skip("RtlIsNameLegalDOS8Dot3 is not available\n"); + return; + } + ustr.MaximumLength = sizeof(buffer); ustr.Buffer = buffer; for (test = tests; test->path; test++) @@ -272,6 +290,12 @@ static void test_RtlGetFullPathName_U(void) DWORD reslen; UINT len; + if (!pRtlGetFullPathName_U) + { + win_skip("RtlGetFullPathName_U is not available\n"); + return; + } + file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part); @@ -334,12 +358,9 @@ START_TEST(path) pRtlOemStringToUnicodeString = (void *)GetProcAddress(mod,"RtlOemStringToUnicodeString"); pRtlIsNameLegalDOS8Dot3 = (void *)GetProcAddress(mod,"RtlIsNameLegalDOS8Dot3"); pRtlGetFullPathName_U = (void *)GetProcAddress(mod,"RtlGetFullPathName_U"); - if (pRtlDetermineDosPathNameType_U) - test_RtlDetermineDosPathNameType(); - if (pRtlIsDosDeviceName_U) - test_RtlIsDosDeviceName(); - if (pRtlIsNameLegalDOS8Dot3) - test_RtlIsNameLegalDOS8Dot3(); - if (pRtlGetFullPathName_U && pRtlMultiByteToUnicodeN) - test_RtlGetFullPathName_U(); + + test_RtlDetermineDosPathNameType_U(); + test_RtlIsDosDeviceName_U(); + test_RtlIsNameLegalDOS8Dot3(); + test_RtlGetFullPathName_U(); }

1 0

Ken Thomases : winemac: Activate an app if it sets focus on a window shortly after a hot key is pressed .
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 12e0b0577c8809711f0302bcd931856097adcb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e0b0577c8809711f0302bcd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 25 17:10:50 2013 -0500 winemac: Activate an app if it sets focus on a window shortly after a hot key is pressed. The Mac driver doesn't normally steal focus, but a press of a hot key counts as the user giving permission. --- dlls/winemac.drv/keyboard.c | 2 ++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 13 +++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 2c883cc..d4a3090 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -940,6 +940,8 @@ void macdrv_hotkey_press(const macdrv_event *event) 0x15B, 0x15C, event->hotkey_press.time_ms, FALSE); } + activate_on_following_focus(); + flags = (scan & 0x100) ? KEYEVENTF_EXTENDEDKEY : 0; macdrv_send_keyboard_input(NULL, event->hotkey_press.vkey, scan & 0xff, flags, event->key.time_ms); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 9925a51..bcd38ed 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -145,6 +145,7 @@ extern struct macdrv_win_data *get_win_data(HWND hwnd) DECLSPEC_HIDDEN; extern void release_win_data(struct macdrv_win_data *data) DECLSPEC_HIDDEN; extern macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen) DECLSPEC_HIDDEN; extern RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) DECLSPEC_HIDDEN; +extern void activate_on_following_focus(void) DECLSPEC_HIDDEN; extern struct window_surface *create_surface(macdrv_window window, const RECT *rect, struct window_surface *old_surface, BOOL use_alpha) DECLSPEC_HIDDEN; extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 7b01fe3..9ab5abe 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -911,6 +911,16 @@ static void move_window_bits(HWND hwnd, macdrv_window window, const RECT *old_re /********************************************************************** + * activate_on_following_focus + */ +void activate_on_following_focus(void) +{ + activate_on_focus_time = GetTickCount(); + if (!activate_on_focus_time) activate_on_focus_time = 1; +} + + +/********************************************************************** * CreateDesktopWindow (MACDRV.@) */ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) @@ -1384,8 +1394,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); return 0; case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: - activate_on_focus_time = GetTickCount(); - if (!activate_on_focus_time) activate_on_focus_time = 1; + activate_on_following_focus(); TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time); return 0; }

1 0

Ken Thomases : winemac: Implement support for global hot keys.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 6bae7cf7965bec9a5e53d561719935884f9acf23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bae7cf7965bec9a5e53d5617… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 25 17:10:37 2013 -0500 winemac: Implement support for global hot keys. Partially based on a patch for winex11 previously submitted by Vincent Povirk. --- dlls/winemac.drv/cocoa_event.h | 3 + dlls/winemac.drv/cocoa_event.m | 167 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 7 ++ dlls/winemac.drv/keyboard.c | 171 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 16 ++++ dlls/winemac.drv/winemac.drv.spec | 2 + 7 files changed, 367 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bae7cf7965bec9a5e53d…

1 0

Ken Thomases : winemac: Re-sync the window region whenever factors affecting its conversion to Cocoa coordinates change .
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 5a859655d737856bbae57b79035f49e4ba09dcfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a859655d737856bbae57b790… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 26 23:46:36 2013 -0500 winemac: Re-sync the window region whenever factors affecting its conversion to Cocoa coordinates change. --- dlls/winemac.drv/window.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4cb8082..7b01fe3 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -836,7 +836,8 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) * * Synchronize the Mac window position with the Windows one */ -static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, const RECT *old_window_rect) +static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect) { CGRect frame; @@ -848,7 +849,10 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c frame.size.width = frame.size.height = 1; data->on_screen = macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); - if (old_window_rect && IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect)) + if (old_window_rect && old_whole_rect && + (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || + old_window_rect->left - old_whole_rect->left != data->window_rect.left - data->whole_rect.left || + old_window_rect->top - old_whole_rect->top != data->window_rect.top - data->whole_rect.top)) sync_window_region(data, (HRGN)1); TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window, @@ -1120,6 +1124,9 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) sync_window_opacity(data, 0, 0, FALSE, 0); if (data->surface) set_surface_use_alpha(data->surface, FALSE); } + + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYOUTRTL)) + sync_window_region(data, (HRGN)1); } release_win_data(data); @@ -1371,7 +1378,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) if ((data = get_win_data(hwnd))) { if (data->cocoa_window && data->on_screen) - sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL); + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL, NULL); release_win_data(data); } SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); @@ -1557,7 +1564,7 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, thread_data->current_event->type != WINDOW_DID_MINIMIZE && thread_data->current_event->type != WINDOW_DID_UNMINIMIZE)) { - sync_window_position(data, swp_flags, &old_window_rect); + sync_window_position(data, swp_flags, &old_window_rect, &old_whole_rect); set_cocoa_window_properties(data); }

1 0

Ken Thomases : winemac: Fix hiding windows that are minimized using -close instead of -orderOut:.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: d7f4d67514b3febac084d48d22fef67fd328fdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f4d67514b3febac084d48d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 26 23:46:31 2013 -0500 winemac: Fix hiding windows that are minimized using -close instead of -orderOut:. Cocoa won't order a minimized window out of the screen list using -orderOut:. This leaves a window that should be hidden still visible in the Dock, where it can be unminimized. --- dlls/winemac.drv/cocoa_app.m | 2 ++ dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index afe0608..e6e5c2e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1809,6 +1809,8 @@ int macdrv_err_on; queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note){ NSWindow* window = [note object]; + if ([window isKindOfClass:[WineWindow class]] && [(WineWindow*)window isFakingClose]) + return; [keyWindows removeObjectIdenticalTo:window]; if (window == lastTargetWindow) lastTargetWindow = nil; diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 8893f85..8f60275 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -60,6 +60,7 @@ BOOL ignore_windowMiniaturize; BOOL ignore_windowDeminiaturize; + BOOL fakingClose; } @property (retain, readonly, nonatomic) WineEventQueue* queue; @@ -67,6 +68,7 @@ @property (readonly, nonatomic) BOOL noActivate; @property (readonly, nonatomic) BOOL floating; @property (readonly, getter=isFullscreen, nonatomic) BOOL fullscreen; +@property (readonly, getter=isFakingClose, nonatomic) BOOL fakingClose; - (NSInteger) minimumLevelForActive:(BOOL)active; - (void) updateFullscreen; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 43be5d5..74bbdc7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -139,6 +139,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @property (readwrite, nonatomic) BOOL disabled; @property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; +@property (readwrite, getter=isFakingClose, nonatomic) BOOL fakingClose; @property (retain, nonatomic) NSWindow* latentParentWindow; @property (nonatomic) void* hwnd; @@ -466,7 +467,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) static WineWindow* causing_becomeKeyWindow; - @synthesize disabled, noActivate, floating, fullscreen, latentParentWindow, hwnd, queue; + @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; @synthesize shape, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @@ -497,6 +498,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [window setHidesOnDeactivate:NO]; [window setReleasedWhenClosed:NO]; + [window setOneShot:YES]; [window disableCursorRects]; [window setShowsResizeIndicator:NO]; [window setHasShadow:wf->shadow]; @@ -1039,7 +1041,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) pendingMinimize = TRUE; [self becameIneligibleParentOrChild]; - [self orderOut:nil]; + if ([self isMiniaturized]) + { + fakingClose = TRUE; + [self close]; + fakingClose = FALSE; + } + else + [self orderOut:nil]; if (wasVisible && wasOnActiveSpace && fullscreen) [controller updateFullscreenWindows]; [controller adjustWindowLevels]; @@ -1548,6 +1557,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { WineWindow* child; + if (fakingClose) return; if (latentParentWindow) { [latentParentWindow->latentChildWindows removeObjectIdenticalTo:self];

1 0

Michael Stefaniuc : include: Forbid the use of CONST in Wine.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: f78ffb374d53a92c86772cc3a238db738ac4328b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78ffb374d53a92c86772cc3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 09:59:20 2013 +0200 include: Forbid the use of CONST in Wine. --- include/windef.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/windef.h b/include/windef.h index 17c0fba..9322c41 100644 --- a/include/windef.h +++ b/include/windef.h @@ -167,7 +167,7 @@ extern "C" { #define _CDECL __cdecl #define WINAPIV __cdecl #define APIENTRY WINAPI -#define CONST const +#define CONST __ONLY_IN_WINELIB(const) /* Misc. constants. */

1 0

Michael Stefaniuc : include: Replace the remaining CONSTs.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 23b86eb44eb9ba9bae2026c01430187be9fffa56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b86eb44eb9ba9bae2026c01… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 00:30:19 2013 +0200 include: Replace the remaining CONSTs. --- include/dde.h | 2 +- include/ddk/imm.h | 4 ++-- include/ddk/wdm.h | 4 ++-- include/setupapi.h | 8 ++++---- include/sspi.h | 4 ++-- include/winbase.h | 2 +- include/wincon.h | 6 +++--- include/wincrypt.h | 14 +++++++------- include/wine/gdi_driver.h | 2 +- include/wine/winbase16.h | 2 +- include/wingdi.h | 6 +++--- include/winhttp.h | 2 +- include/wininet.h | 4 ++-- include/winreg.h | 4 ++-- include/winternl.h | 2 +- include/winuser.h | 16 ++++++++-------- 16 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23b86eb44eb9ba9bae202…

1 0

Michael Stefaniuc : include: Avoid using CONST in the d3dx9 headers.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 81de7e15117738ee4b59adda113c3397706b4a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81de7e15117738ee4b59adda1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 00:28:43 2013 +0200 include: Avoid using CONST in the d3dx9 headers. --- include/d3dx9anim.h | 7 ++-- include/d3dx9core.h | 12 +++--- include/d3dx9effect.h | 88 ++++++++++++++++++++++++------------------------ include/d3dx9mesh.h | 62 ++++++++++++++++++++-------------- 4 files changed, 91 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81de7e15117738ee4b59a…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013