Commit a2f1a99a6413190918408acb3ff2ad6a9d98e593 - mozc

+1

-1

src/mozc_version_template.txt less more

0	0	MAJOR=2
1	1	MINOR=17
2		BUILD=2172
	2	BUILD=2173
3	3	REVISION=102
4	4	# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
5	5	# downloaded by NaCl Mozc.

+3

-0

src/win32/base/imm_registrar.h less more

38	38
39	39	namespace mozc {
40	40	namespace win32 {
	41
41	42	// ImmRegistrar is used to register and unregister the IME in the system.
42	43	// This class can only be used in administrators account.
43	44	class ImmRegistrar {

90	91	// IME.
91	92	// Returns S_OK if operation completes successfully.
92	93	static HRESULT MovePreloadValueToTop(const KeyboardLayoutID &klid);
	94
93	95	private:
94	96	ImmRegistrar() {}
95	97	virtual ~ImmRegistrar() {}
96	98	};
	99
97	100	} // namespace win32
98	101	} // namespace mozc
99	102

+3

-3

src/win32/base/immdev.h less more

26	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		#ifndef MOZC_WIN32_BASE_IME_IMMDEV_H_
30		#define MOZC_WIN32_BASE_IME_IMMDEV_H_
	29	#ifndef MOZC_WIN32_BASE_IMMDEV_H_
	30	#define MOZC_WIN32_BASE_IMMDEV_H_
31	31
32	32	#include <imm.h>
33	33

295	295	#ifdef __cplusplus
296	296	} // extern "C"
297	297	#endif
298		#endif // MOZC_WIN32_BASE_IME_IMMDEV_H_
	298	#endif // MOZC_WIN32_BASE_IMMDEV_H_

+3

-3

src/win32/base/keyboard.h less more

26	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		#ifndef MOZC_WIN32_IME_IME_KEYBOARD_
30		#define MOZC_WIN32_IME_IME_KEYBOARD_
	29	#ifndef MOZC_WIN32_BASE_KEYBOARD_H_
	30	#define MOZC_WIN32_BASE_KEYBOARD_H_
31	31
32	32	#include <windows.h>
33	33

162	162	};
163	163	} // namespace win32
164	164	} // namespace mozc
165		#endif // MOZC_WIN32_IME_IME_KEYBOARD_
	165	#endif // MOZC_WIN32_BASE_KEYBOARD_H_

+3

-1

src/win32/base/keyboard_layout_id.h less more

82	82	// Set \|id_\| 'cleared'.
83	83	void clear_id();
84	84
85		private:
	85	private:
86	86	DWORD id_;
87	87	bool has_id_;
88	88	};
	89
89	90	} // namespace win32
90	91	} // namespace mozc
	92
91	93	#endif // MOZC_WIN32_BASE_KEYBOARD_LAYOUT_ID_H_

+3

-3

src/win32/base/keyevent_handler.h less more

26	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		#ifndef MOZC_WIN32_BASE_KEYEVENT_HANDLER_
30		#define MOZC_WIN32_BASE_KEYEVENT_HANDLER_
	29	#ifndef MOZC_WIN32_BASE_KEYEVENT_HANDLER_H_
	30	#define MOZC_WIN32_BASE_KEYEVENT_HANDLER_H_
31	31
32	32	#include <windows.h>
33	33

145	145	};
146	146	} // namespace win32
147	147	} // namespace mozc
148		#endif // MOZC_WIN32_BASE_KEYEVENT_HANDLER_
	148	#endif // MOZC_WIN32_BASE_KEYEVENT_HANDLER_H_

+2

-1

src/win32/custom_action/custom_action.cc less more

235	235	klid, default_klid);
236	236	return SUCCEEDED(result) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
237	237	}
238		}
	238
	239	} // namespace
239	240
240	241	BOOL APIENTRY DllMain(HMODULE module,
241	242	DWORD ul_reason_for_call,

+1

-1

src/win32/custom_action/resource.h less more

36	36	#define IDS_FORMAT_FUNCTION_AND_LINE 106
37	37
38	38	// Next default values for new objects
39		//
	39	//
40	40	#ifdef APSTUDIO_INVOKED
41	41	#ifndef APSTUDIO_READONLY_SYMBOLS
42	42	#define _APS_NEXT_RESOURCE_VALUE 110

+3

-3

src/win32/ime/ime_core.h less more

26	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		#ifndef MOZC_WIN32_IME_IME_CORE_
30		#define MOZC_WIN32_IME_IME_CORE_
	29	#ifndef MOZC_WIN32_IME_IME_CORE_H_
	30	#define MOZC_WIN32_IME_IME_CORE_H_
31	31
32	32	#include <windows.h>
33	33

247	247
248	248	} // namespace win32
249	249	} // namespace mozc
250		#endif // MOZC_WIN32_IME_IME_CORE_
	250	#endif // MOZC_WIN32_IME_IME_CORE_H_

+1

-1

src/win32/ime/ime_scoped_context.h less more

117	117	DISALLOW_COPY_AND_ASSIGN(ScopedHIMCC);
118	118	};
119	119
	120	} // namespace win32
120	121	} // namespace mozc
121		} // namespace win32
122	122
123	123	#endif // MOZC_WIN32_IME_IME_SCOPED_CONTEXT_H_

+3

-0

src/win32/ime/ime_ui_context.h less more

49	49	} // namespace commands
50	50
51	51	namespace win32 {
	52
52	53	struct PrivateContext;
53	54	class IndicatorVisibilityTracker;
54	55	class ImeCore;

86	87	bool FillCharPosition(commands::RendererCommand_ApplicationInfo *info) const;
87	88	bool FillCaretInfo(commands::RendererCommand_ApplicationInfo *info) const;
88	89	bool FillFontInfo(commands::RendererCommand_ApplicationInfo *info) const;
	90
89	91	private:
90	92	const HIMC context_handle_;
91	93	const ScopedHIMC<INPUTCONTEXT> input_context_;
92	94	const ScopedHIMCC<PrivateContext> private_context_;
93	95	};
	96
94	97	} // namespace win32
95	98	} // namespace mozc
96	99

+0

-1

src/win32/installer/postbuilds_win.py less more

37	37	import optparse
38	38	import os
39	39	import re
40		import shutil
41	40	import subprocess
42	41	import sys
43	42

+3

-3

src/win32/tip/tip_dll_module.h less more

26	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		#ifndef MOZC_WIN32_TIP_TIP_MODULE_H_
30		#define MOZC_WIN32_TIP_TIP_MODULE_H_
	29	#ifndef MOZC_WIN32_TIP_TIP_DLL_MODULE_H_
	30	#define MOZC_WIN32_TIP_TIP_DLL_MODULE_H_
31	31
32	32	#include <Windows.h>
33	33

60	60	} // namespace win32
61	61	} // namespace mozc
62	62
63		#endif // MOZC_WIN32_TIP_TIP_MODULE_H_
	63	#endif // MOZC_WIN32_TIP_TIP_DLL_MODULE_H_

+5

-5

src/win32/tip/tip_edit_session.cc less more

167	167	return false;
168	168	}
169	169	return SUCCEEDED(edit_session_result);
170		};
	170	}
171	171
172	172	// This class is an implementation class for the ITfEditSession classes, which
173	173	// is an observer for exclusively updating the text store of a TSF thread

237	237	bool OnUpdateOnOffModeAsync(TipTextService *text_service,
238	238	ITfContext *context,
239	239	bool open) {
240		const auto action =text_service->GetThreadContext()->GetInputModeManager()->
	240	const auto action = text_service->GetThreadContext()->GetInputModeManager()->
241	241	OnChangeOpenClose(open);
242	242	if (action == TipInputModeManager::kUpdateUI) {
243	243	return OnLayoutChangedAsyncImpl(text_service, context);
244	244	}
245	245	return true;
246		};
	246	}
247	247
248	248	// This class is an implementation class for the ITfEditSession classes, which
249	249	// is an observer for exclusively updating the text store of a TSF thread

359	359	return false;
360	360	}
361	361	return SUCCEEDED(edit_session_result);
362		};
	362	}
363	363
364	364	// This class is an implementation class for the ITfEditSession classes, which
365	365	// is an observer for exclusively updating the text store of a TSF thread

437	437	return false;
438	438	}
439	439	return SUCCEEDED(edit_session_result);
440		};
	440	}
441	441
442	442	bool TurnOnImeAndTryToReconvertFromIme(TipTextService *text_service,
443	443	ITfContext *context) {

+3

-3

src/win32/tip/tip_enum_display_attributes.h less more

26	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		#ifndef MOZC_WIN32_GIMEJP10_IME_ENUM_DISPLAY_ATTRIBUTES_H_
30		#define MOZC_WIN32_GIMEJP10_IME_ENUM_DISPLAY_ATTRIBUTES_H_
	29	#ifndef MOZC_WIN32_TIP_TIP_ENUM_DISPLAY_ATTRIBUTES_H_
	30	#define MOZC_WIN32_TIP_TIP_ENUM_DISPLAY_ATTRIBUTES_H_
31	31
32	32	#include <windows.h>
33	33	#include <rpcsal.h>

72	72	} // namespace win32
73	73	} // namespace mozc
74	74
75		#endif // MOZC_WIN32_GIMEJP10_IME_ENUM_DISPLAY_ATTRIBUTES_H_
	75	#endif // MOZC_WIN32_TIP_TIP_ENUM_DISPLAY_ATTRIBUTES_H_

+1

-1

src/win32/tip/tip_lang_bar.cc less more

60	60	#ifdef GOOGLE_JAPANESE_INPUT_BUILD
61	61
62	62	// {D8C8D5EB-8213-47CE-95B7-BA3F67757F94}
63		const GUID kTipLangBarItem_Button= {
	63	const GUID kTipLangBarItem_Button = {
64	64	0xd8c8d5eb, 0x8213, 0x47ce, {0x95, 0xb7, 0xba, 0x3f, 0x67, 0x75, 0x7f, 0x94}
65	65	};
66	66

+1

-0

src/win32/tip/tip_ui_handler.h less more

64	64	static bool OnDllProcessAttach(HINSTANCE module_handle, bool static_loading);
65	65	static void OnDllProcessDetach(HINSTANCE module_handle,
66	66	bool process_shutdown);
	67
67	68	private:
68	69	DISALLOW_IMPLICIT_CONSTRUCTORS(TipUiHandler);
69	70	};

+2

-2

src/win32/tip/tip_ui_handler_conventional.cc less more

304	304	return false;
305	305	}
306	306
307		RendererCommand::Point *top_left=
	307	RendererCommand::Point *top_left =
308	308	app_info->mutable_composition_target()->mutable_top_left();
309	309	top_left->set_x(text_rect.left);
310	310	top_left->set_y(text_rect.top);

312	312	app_info->mutable_composition_target()->set_line_height(
313	313	text_rect.bottom - text_rect.top);
314	314
315		RendererCommand::Rectangle *area=
	315	RendererCommand::Rectangle *area =
316	316	app_info->mutable_composition_target()->mutable_document_area();
317	317	area->set_left(document_rect.left);
318	318	area->set_top(document_rect.top);