April 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : riched32: Renamed the dlls/richedit directory to dlls/ riched32.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: b4f553f5be72c15980a127103e602ced3f2dca19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4f553f5be72c15980a1271… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 17:09:08 2006 +0200 riched32: Renamed the dlls/richedit directory to dlls/riched32. --- configure | 4 +- configure.ac | 2 - dlls/Makefile.in | 7 --- dlls/riched32/.gitignore | 1 dlls/riched32/Makefile.in | 13 +++++ dlls/riched32/riched32.spec | 1 dlls/riched32/richedit.c | 106 +++++++++++++++++++++++++++++++++++++++++++ dlls/richedit/.gitignore | 1 dlls/richedit/Makefile.in | 13 ----- dlls/richedit/riched32.spec | 1 dlls/richedit/richedit.c | 106 ------------------------------------------- 11 files changed, 125 insertions(+), 130 deletions(-) create mode 100644 dlls/riched32/.gitignore create mode 100644 dlls/riched32/Makefile.in create mode 100644 dlls/riched32/riched32.spec create mode 100644 dlls/riched32/richedit.c delete mode 100644 dlls/richedit/.gitignore delete mode 100644 dlls/richedit/Makefile.in delete mode 100644 dlls/richedit/riched32.spec delete mode 100644 dlls/richedit/richedit.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b4f553f5be72c15980a…

1 0

Alexandre Julliard : comdlg32: Renamed the dlls/commdlg directory to dlls/ comdlg32.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: ca1e72a4028a28c66f4f71a9c7893b72e651977b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca1e72a4028a28c66f4f71a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 17:00:03 2006 +0200 comdlg32: Renamed the dlls/commdlg directory to dlls/comdlg32. --- configure | 4 configure.ac | 2 dlls/.gitignore | 1 dlls/Makefile.in | 17 dlls/comdlg32/.gitignore | 15 dlls/comdlg32/Makefile.in | 49 + dlls/comdlg32/cdlg.h | 233 ++ dlls/comdlg32/cdlg16.h | 163 ++ dlls/comdlg32/cdlg32.c | 182 ++ dlls/comdlg32/cdlg_Bg.rc | 475 +++++ dlls/comdlg32/cdlg_Ca.rc | 218 ++ dlls/comdlg32/cdlg_Cn.rc | 446 +++++ dlls/comdlg32/cdlg_Cs.rc | 474 +++++ dlls/comdlg32/cdlg_Da.rc | 219 ++ dlls/comdlg32/cdlg_De.rc | 468 +++++ dlls/comdlg32/cdlg_En.rc | 566 ++++++ dlls/comdlg32/cdlg_Eo.rc | 471 +++++ dlls/comdlg32/cdlg_Es.rc | 475 +++++ dlls/comdlg32/cdlg_Fi.rc | 469 +++++ dlls/comdlg32/cdlg_Fr.rc | 478 +++++ dlls/comdlg32/cdlg_Hu.rc | 215 ++ dlls/comdlg32/cdlg_It.rc | 474 +++++ dlls/comdlg32/cdlg_Ja.rc | 341 +++ dlls/comdlg32/cdlg_Ko.rc | 476 +++++ dlls/comdlg32/cdlg_Nl.rc | 325 +++ dlls/comdlg32/cdlg_No.rc | 470 +++++ dlls/comdlg32/cdlg_Pl.rc | 470 +++++ dlls/comdlg32/cdlg_Pt.rc | 473 +++++ dlls/comdlg32/cdlg_Ru.rc | 443 +++++ dlls/comdlg32/cdlg_Si.rc | 441 +++++ dlls/comdlg32/cdlg_Sk.rc | 414 ++++ dlls/comdlg32/cdlg_Sv.rc | 434 ++++ dlls/comdlg32/cdlg_Th.rc | 458 +++++ dlls/comdlg32/cdlg_Tr.rc | 473 +++++ dlls/comdlg32/cdlg_Uk.rc | 432 ++++ dlls/comdlg32/cdlg_Wa.rc | 225 ++ dlls/comdlg32/cdlg_Zh.rc | 232 ++ dlls/comdlg32/cdlg_xx.rc | 649 +++++++ dlls/comdlg32/colordlg.c | 1358 ++++++++++++++ dlls/comdlg32/colordlg16.c | 476 +++++ dlls/comdlg32/comdlg32.spec | 25 dlls/comdlg32/commdlg.spec | 26 dlls/comdlg32/filedlg.c | 3905 ++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/filedlg16.c | 515 +++++ dlls/comdlg32/filedlg31.c | 932 ++++++++++ dlls/comdlg32/filedlg31.h | 68 + dlls/comdlg32/filedlgbrowser.c | 1028 +++++++++++ dlls/comdlg32/filedlgbrowser.h | 160 ++ dlls/comdlg32/filetitle.c | 126 + dlls/comdlg32/finddlg.c | 496 +++++ dlls/comdlg32/finddlg32.c | 561 ++++++ dlls/comdlg32/fontdlg.c | 1230 +++++++++++++ dlls/comdlg32/fontdlg16.c | 379 ++++ dlls/comdlg32/printdlg.c | 3545 ++++++++++++++++++++++++++++++++++++ dlls/comdlg32/printdlg.h | 102 + dlls/comdlg32/printdlg16.c | 602 ++++++ dlls/comdlg32/rsrc.rc | 71 + dlls/commdlg/.gitignore | 15 dlls/commdlg/Makefile.in | 49 - dlls/commdlg/cdlg.h | 233 -- dlls/commdlg/cdlg16.h | 163 -- dlls/commdlg/cdlg32.c | 182 -- dlls/commdlg/cdlg_Bg.rc | 475 ----- dlls/commdlg/cdlg_Ca.rc | 218 -- dlls/commdlg/cdlg_Cn.rc | 446 ----- dlls/commdlg/cdlg_Cs.rc | 474 ----- dlls/commdlg/cdlg_Da.rc | 219 -- dlls/commdlg/cdlg_De.rc | 468 ----- dlls/commdlg/cdlg_En.rc | 566 ------ dlls/commdlg/cdlg_Eo.rc | 471 ----- dlls/commdlg/cdlg_Es.rc | 475 ----- dlls/commdlg/cdlg_Fi.rc | 469 ----- dlls/commdlg/cdlg_Fr.rc | 478 ----- dlls/commdlg/cdlg_Hu.rc | 215 -- dlls/commdlg/cdlg_It.rc | 474 ----- dlls/commdlg/cdlg_Ja.rc | 341 --- dlls/commdlg/cdlg_Ko.rc | 476 ----- dlls/commdlg/cdlg_Nl.rc | 325 --- dlls/commdlg/cdlg_No.rc | 470 ----- dlls/commdlg/cdlg_Pl.rc | 470 ----- dlls/commdlg/cdlg_Pt.rc | 473 ----- dlls/commdlg/cdlg_Ru.rc | 443 ----- dlls/commdlg/cdlg_Si.rc | 441 ----- dlls/commdlg/cdlg_Sk.rc | 414 ---- dlls/commdlg/cdlg_Sv.rc | 434 ---- dlls/commdlg/cdlg_Th.rc | 458 ----- dlls/commdlg/cdlg_Tr.rc | 473 ----- dlls/commdlg/cdlg_Uk.rc | 432 ---- dlls/commdlg/cdlg_Wa.rc | 225 -- dlls/commdlg/cdlg_Zh.rc | 232 -- dlls/commdlg/cdlg_xx.rc | 649 ------- dlls/commdlg/colordlg.c | 1358 -------------- dlls/commdlg/colordlg16.c | 476 ----- dlls/commdlg/comdlg32.spec | 25 dlls/commdlg/commdlg.spec | 26 dlls/commdlg/filedlg.c | 3905 ---------------------------------------- dlls/commdlg/filedlg16.c | 515 ----- dlls/commdlg/filedlg31.c | 932 ---------- dlls/commdlg/filedlg31.h | 68 - dlls/commdlg/filedlgbrowser.c | 1028 ----------- dlls/commdlg/filedlgbrowser.h | 160 -- dlls/commdlg/filetitle.c | 126 - dlls/commdlg/finddlg.c | 496 ----- dlls/commdlg/finddlg32.c | 561 ------ dlls/commdlg/fontdlg.c | 1230 ------------- dlls/commdlg/fontdlg16.c | 379 ---- dlls/commdlg/printdlg.c | 3545 ------------------------------------ dlls/commdlg/printdlg.h | 102 - dlls/commdlg/printdlg16.c | 602 ------ dlls/commdlg/rsrc.rc | 71 - 110 files changed, 28458 insertions(+), 28468 deletions(-) create mode 100644 dlls/comdlg32/.gitignore create mode 100644 dlls/comdlg32/Makefile.in create mode 100644 dlls/comdlg32/cdlg.h create mode 100644 dlls/comdlg32/cdlg16.h create mode 100644 dlls/comdlg32/cdlg32.c create mode 100644 dlls/comdlg32/cdlg_Bg.rc create mode 100644 dlls/comdlg32/cdlg_Ca.rc create mode 100644 dlls/comdlg32/cdlg_Cn.rc create mode 100644 dlls/comdlg32/cdlg_Cs.rc create mode 100644 dlls/comdlg32/cdlg_Da.rc create mode 100644 dlls/comdlg32/cdlg_De.rc create mode 100644 dlls/comdlg32/cdlg_En.rc create mode 100644 dlls/comdlg32/cdlg_Eo.rc create mode 100644 dlls/comdlg32/cdlg_Es.rc create mode 100644 dlls/comdlg32/cdlg_Fi.rc create mode 100644 dlls/comdlg32/cdlg_Fr.rc create mode 100644 dlls/comdlg32/cdlg_Hu.rc create mode 100644 dlls/comdlg32/cdlg_It.rc create mode 100644 dlls/comdlg32/cdlg_Ja.rc create mode 100644 dlls/comdlg32/cdlg_Ko.rc create mode 100644 dlls/comdlg32/cdlg_Nl.rc create mode 100644 dlls/comdlg32/cdlg_No.rc create mode 100644 dlls/comdlg32/cdlg_Pl.rc create mode 100644 dlls/comdlg32/cdlg_Pt.rc create mode 100644 dlls/comdlg32/cdlg_Ru.rc create mode 100644 dlls/comdlg32/cdlg_Si.rc create mode 100644 dlls/comdlg32/cdlg_Sk.rc create mode 100644 dlls/comdlg32/cdlg_Sv.rc create mode 100644 dlls/comdlg32/cdlg_Th.rc create mode 100644 dlls/comdlg32/cdlg_Tr.rc create mode 100644 dlls/comdlg32/cdlg_Uk.rc create mode 100644 dlls/comdlg32/cdlg_Wa.rc create mode 100644 dlls/comdlg32/cdlg_Zh.rc create mode 100644 dlls/comdlg32/cdlg_xx.rc create mode 100644 dlls/comdlg32/colordlg.c create mode 100644 dlls/comdlg32/colordlg16.c create mode 100644 dlls/comdlg32/comdlg32.spec create mode 100644 dlls/comdlg32/commdlg.spec create mode 100644 dlls/comdlg32/filedlg.c create mode 100644 dlls/comdlg32/filedlg16.c create mode 100644 dlls/comdlg32/filedlg31.c create mode 100644 dlls/comdlg32/filedlg31.h create mode 100644 dlls/comdlg32/filedlgbrowser.c create mode 100644 dlls/comdlg32/filedlgbrowser.h create mode 100644 dlls/comdlg32/filetitle.c create mode 100644 dlls/comdlg32/finddlg.c create mode 100644 dlls/comdlg32/finddlg32.c create mode 100644 dlls/comdlg32/fontdlg.c create mode 100644 dlls/comdlg32/fontdlg16.c create mode 100644 dlls/comdlg32/printdlg.c create mode 100644 dlls/comdlg32/printdlg.h create mode 100644 dlls/comdlg32/printdlg16.c create mode 100644 dlls/comdlg32/rsrc.rc delete mode 100644 dlls/commdlg/.gitignore delete mode 100644 dlls/commdlg/Makefile.in delete mode 100644 dlls/commdlg/cdlg.h delete mode 100644 dlls/commdlg/cdlg16.h delete mode 100644 dlls/commdlg/cdlg32.c delete mode 100644 dlls/commdlg/cdlg_Bg.rc delete mode 100644 dlls/commdlg/cdlg_Ca.rc delete mode 100644 dlls/commdlg/cdlg_Cn.rc delete mode 100644 dlls/commdlg/cdlg_Cs.rc delete mode 100644 dlls/commdlg/cdlg_Da.rc delete mode 100644 dlls/commdlg/cdlg_De.rc delete mode 100644 dlls/commdlg/cdlg_En.rc delete mode 100644 dlls/commdlg/cdlg_Eo.rc delete mode 100644 dlls/commdlg/cdlg_Es.rc delete mode 100644 dlls/commdlg/cdlg_Fi.rc delete mode 100644 dlls/commdlg/cdlg_Fr.rc delete mode 100644 dlls/commdlg/cdlg_Hu.rc delete mode 100644 dlls/commdlg/cdlg_It.rc delete mode 100644 dlls/commdlg/cdlg_Ja.rc delete mode 100644 dlls/commdlg/cdlg_Ko.rc delete mode 100644 dlls/commdlg/cdlg_Nl.rc delete mode 100644 dlls/commdlg/cdlg_No.rc delete mode 100644 dlls/commdlg/cdlg_Pl.rc delete mode 100644 dlls/commdlg/cdlg_Pt.rc delete mode 100644 dlls/commdlg/cdlg_Ru.rc delete mode 100644 dlls/commdlg/cdlg_Si.rc delete mode 100644 dlls/commdlg/cdlg_Sk.rc delete mode 100644 dlls/commdlg/cdlg_Sv.rc delete mode 100644 dlls/commdlg/cdlg_Th.rc delete mode 100644 dlls/commdlg/cdlg_Tr.rc delete mode 100644 dlls/commdlg/cdlg_Uk.rc delete mode 100644 dlls/commdlg/cdlg_Wa.rc delete mode 100644 dlls/commdlg/cdlg_Zh.rc delete mode 100644 dlls/commdlg/cdlg_xx.rc delete mode 100644 dlls/commdlg/colordlg.c delete mode 100644 dlls/commdlg/colordlg16.c delete mode 100644 dlls/commdlg/comdlg32.spec delete mode 100644 dlls/commdlg/commdlg.spec delete mode 100644 dlls/commdlg/filedlg.c delete mode 100644 dlls/commdlg/filedlg16.c delete mode 100644 dlls/commdlg/filedlg31.c delete mode 100644 dlls/commdlg/filedlg31.h delete mode 100644 dlls/commdlg/filedlgbrowser.c delete mode 100644 dlls/commdlg/filedlgbrowser.h delete mode 100644 dlls/commdlg/filetitle.c delete mode 100644 dlls/commdlg/finddlg.c delete mode 100644 dlls/commdlg/finddlg32.c delete mode 100644 dlls/commdlg/fontdlg.c delete mode 100644 dlls/commdlg/fontdlg16.c delete mode 100644 dlls/commdlg/printdlg.c delete mode 100644 dlls/commdlg/printdlg.h delete mode 100644 dlls/commdlg/printdlg16.c delete mode 100644 dlls/commdlg/rsrc.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ca1e72a4028a28c66f4…

1 0

Alexandre Julliard : msacm32: Renamed the dlls/msacm directory to dlls/ msacm32.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: c4fde650227d620635db505547e2653d0a385b00 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4fde650227d620635db505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 16:55:04 2006 +0200 msacm32: Renamed the dlls/msacm directory to dlls/msacm32. --- configure | 6 configure.ac | 4 dlls/.gitignore | 1 dlls/Makefile.in | 17 - dlls/msacm/.gitignore | 3 dlls/msacm/Makefile.in | 30 - dlls/msacm/driver.c | 761 ---------------------------- dlls/msacm/filter.c | 455 ----------------- dlls/msacm/format.c | 857 -------------------------------- dlls/msacm/internal.c | 1068 --------------------------------------- dlls/msacm/msacm.rc | 39 - dlls/msacm/msacm.spec | 40 - dlls/msacm/msacm32.spec | 47 -- dlls/msacm/msacm32_main.c | 266 ---------- dlls/msacm/msacm_Cs.rc | 60 -- dlls/msacm/msacm_De.rc | 56 -- dlls/msacm/msacm_En.rc | 56 -- dlls/msacm/msacm_Es.rc | 56 -- dlls/msacm/msacm_Fr.rc | 57 -- dlls/msacm/msacm_Hu.rc | 56 -- dlls/msacm/msacm_It.rc | 57 -- dlls/msacm/msacm_Ja.rc | 56 -- dlls/msacm/msacm_Ko.rc | 56 -- dlls/msacm/msacm_Nl.rc | 56 -- dlls/msacm/msacm_No.rc | 56 -- dlls/msacm/msacm_Pl.rc | 56 -- dlls/msacm/msacm_Pt.rc | 56 -- dlls/msacm/msacm_Tr.rc | 56 -- dlls/msacm/msacm_main.c | 443 ---------------- dlls/msacm/pcmconverter.c | 1087 ---------------------------------------- dlls/msacm/stream.c | 482 ------------------ dlls/msacm/tests/.gitignore | 3 dlls/msacm/tests/Makefile.in | 13 dlls/msacm/tests/msacm.c | 499 ------------------ dlls/msacm/wineacm.h | 414 --------------- dlls/msacm32/.gitignore | 3 dlls/msacm32/Makefile.in | 30 + dlls/msacm32/driver.c | 761 ++++++++++++++++++++++++++++ dlls/msacm32/filter.c | 455 +++++++++++++++++ dlls/msacm32/format.c | 857 ++++++++++++++++++++++++++++++++ dlls/msacm32/internal.c | 1068 +++++++++++++++++++++++++++++++++++++++ dlls/msacm32/msacm.rc | 39 + dlls/msacm32/msacm.spec | 40 + dlls/msacm32/msacm32.spec | 47 ++ dlls/msacm32/msacm32_main.c | 266 ++++++++++ dlls/msacm32/msacm_Cs.rc | 60 ++ dlls/msacm32/msacm_De.rc | 56 ++ dlls/msacm32/msacm_En.rc | 56 ++ dlls/msacm32/msacm_Es.rc | 56 ++ dlls/msacm32/msacm_Fr.rc | 57 ++ dlls/msacm32/msacm_Hu.rc | 56 ++ dlls/msacm32/msacm_It.rc | 57 ++ dlls/msacm32/msacm_Ja.rc | 56 ++ dlls/msacm32/msacm_Ko.rc | 56 ++ dlls/msacm32/msacm_Nl.rc | 56 ++ dlls/msacm32/msacm_No.rc | 56 ++ dlls/msacm32/msacm_Pl.rc | 56 ++ dlls/msacm32/msacm_Pt.rc | 56 ++ dlls/msacm32/msacm_Tr.rc | 56 ++ dlls/msacm32/msacm_main.c | 443 ++++++++++++++++ dlls/msacm32/pcmconverter.c | 1087 ++++++++++++++++++++++++++++++++++++++++ dlls/msacm32/stream.c | 482 ++++++++++++++++++ dlls/msacm32/tests/.gitignore | 3 dlls/msacm32/tests/Makefile.in | 13 dlls/msacm32/tests/msacm.c | 499 ++++++++++++++++++ dlls/msacm32/wineacm.h | 414 +++++++++++++++ programs/winetest/Makefile.in | 4 67 files changed, 7308 insertions(+), 7318 deletions(-) delete mode 100644 dlls/msacm/.gitignore delete mode 100644 dlls/msacm/Makefile.in delete mode 100644 dlls/msacm/driver.c delete mode 100644 dlls/msacm/filter.c delete mode 100644 dlls/msacm/format.c delete mode 100644 dlls/msacm/internal.c delete mode 100644 dlls/msacm/msacm.rc delete mode 100644 dlls/msacm/msacm.spec delete mode 100644 dlls/msacm/msacm32.spec delete mode 100644 dlls/msacm/msacm32_main.c delete mode 100644 dlls/msacm/msacm_Cs.rc delete mode 100644 dlls/msacm/msacm_De.rc delete mode 100644 dlls/msacm/msacm_En.rc delete mode 100644 dlls/msacm/msacm_Es.rc delete mode 100644 dlls/msacm/msacm_Fr.rc delete mode 100644 dlls/msacm/msacm_Hu.rc delete mode 100644 dlls/msacm/msacm_It.rc delete mode 100644 dlls/msacm/msacm_Ja.rc delete mode 100644 dlls/msacm/msacm_Ko.rc delete mode 100644 dlls/msacm/msacm_Nl.rc delete mode 100644 dlls/msacm/msacm_No.rc delete mode 100644 dlls/msacm/msacm_Pl.rc delete mode 100644 dlls/msacm/msacm_Pt.rc delete mode 100644 dlls/msacm/msacm_Tr.rc delete mode 100644 dlls/msacm/msacm_main.c delete mode 100644 dlls/msacm/pcmconverter.c delete mode 100644 dlls/msacm/stream.c delete mode 100644 dlls/msacm/tests/.gitignore delete mode 100644 dlls/msacm/tests/Makefile.in delete mode 100644 dlls/msacm/tests/msacm.c delete mode 100644 dlls/msacm/wineacm.h create mode 100644 dlls/msacm32/.gitignore create mode 100644 dlls/msacm32/Makefile.in create mode 100644 dlls/msacm32/driver.c create mode 100644 dlls/msacm32/filter.c create mode 100644 dlls/msacm32/format.c create mode 100644 dlls/msacm32/internal.c create mode 100644 dlls/msacm32/msacm.rc create mode 100644 dlls/msacm32/msacm.spec create mode 100644 dlls/msacm32/msacm32.spec create mode 100644 dlls/msacm32/msacm32_main.c create mode 100644 dlls/msacm32/msacm_Cs.rc create mode 100644 dlls/msacm32/msacm_De.rc create mode 100644 dlls/msacm32/msacm_En.rc create mode 100644 dlls/msacm32/msacm_Es.rc create mode 100644 dlls/msacm32/msacm_Fr.rc create mode 100644 dlls/msacm32/msacm_Hu.rc create mode 100644 dlls/msacm32/msacm_It.rc create mode 100644 dlls/msacm32/msacm_Ja.rc create mode 100644 dlls/msacm32/msacm_Ko.rc create mode 100644 dlls/msacm32/msacm_Nl.rc create mode 100644 dlls/msacm32/msacm_No.rc create mode 100644 dlls/msacm32/msacm_Pl.rc create mode 100644 dlls/msacm32/msacm_Pt.rc create mode 100644 dlls/msacm32/msacm_Tr.rc create mode 100644 dlls/msacm32/msacm_main.c create mode 100644 dlls/msacm32/pcmconverter.c create mode 100644 dlls/msacm32/stream.c create mode 100644 dlls/msacm32/tests/.gitignore create mode 100644 dlls/msacm32/tests/Makefile.in create mode 100644 dlls/msacm32/tests/msacm.c create mode 100644 dlls/msacm32/wineacm.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c4fde650227d620635d…

1 0

Huw Davies : gdi32: Add support for ttc indices in the font link list.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: aa25176974353560405fecf4b1693e73c9c9388e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa25176974353560405fecf… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 10 12:35:23 2006 +0100 gdi32: Add support for ttc indices in the font link list. --- dlls/gdi/freetype.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 33c0353..c0da05f 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -443,20 +443,22 @@ static inline FT_Fixed FT_FixedFromFIXED } -static Face *find_face_from_filename(const WCHAR *name) +static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_name) { Family *family; Face *face; char *file; - DWORD len = WideCharToMultiByte(CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL); - char *nameA = HeapAlloc(GetProcessHeap(), 0, len); + DWORD len = WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, NULL, 0, NULL, NULL); + char *file_nameA = HeapAlloc(GetProcessHeap(), 0, len); Face *ret = NULL; - WideCharToMultiByte(CP_UNIXCP, 0, name, -1, nameA, len, NULL, NULL); - TRACE("looking for %s\n", debugstr_a(nameA)); + WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, file_nameA, len, NULL, NULL); + TRACE("looking for file %s name %s\n", debugstr_a(file_nameA), debugstr_w(face_name)); LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { + if(face_name && strcmpiW(face_name, family->FamilyName)) + continue; LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) { file = strrchr(face->file, '/'); @@ -464,12 +466,12 @@ static Face *find_face_from_filename(con file = face->file; else file++; - if(!strcmp(file, nameA)) + if(!strcmp(file, file_nameA)) ret = face; break; } } - HeapFree(GetProcessHeap(), 0, nameA); + HeapFree(GetProcessHeap(), 0, file_nameA); return ret; } @@ -1041,7 +1043,6 @@ static BOOL init_system_links(void) for(entry = data; (char*)entry < (char*)data + data_len && *entry != 0; entry = next) { WCHAR *face_name; - INT index; CHILD_FONT *child_font; TRACE("\t%s\n", debugstr_w(entry)); @@ -1049,30 +1050,26 @@ static BOOL init_system_links(void) next = entry + strlenW(entry) + 1; face_name = strchrW(entry, ','); - if(!face_name) - index = 0; - else + if(face_name) { - FIXME("don't yet handle ttc's correctly in linking. Assuming index 0\n"); *face_name++ = 0; while(isspaceW(*face_name)) face_name++; - - index = 0; } - face = find_face_from_filename(entry); + face = find_face_from_filename(entry, face_name); if(!face) { - TRACE("Unable to find file %s\n", debugstr_w(entry)); + TRACE("Unable to find file %s face name %s\n", debugstr_w(entry), debugstr_w(face_name)); continue; } child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); child_font->file_name = strdupA(face->file); - child_font->index = index; + child_font->index = face->face_index; child_font->font = NULL; fs.fsCsb[0] |= face->fs.fsCsb[0]; fs.fsCsb[1] |= face->fs.fsCsb[1]; + TRACE("Adding file %s index %d\n", child_font->file_name, child_font->index); list_add_tail(&font_link->links, &child_font->entry); } family = find_family_from_name(font_link->font_name); @@ -1100,13 +1097,14 @@ static BOOL init_system_links(void) system_font_link->font_name = strdupW(System); list_init(&system_font_link->links); - face = find_face_from_filename(tahoma_ttf); + face = find_face_from_filename(tahoma_ttf, Tahoma); if(face) { child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); child_font->file_name = strdupA(face->file); - child_font->index = 0; + child_font->index = face->face_index; child_font->font = NULL; + TRACE("Found Tahoma in %s index %d\n", child_font->file_name, child_font->index); list_add_tail(&system_font_link->links, &child_font->entry); } LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry)

1 0

Jason Green : wined3d: Add some more debugging info.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 3f591ecb13dc4593ae80f3cba0d865d071613980 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f591ecb13dc4593ae80f3c… Author: Jason Green <jave27(a)gmail.com> Date: Sun Apr 9 20:45:58 2006 -0400 wined3d: Add some more debugging info. Adds more debugging FIXME's if a specific WINED3DFMT_??? isn't supported. --- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/utils.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f1868cd..a02c6ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -893,7 +893,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc IWineD3DSurface_CleanDirtyRect(iface); } else { - FIXME("unsupported unlocking to Rendering surface surf@%p usage(%lu)\n", This, This->resource.usage); + FIXME("unsupported unlocking to Rendering surface surf@%p usage(%s)\n", This, debug_d3dusage(This->resource.usage)); } IWineD3DSwapChain_Release((IWineD3DSwapChain *)implSwapChain); @@ -906,7 +906,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc } } else { - FIXME("unsupported unlocking to surface surf@%p usage(%lu)\n", This, This->resource.usage); + FIXME("unsupported unlocking to surface surf@%p usage(%s)\n", This, debug_d3dusage(This->resource.usage)); } unlock_end: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c1eb03e..1b77b5b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1941,8 +1941,9 @@ int D3DFmtMakeGlCfg(D3DFORMAT BackBuffer PUSH2(GLX_GREEN_SIZE, 10); PUSH2(GLX_BLUE_SIZE, 10); break; - + default: + FIXME("Unsupported color format: %s\n", debug_d3dformat(BackBufferFormat)); break; } if(!alternate){ @@ -1983,6 +1984,7 @@ int D3DFmtMakeGlCfg(D3DFORMAT BackBuffer break; default: + FIXME("Unsupported stencil format: %s\n", debug_d3dformat(BackBufferFormat)); break; } @@ -2024,6 +2026,7 @@ int D3DFmtMakeGlCfg(D3DFORMAT BackBuffer break; default: + FIXME("Unsupported stencil format: %s\n", debug_d3dformat(BackBufferFormat)); break; } }

1 0

Eric Kohl : widl: Implement support for ref pointers to simple structs.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 7fb3f12ce5628136390253361fdf503713d96900 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fb3f12ce56281363902533… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sun Apr 9 14:38:57 2006 +0200 widl: Implement support for ref pointers to simple structs. --- tools/widl/client.c | 2 - tools/widl/server.c | 6 +- tools/widl/typegen.c | 137 +++++++++++++++++++++++++++++++++++++++++++++----- tools/widl/typegen.h | 2 - 4 files changed, 129 insertions(+), 18 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 355da9b..2cd4806 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -78,7 +78,7 @@ static void print_message_buffer_size(co { unsigned int alignment; - total_size += get_required_buffer_size(var, &alignment); + total_size += get_required_buffer_size(var, &alignment, PASS_IN); total_size += alignment; var = PREV_LINK(var); diff --git a/tools/widl/server.c b/tools/widl/server.c index 5188965..d29364e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -357,10 +357,10 @@ static void write_function_stubs(type_t if (is_attr(var->attrs, ATTR_OUT)) { unsigned int alignment; - buffer_size += get_required_buffer_size(var, &alignment); + buffer_size += get_required_buffer_size(var, &alignment, PASS_OUT); buffer_size += alignment; } - + var = PREV_LINK(var); } } @@ -368,7 +368,7 @@ static void write_function_stubs(type_t if (!is_void(def->type, NULL)) { unsigned int alignment; - buffer_size += get_required_buffer_size(def, &alignment); + buffer_size += get_required_buffer_size(def, &alignment, PASS_RETURN); buffer_size += alignment; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4fc95ed..dbdfbc8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -985,6 +985,61 @@ static const var_t *find_array_or_string return find_array_or_string_in_struct(last_field->type); } +static size_t write_struct_members(FILE *file, const type_t *type) +{ + size_t typestring_size = 0; + var_t *field; + + field = type->fields; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + for (; field; field = PREV_LINK(field)) + { + if (is_base_type(field->type->type)) + { + switch (field->type->type) + { +#define CASE_BASETYPE(fctype) \ + case RPC_##fctype: \ + print_file(file, 2, "0x%02x,\t\t/* " #fctype " */\n", RPC_##fctype); \ + typestring_size++; \ + break; + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_USMALL); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ENUM16); + CASE_BASETYPE(FC_ENUM32); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_ERROR_STATUS_T); + default: + break; +#undef CASE_BASETYPE + } + } + else + error("Unsupported member type 0x%x\n", field->type->type); + } + + if (typestring_size % 1) + { + print_file(file, 2, "0x%x,\t\t/* FC_PAD */\n", RPC_FC_PAD); + typestring_size++; + } + + print_file(file, 2, "0x%x,\t\t/* FC_END */\n", RPC_FC_END); + typestring_size++; + + return typestring_size; +} + static size_t write_struct_tfs(FILE *file, const type_t *type, const char *name, size_t *typestring_offset) { @@ -1017,7 +1072,7 @@ static size_t write_struct_tfs(FILE *fil else WRITE_FCTYPE(file, FC_PSTRUCT, *typestring_offset); /* alignment */ - print_file(file, 2, "0x0,\n"); + print_file(file, 2, "0x3,\n"); /* FIXME */ /* total size */ print_file(file, 2, "NdrFcShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; @@ -1034,10 +1089,7 @@ static size_t write_struct_tfs(FILE *fil } /* member layout */ - print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); - print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); - - *typestring_offset += 2; + *typestring_offset += write_struct_members(file, type); return start_offset; case RPC_FC_CSTRUCT: case RPC_FC_CPSTRUCT: @@ -1151,12 +1203,22 @@ static size_t write_struct_tfs(FILE *fil static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, size_t *typeformat_offset) { + int in_attr, out_attr; + unsigned char flags = 0; int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); if (!pointer_type) pointer_type = RPC_FC_RP; + in_attr = is_attr(attrs, ATTR_IN); + out_attr = is_attr(attrs, ATTR_OUT); + if (!in_attr && !out_attr) in_attr = 1; + + if (out_attr && !in_attr && pointer_type == RPC_FC_RP) + flags |= 0x04; - print_file(file, 2, "0x%x, 0x00, /* %s */\n", + print_file(file, 2, "0x%x, 0x%x,\t\t/* %s%s */\n", pointer_type, - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); + flags, + pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP"), + (flags & 0x04) ? " [allocated_on_stack]" : ""); print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", offset, offset); *typeformat_offset += 4; } @@ -1381,7 +1443,7 @@ static unsigned int get_required_buffer_ return 0; } -unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment, enum pass pass) { expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); int has_size = (size_is && (size_is->type != EXPR_VOID)); @@ -1391,20 +1453,64 @@ unsigned int get_required_buffer_size(co if (!in_attr && !out_attr) in_attr = 1; - if ((!out_attr || in_attr) && !has_size && !is_attr(var->attrs, ATTR_STRING) && !var->array) + *alignment = 0; + + if (pass == PASS_OUT) { - if (var->ptr_level > 0 || (var->ptr_level == 0 && type_has_ref(var->type))) + if (out_attr && var->ptr_level > 0) { type_t *type = var->type; while (type->type == 0 && type->ref) type = type->ref; - if (is_base_type(type->type)) - return 25; + if (type->type == RPC_FC_STRUCT) + { + const var_t *field; + unsigned int size = 36; + for (field = type->fields; field; field = NEXT_LINK(field)) + { + unsigned int align; + size += get_required_buffer_size_type( + field->type, field->ptr_level, field->array, field->name, + &align); + } + return size; + } } + return 0; } + else + { + if ((!out_attr || in_attr) && !has_size && !is_attr(var->attrs, ATTR_STRING) && !var->array) + { + if (var->ptr_level > 0 || (var->ptr_level == 0 && type_has_ref(var->type))) + { + type_t *type = var->type; + while (type->type == 0 && type->ref) + type = type->ref; + + if (is_base_type(type->type)) + { + return 25; + } + else if (type->type == RPC_FC_STRUCT) + { + unsigned int size = 36; + const var_t *field; + for (field = type->fields; field; field = NEXT_LINK(field)) + { + unsigned int align; + size += get_required_buffer_size_type( + field->type, field->ptr_level, field->array, field->name, + &align); + } + return size; + } + } + } - return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); + return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); + } } static void print_phase_function(FILE *file, int indent, const char *type, @@ -1702,6 +1808,11 @@ void write_remoting_arguments(FILE *file { print_phase_basetype(file, indent, phase, pass, var, var->name); } + else if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && (type->type == RPC_FC_STRUCT)) + { + if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) + print_phase_function(file, indent, "SimpleStruct", phase, var->name, *type_offset + 4); + } else { print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index ee2179c..f8c275f 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -38,7 +38,7 @@ enum remoting_phase void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); size_t get_type_memsize(const type_t *type); -unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment, enum pass pass); void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase); size_t get_size_procformatstring_var(const var_t *var);

1 0

Hans Leidekker : gdi32: GetCharABCWidthsW should not crash on a NULL handle .
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: c4f4b01b058d840c350581a58671d9f531d0c310 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4f4b01b058d840c350581a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Apr 8 22:27:34 2006 +0200 gdi32: GetCharABCWidthsW should not crash on a NULL handle. --- dlls/gdi/font.c | 2 ++ dlls/gdi/tests/font.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index ffebd7e..1e17d5a 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2330,6 +2330,8 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, unsigned int i; BOOL ret = FALSE; + if (!dc) return FALSE; + if(dc->gdiFont) ret = WineEngGetCharABCWidths( dc->gdiFont, firstChar, lastChar, abc ); else diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 9ed33b7..ef0b9b2 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -323,6 +323,18 @@ static void test_GdiGetCharDimensions(vo DeleteDC(hdc); } +static void test_GetCharABCWidthsW(void) +{ + BOOL ret; + ABC abc[1]; + typedef BOOL (WINAPI *fnGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); + fnGetCharABCWidthsW GetCharABCWidthsW = (fnGetCharABCWidthsW)GetProcAddress(LoadLibrary("gdi32"), "GetCharABCWidthsW"); + if (!GetCharABCWidthsW) return; + + ret = GetCharABCWidthsW(NULL, 'a', 'a', abc); + ok(!ret, "GetCharABCWidthsW should have returned FALSE\n"); +} + static void test_text_extents(void) { LOGFONTA lf; @@ -353,5 +365,6 @@ START_TEST(font) test_bitmap_font(); test_bitmap_font_metrics(); test_GdiGetCharDimensions(); + test_GetCharABCWidthsW(); test_text_extents(); }

1 0

Hans Leidekker : wldap32: Fix broken parameter handling.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 1bf5e2da0ac53d85bae49cc43dfbcf981e229433 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1bf5e2da0ac53d85bae49cc… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Apr 8 16:11:42 2006 +0200 wldap32: Fix broken parameter handling. --- dlls/wldap32/control.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index 5c4b413..b8b5963 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -214,16 +214,20 @@ INT ldap_create_vlv_controlA( WLDAP32_LD { INT ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - LDAPControlW **controlW = NULL; + LDAPControlW *controlW = NULL; TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control ); - if (!ld) return ~0UL; + if (!ld || !control) return ~0UL; - ret = ldap_create_vlv_controlW( ld, info, critical, controlW ); + ret = ldap_create_vlv_controlW( ld, info, critical, &controlW ); - *control = controlWtoA( *controlW ); - ldap_control_freeW( *controlW ); + if (ret == LDAP_SUCCESS) + { + *control = controlWtoA( controlW ); + if (!*control) ret = WLDAP32_LDAP_NO_MEMORY; + ldap_control_freeW( controlW ); + } #endif return ret; @@ -256,16 +260,20 @@ INT ldap_create_vlv_controlW( WLDAP32_LD { INT ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - LDAPControl **controlU = NULL; + LDAPControl *controlU = NULL; TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control ); - if (!ld) return ~0UL; + if (!ld || !control) return ~0UL; - ret = ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, controlU ); + ret = ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, &controlU ); - *control = controlUtoW( *controlU ); - ldap_control_free( *controlU ); + if (ret == LDAP_SUCCESS) + { + *control = controlUtoW( controlU ); + if (!*control) ret = WLDAP32_LDAP_NO_MEMORY; + ldap_control_free( controlU ); + } #endif return ret;

1 0

Hans Leidekker : dnsapi: Add a configure check for the resolver library and header.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 2d6d4e96749e69758409962cfa4d34836df27a37 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d6d4e96749e69758409962… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 9 18:36:01 2006 +0200 dnsapi: Add a configure check for the resolver library and header. --- configure | 2222 ++++++++++++++++++++++++----------------------- configure.ac | 82 +- dlls/dnsapi/Makefile.in | 2 include/config.h.in | 3 4 files changed, 1201 insertions(+), 1108 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2d6d4e96749e6975840…

1 0

Hans Leidekker : dnsapi: Implement DnsNameCompare_{A,W}.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 486e3b32e2532b45f37f1c62225268b423af8bf7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=486e3b32e2532b45f37f1c6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 9 18:35:48 2006 +0200 dnsapi: Implement DnsNameCompare_{A,W}. --- dlls/dnsapi/Makefile.in | 3 +- dlls/dnsapi/dnsapi.h | 42 ++++++++++++++++++++++ dlls/dnsapi/dnsapi.spec | 4 +- dlls/dnsapi/name.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 dlls/dnsapi/dnsapi.h create mode 100644 dlls/dnsapi/name.c diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 6564117..4a2ecad 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -8,7 +8,8 @@ IMPORTS = kernel32 EXTRALIBS = $(LIBUNICODE) C_SRCS = \ - main.c + main.c \ + name.c @MAKE_DLL_RULES@ diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h new file mode 100644 index 0000000..7eecc30 --- /dev/null +++ b/dlls/dnsapi/dnsapi.h @@ -0,0 +1,42 @@ +/* + * DNS support + * + * Copyright 2006 Hans Leidekker + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +static inline void *dns_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void dns_free( LPVOID mem ) +{ + HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline LPWSTR dns_strdup_aw( LPCSTR str ) +{ + LPWSTR ret = NULL; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = dns_alloc( len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 0951705..b80b48f 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -68,11 +68,11 @@ @ stub DnsModifyRecordsInSet_A @ stub DnsModifyRecordsInSet_UTF8 @ stub DnsModifyRecordsInSet_W -@ stub DnsNameCompare_A +@ stdcall DnsNameCompare_A(str str) @ stub DnsNameCompareEx_A @ stub DnsNameCompareEx_UTF8 @ stub DnsNameCompareEx_W -@ stub DnsNameCompare_W +@ stdcall DnsNameCompare_W(wstr wstr) @ stub DnsNameCopy @ stub DnsNameCopyAllocate @ stub DnsNotifyResolver diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c new file mode 100644 index 0000000..c4da728 --- /dev/null +++ b/dlls/dnsapi/name.c @@ -0,0 +1,89 @@ +/* + * DNS support + * + * Copyright (C) 2006 Matthew Kehrer + * Copyright (C) 2006 Hans Leidekker + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/debug.h" +#include "wine/unicode.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" +#include "windns.h" + +#include "dnsapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); + +/****************************************************************************** + * DnsNameCompare_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsNameCompare_A( LPSTR name1, LPSTR name2 ) +{ + BOOL ret; + LPWSTR name1W, name2W; + + TRACE( "(%s,%s)\n", debugstr_a(name1), debugstr_a(name2) ); + + name1W = dns_strdup_aw( name1 ); + name2W = dns_strdup_aw( name2 ); + + ret = DnsNameCompare_W( name1W, name2W ); + + dns_free( name1W ); + dns_free( name2W ); + + return ret; +} + +/****************************************************************************** + * DnsNameCompare_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsNameCompare_W( LPWSTR name1, LPWSTR name2 ) +{ + WCHAR *p, *q; + + TRACE( "(%s,%s)\n", debugstr_w(name1), debugstr_w(name2) ); + + if (!name1 && !name2) return TRUE; + if (!name1 || !name2) return FALSE; + + p = name1 + lstrlenW( name1 ) - 1; + q = name2 + lstrlenW( name2 ) - 1; + + while (*p == '.' && p >= name1) p--; + while (*q == '.' && q >= name2) q--; + + if (p - name1 != q - name2) return FALSE; + + while (name1 <= p) + { + if (toupperW( *name1 ) != toupperW( *name2 )) + return FALSE; + + name1++; + name2++; + } + return TRUE; +}

1 0