Differences From Artifact [8cbb9c5888a9f01f]:
- File
src/win32/richedit.d
- 2015-04-21 10:46:55 - part of checkin [4e2933c620] on branch trunk - Rebased to the latest verson dmd 2.067. Not yet verified the outcome. (user: kinaba) [annotate]
To Artifact [be981eb75dda2569]:
- File
src/win32/richedit.d
-
2015-05-05 06:49:05
- part of checkin
[9b639cf2d6]
on branch trunk
- Working version for update to 2.067.
The problem was __gshared. Replacing it with TLS fixed the issue. Remaining problem is that "hack.d"'s CloseHandle hack is not working anymore.
(user: kinaba) [annotate]
-
2015-05-05 06:49:05
- part of checkin
[9b639cf2d6]
on branch trunk
- Working version for update to 2.067.
281 281
282 282 const SCF_DEFAULT = 0;
283 283 const SCF_SELECTION = 1;
284 284 const SCF_WORD = 2;
285 285 const SCF_ALL = 4;
286 286 const SCF_USEUIRULES = 8;
287 287
288 +alias DWORD TEXTMODE;
288 289 const TM_PLAINTEXT=1;
289 290 const TM_RICHTEXT=2;
290 291 const TM_SINGLELEVELUNDO=4;
291 292 const TM_MULTILEVELUNDO=8;
292 293 const TM_SINGLECODEPAGE=16;
293 294 const TM_MULTICODEPAGE=32;
294 295
295 296 const GT_DEFAULT=0;
296 297 const GT_USECRLF=1;
297 298
298 299 const yHeightCharPtsMost=1638;
299 300 const lDefaultTab=720;
300 301
302 +alias DWORD UNDONAMEID;
303 +const UID_UNKNOWN = 0;
304 +const UID_TYPING = 1;
305 +const UID_DELETE = 2;
306 +const UID_DRAGDROP = 3;
307 +const UID_CUT = 4;
308 +const UID_PASTE = 5;
309 +
301 310 struct CHARFORMATA {
302 311 UINT cbSize = this.sizeof;
303 312 DWORD dwMask;
304 313 DWORD dwEffects;
305 314 LONG yHeight;
306 315 LONG yOffset;
307 316 COLORREF crTextColor;
308 317 BYTE bCharSet;
309 318 BYTE bPitchAndFamily;
310 - char szFaceName[LF_FACESIZE];
319 + char[LF_FACESIZE] szFaceName;
311 320 }
312 321 struct CHARFORMATW {
313 322 UINT cbSize = this.sizeof;
314 323 DWORD dwMask;
315 324 DWORD dwEffects;
316 325 LONG yHeight;
317 326 LONG yOffset;
318 327 COLORREF crTextColor;
319 328 BYTE bCharSet;
320 329 BYTE bPitchAndFamily;
321 - WCHAR szFaceName[LF_FACESIZE];
330 + WCHAR[LF_FACESIZE] szFaceName;
322 331 }
323 332
324 333 struct CHARFORMAT2A {
325 334 UINT cbSize = this.sizeof;
326 335 DWORD dwMask;
327 336 DWORD dwEffects;
328 337 LONG yHeight;
329 338 LONG yOffset;
330 339 COLORREF crTextColor;
331 340 BYTE bCharSet;
332 341 BYTE bPitchAndFamily;
333 - char szFaceName[LF_FACESIZE];
342 + char[LF_FACESIZE] szFaceName;
334 343 WORD wWeight;
335 344 SHORT sSpacing;
336 345 COLORREF crBackColor;
337 346 LCID lcid;
338 347 DWORD dwReserved;
339 348 SHORT sStyle;
340 349 WORD wKerning;
................................................................................
348 357 DWORD dwMask;
349 358 DWORD dwEffects;
350 359 LONG yHeight;
351 360 LONG yOffset;
352 361 COLORREF crTextColor;
353 362 BYTE bCharSet;
354 363 BYTE bPitchAndFamily;
355 - WCHAR szFaceName[LF_FACESIZE];
364 + WCHAR[LF_FACESIZE] szFaceName;
356 365 WORD wWeight;
357 366 SHORT sSpacing;
358 367 COLORREF crBackColor;
359 368 LCID lcid;
360 369 DWORD dwReserved;
361 370 SHORT sStyle;
362 371 WORD wKerning;
................................................................................
472 481 WORD wNumbering;
473 482 WORD wReserved;
474 483 LONG dxStartIndent;
475 484 LONG dxRightIndent;
476 485 LONG dxOffset;
477 486 WORD wAlignment;
478 487 SHORT cTabCount;
479 - LONG rgxTabs[MAX_TAB_STOPS];
488 + LONG[MAX_TAB_STOPS] rgxTabs;
480 489 }
481 490
482 491 struct PARAFORMAT2 {
483 492 UINT cbSize = this.sizeof;
484 493 DWORD dwMask;
485 494 WORD wNumbering;
486 495 WORD wEffects;
487 496 LONG dxStartIndent;
488 497 LONG dxRightIndent;
489 498 LONG dxOffset;
490 499 WORD wAlignment;
491 500 SHORT cTabCount;
492 - LONG rgxTabs[MAX_TAB_STOPS];
501 + LONG[MAX_TAB_STOPS] rgxTabs;
493 502 LONG dySpaceBefore;
494 503 LONG dySpaceAfter;
495 504 LONG dyLineSpacing;
496 505 SHORT sStype;
497 506 BYTE bLineSpacingRule;
498 507 BYTE bOutlineLevel;
499 508 WORD wShadingWeight;
................................................................................
538 547 }
539 548
540 549 struct GETTEXTEX {
541 550 DWORD cb;
542 551 DWORD flags;
543 552 UINT codepage;
544 553 LPCSTR lpDefaultChar;
545 - LPBOOL lpUsedDefaultChar;
554 + LPBOOL lpUsedDefChar;
546 555 }
547 556
548 557 extern (Windows) {
549 558 alias LONG function(char*,LONG,BYTE,INT) EDITWORDBREAKPROCEX;
550 559 }
551 560
552 561 /* Defines for EM_SETTYPOGRAPHYOPTIONS */