From b3e9c4474155bbc2d665665186e7a5e5a25fd6d8 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 6 May 2005 20:04:27 +0000 Subject: [PATCH] Renamed wineps.dll to wineps.drv for consistency. --- dlls/Makefile.in | 19 ++++++------------- dlls/wineps/.cvsignore | 3 +-- dlls/wineps/Makefile.in | 2 +- dlls/wineps/{wineps.spec => wineps.drv.spec} | 0 dlls/winspool/info.c | 16 ++++++++-------- 5 files changed, 16 insertions(+), 24 deletions(-) rename dlls/wineps/{wineps.spec => wineps.drv.spec} (100%) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index be81a109e99..ae881cf74f2 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -394,7 +394,7 @@ SYMLINKS_SO = \ winemp3.acm.so \ winenas.drv.so \ wineoss.drv.so \ - wineps.dll.so \ + wineps.drv.so \ winetty.drv.so \ wininet.dll.so \ winmm.dll.so \ @@ -936,11 +936,11 @@ winenas.drv.so: winmm/winenas/winenas.drv.so wineoss.drv.so: winmm/wineoss/wineoss.drv.so $(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv.so $@ -wineps.dll.so: wineps/wineps.dll.so - $(RM) $@ && $(LN_S) wineps/wineps.dll.so $@ +wineps.drv.so: wineps/wineps.drv.so + $(RM) $@ && $(LN_S) wineps/wineps.drv.so $@ -wineps16.drv.so : wineps.dll.so - $(RM) $@ && $(LN_S) wineps.dll.so $@ +wineps16.drv.so : wineps.drv.so + $(RM) $@ && $(LN_S) wineps.drv.so $@ winetty.drv.so: ttydrv/winetty.drv.so $(RM) $@ && $(LN_S) ttydrv/winetty.drv.so $@ @@ -1133,7 +1133,6 @@ IMPORT_LIBS = \ libw32skrnl.$(IMPLIBEXT) \ libwined3d.$(IMPLIBEXT) \ libwinedos.$(IMPLIBEXT) \ - libwineps.$(IMPLIBEXT) \ libwininet.$(IMPLIBEXT) \ libwinmm.$(IMPLIBEXT) \ libwinnls32.$(IMPLIBEXT) \ @@ -1743,11 +1742,6 @@ libwinedos.def: winedos/winedos.spec.def libwinedos.a: winedos/winedos.spec.def $(DLLTOOL) -k -l $@ -d winedos/winedos.spec.def -libwineps.def: wineps/wineps.spec.def - $(RM) $@ && $(LN_S) wineps/wineps.spec.def $@ -libwineps.a: wineps/wineps.spec.def - $(DLLTOOL) -k -l $@ -d wineps/wineps.spec.def - libwininet.def: wininet/wininet.spec.def $(RM) $@ && $(LN_S) wininet/wininet.spec.def $@ libwininet.a: wininet/wininet.spec.def @@ -1921,7 +1915,6 @@ version/version.spec.def: $(WINEBUILD) win32s/w32skrnl.spec.def: $(WINEBUILD) wined3d/wined3d.spec.def: $(WINEBUILD) winedos/winedos.spec.def: $(WINEBUILD) -wineps/wineps.spec.def: $(WINEBUILD) wininet/wininet.spec.def: $(WINEBUILD) winmm/winmm.spec.def: $(WINEBUILD) winnls/winnls32.spec.def: $(WINEBUILD) @@ -2087,7 +2080,7 @@ winmm/winejack/winejack.drv.so: winmm/winejack msacm/winemp3/winemp3.acm.so: msacm/winemp3 winmm/winenas/winenas.drv.so: winmm/winenas winmm/wineoss/wineoss.drv.so: winmm/wineoss -wineps/wineps.dll.so: wineps +wineps/wineps.drv.so: wineps ttydrv/winetty.drv.so: ttydrv x11drv/winex11.drv.so: x11drv wininet/wininet.dll.so: wininet diff --git a/dlls/wineps/.cvsignore b/dlls/wineps/.cvsignore index 0744cf009f1..5f0531c177e 100644 --- a/dlls/wineps/.cvsignore +++ b/dlls/wineps/.cvsignore @@ -1,5 +1,4 @@ Makefile rsrc.res -wineps.dll.dbg.c -wineps.spec.def +wineps.drv.dbg.c wineps16.drv.spec.c diff --git a/dlls/wineps/Makefile.in b/dlls/wineps/Makefile.in index eb8f9ae9a41..bfd79d9a636 100644 --- a/dlls/wineps/Makefile.in +++ b/dlls/wineps/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = wineps.dll +MODULE = wineps.drv IMPORTS = user32 gdi32 winspool advapi32 kernel32 EXTRAINCL = @FREETYPEINCL@ diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.drv.spec similarity index 100% rename from dlls/wineps/wineps.spec rename to dlls/wineps/wineps.drv.spec diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index df844a55ef9..328ea5033af 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -157,12 +157,12 @@ WINSPOOL_SetDefaultPrinter(const char *devname, const char *name,BOOL force) { if (force || !GetProfileStringA("windows","device","*",qbuf,sizeof(qbuf)) || !strcmp(qbuf,"*") || - !strstr(qbuf,"WINEPS") + !strstr(qbuf,"WINEPS.DRV") ) { - char *buf = HeapAlloc(GetProcessHeap(),0,strlen(name)+strlen(devname)+strlen(",WINEPS,LPR:")+1); + char *buf = HeapAlloc(GetProcessHeap(),0,strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); HKEY hkey; - sprintf(buf,"%s,WINEPS,LPR:%s",devname,name); + sprintf(buf,"%s,WINEPS.DRV,LPR:%s",devname,name); WriteProfileStringA("windows","device",buf); if(RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey) == ERROR_SUCCESS) { RegSetValueExA(hkey, "Device", 0, REG_SZ, buf, strlen(buf) + 1); @@ -209,8 +209,8 @@ static BOOL CUPS_LoadPrinters(void) for (i=0;i