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 const SCF_DEFAULT = 0; 282 const SCF_DEFAULT = 0;
283 const SCF_SELECTION = 1; 283 const SCF_SELECTION = 1;
284 const SCF_WORD = 2; 284 const SCF_WORD = 2;
285 const SCF_ALL = 4; 285 const SCF_ALL = 4;
286 const SCF_USEUIRULES = 8; 286 const SCF_USEUIRULES = 8;
287 287
> 288 alias DWORD TEXTMODE;
288 const TM_PLAINTEXT=1; 289 const TM_PLAINTEXT=1;
289 const TM_RICHTEXT=2; 290 const TM_RICHTEXT=2;
290 const TM_SINGLELEVELUNDO=4; 291 const TM_SINGLELEVELUNDO=4;
291 const TM_MULTILEVELUNDO=8; 292 const TM_MULTILEVELUNDO=8;
292 const TM_SINGLECODEPAGE=16; 293 const TM_SINGLECODEPAGE=16;
293 const TM_MULTICODEPAGE=32; 294 const TM_MULTICODEPAGE=32;
294 295
295 const GT_DEFAULT=0; 296 const GT_DEFAULT=0;
296 const GT_USECRLF=1; 297 const GT_USECRLF=1;
297 298
298 const yHeightCharPtsMost=1638; 299 const yHeightCharPtsMost=1638;
299 const lDefaultTab=720; 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 struct CHARFORMATA { 310 struct CHARFORMATA {
302 UINT cbSize = this.sizeof; 311 UINT cbSize = this.sizeof;
303 DWORD dwMask; 312 DWORD dwMask;
304 DWORD dwEffects; 313 DWORD dwEffects;
305 LONG yHeight; 314 LONG yHeight;
306 LONG yOffset; 315 LONG yOffset;
307 COLORREF crTextColor; 316 COLORREF crTextColor;
308 BYTE bCharSet; 317 BYTE bCharSet;
309 BYTE bPitchAndFamily; 318 BYTE bPitchAndFamily;
310 char szFaceName[LF_FACESIZE]; | 319 char[LF_FACESIZE] szFaceName;
311 } 320 }
312 struct CHARFORMATW { 321 struct CHARFORMATW {
313 UINT cbSize = this.sizeof; 322 UINT cbSize = this.sizeof;
314 DWORD dwMask; 323 DWORD dwMask;
315 DWORD dwEffects; 324 DWORD dwEffects;
316 LONG yHeight; 325 LONG yHeight;
317 LONG yOffset; 326 LONG yOffset;
318 COLORREF crTextColor; 327 COLORREF crTextColor;
319 BYTE bCharSet; 328 BYTE bCharSet;
320 BYTE bPitchAndFamily; 329 BYTE bPitchAndFamily;
321 WCHAR szFaceName[LF_FACESIZE]; | 330 WCHAR[LF_FACESIZE] szFaceName;
322 } 331 }
323 332
324 struct CHARFORMAT2A { 333 struct CHARFORMAT2A {
325 UINT cbSize = this.sizeof; 334 UINT cbSize = this.sizeof;
326 DWORD dwMask; 335 DWORD dwMask;
327 DWORD dwEffects; 336 DWORD dwEffects;
328 LONG yHeight; 337 LONG yHeight;
329 LONG yOffset; 338 LONG yOffset;
330 COLORREF crTextColor; 339 COLORREF crTextColor;
331 BYTE bCharSet; 340 BYTE bCharSet;
332 BYTE bPitchAndFamily; 341 BYTE bPitchAndFamily;
333 char szFaceName[LF_FACESIZE]; | 342 char[LF_FACESIZE] szFaceName;
334 WORD wWeight; 343 WORD wWeight;
335 SHORT sSpacing; 344 SHORT sSpacing;
336 COLORREF crBackColor; 345 COLORREF crBackColor;
337 LCID lcid; 346 LCID lcid;
338 DWORD dwReserved; 347 DWORD dwReserved;
339 SHORT sStyle; 348 SHORT sStyle;
340 WORD wKerning; 349 WORD wKerning;
................................................................................................................................................................................
348 DWORD dwMask; 357 DWORD dwMask;
349 DWORD dwEffects; 358 DWORD dwEffects;
350 LONG yHeight; 359 LONG yHeight;
351 LONG yOffset; 360 LONG yOffset;
352 COLORREF crTextColor; 361 COLORREF crTextColor;
353 BYTE bCharSet; 362 BYTE bCharSet;
354 BYTE bPitchAndFamily; 363 BYTE bPitchAndFamily;
355 WCHAR szFaceName[LF_FACESIZE]; | 364 WCHAR[LF_FACESIZE] szFaceName;
356 WORD wWeight; 365 WORD wWeight;
357 SHORT sSpacing; 366 SHORT sSpacing;
358 COLORREF crBackColor; 367 COLORREF crBackColor;
359 LCID lcid; 368 LCID lcid;
360 DWORD dwReserved; 369 DWORD dwReserved;
361 SHORT sStyle; 370 SHORT sStyle;
362 WORD wKerning; 371 WORD wKerning;
................................................................................................................................................................................
472 WORD wNumbering; 481 WORD wNumbering;
473 WORD wReserved; 482 WORD wReserved;
474 LONG dxStartIndent; 483 LONG dxStartIndent;
475 LONG dxRightIndent; 484 LONG dxRightIndent;
476 LONG dxOffset; 485 LONG dxOffset;
477 WORD wAlignment; 486 WORD wAlignment;
478 SHORT cTabCount; 487 SHORT cTabCount;
479 LONG rgxTabs[MAX_TAB_STOPS]; | 488 LONG[MAX_TAB_STOPS] rgxTabs;
480 } 489 }
481 490
482 struct PARAFORMAT2 { 491 struct PARAFORMAT2 {
483 UINT cbSize = this.sizeof; 492 UINT cbSize = this.sizeof;
484 DWORD dwMask; 493 DWORD dwMask;
485 WORD wNumbering; 494 WORD wNumbering;
486 WORD wEffects; 495 WORD wEffects;
487 LONG dxStartIndent; 496 LONG dxStartIndent;
488 LONG dxRightIndent; 497 LONG dxRightIndent;
489 LONG dxOffset; 498 LONG dxOffset;
490 WORD wAlignment; 499 WORD wAlignment;
491 SHORT cTabCount; 500 SHORT cTabCount;
492 LONG rgxTabs[MAX_TAB_STOPS]; | 501 LONG[MAX_TAB_STOPS] rgxTabs;
493 LONG dySpaceBefore; 502 LONG dySpaceBefore;
494 LONG dySpaceAfter; 503 LONG dySpaceAfter;
495 LONG dyLineSpacing; 504 LONG dyLineSpacing;
496 SHORT sStype; 505 SHORT sStype;
497 BYTE bLineSpacingRule; 506 BYTE bLineSpacingRule;
498 BYTE bOutlineLevel; 507 BYTE bOutlineLevel;
499 WORD wShadingWeight; 508 WORD wShadingWeight;
................................................................................................................................................................................
538 } 547 }
539 548
540 struct GETTEXTEX { 549 struct GETTEXTEX {
541 DWORD cb; 550 DWORD cb;
542 DWORD flags; 551 DWORD flags;
543 UINT codepage; 552 UINT codepage;
544 LPCSTR lpDefaultChar; 553 LPCSTR lpDefaultChar;
545 LPBOOL lpUsedDefaultChar; | 554 LPBOOL lpUsedDefChar;
546 } 555 }
547 556
548 extern (Windows) { 557 extern (Windows) {
549 alias LONG function(char*,LONG,BYTE,INT) EDITWORDBREAKPROCEX; 558 alias LONG function(char*,LONG,BYTE,INT) EDITWORDBREAKPROCEX;
550 } 559 }
551 560
552 /* Defines for EM_SETTYPOGRAPHYOPTIONS */ 561 /* Defines for EM_SETTYPOGRAPHYOPTIONS */